Merge branch 'v1' into fix/change_completionData

mycloudnexus · Nov 22, 2024 · 718e8ce · 718e8ce
2 parents f375cd8 + e160ea9
commit 718e8ce
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/kraken-app/kraken-app-portal/src/hooks/product/index.ts b/kraken-app/kraken-app-portal/src/hooks/product/index.ts
@@ -575,6 +575,7 @@ export const useGetBuyerList = (
     queryFn: () => getBuyerList(productId, params),
     enabled: Boolean(productId) && Boolean(params.envId),
     select: (data) => data?.data,
+    staleTime: STALE_TIME,
   });
 };
 

diff --git a/kraken-app/kraken-app-portal/src/pages/Buyer/index.tsx b/kraken-app/kraken-app-portal/src/pages/Buyer/index.tsx
@@ -13,7 +13,7 @@ import { useAppStore } from "@/stores/app.store";
 import { useBuyerStore } from "@/stores/buyer.store";
 import { IBuyer } from "@/utils/types/component.type";
 import { Button, Flex, Popconfirm, Table, notification } from "antd";
-import { get, isEmpty, omitBy } from "lodash";
+import { get } from "lodash";
 import { useEffect, useMemo, useRef } from "react";
 import { useBoolean } from "usehooks-ts";
 import { ContentTime } from "../NewAPIMapping/components/DeployHistory/ContentTime";
@@ -26,7 +26,7 @@ const Buyer = () => {
   const { params, setParams, resetParams } = useBuyerStore();
   const { data: dataList, isLoading } = useGetBuyerList(
     currentProduct,
-    omitBy(params, isEmpty)
+    params
   );
   const {
     value: isModalVisible,
@@ -180,18 +180,15 @@ const Buyer = () => {
         <div style={{ flex: 1, overflowY: "auto" }} ref={ref}>
           <Table
             loading={isLoading}
-            pagination={
-              dataList?.total < 50
-                ? false
-                : {
-                    current: dataList?.page + 1,
-                    total: dataList?.total,
-                    size: dataList?.size,
-                    onChange: (page, pageSize) => {
-                      setParams({ page: page - 1, size: pageSize });
-                    },
-                  }
-            }
+            pagination={{
+              current: dataList?.page + 1,
+              total: dataList?.total,
+              size: dataList?.size,
+              showSizeChanger: true,
+              onChange: (page, pageSize) => {
+                setParams({ page: page - 1, size: pageSize });
+              },
+            }}
             dataSource={dataList?.data}
             columns={columns}
             scroll={{ y: get(size, "height", 0) - 60, x: "auto" }}

diff --git a/kraken-app/kraken-app-portal/src/stores/buyer.store.tsx b/kraken-app/kraken-app-portal/src/stores/buyer.store.tsx
@@ -15,7 +15,7 @@ type BuyerStore = {
 
 const DEFAULT_PARAMS = {
   page: 0,
-  size: 50,
+  size: 20,
   orderBy: "createdAt",
   direction: "DESC",
 };

diff --git a/...dk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.22.yaml b/...dk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.22.yaml
@@ -0,0 +1,13 @@
+---
+kind: kraken.product.template-upgrade
+apiVersion: v1
+metadata:
+  key: kraken.product.template-upgrade.1.5.22
+  name: V1.5.22
+  labels:
+    productSpec: grace
+    productVersion: V1.5.22
+    publishDate: 2024-11-22
+  description: |
+    Remove completionDate when state != completed.
+  version: 2