@orchestrator-ui/orchestrator-ui-components 5.2.1 → 5.2.3

package/.turbo/turbo-build.log

@@ -1,12 +1,12 @@
 
-> @orchestrator-ui/orchestrator-ui-components@5.2.1 build
+> @orchestrator-ui/orchestrator-ui-components@5.2.3 build
 > npm run generate-version && tsup src/index.ts
 
 
-> @orchestrator-ui/orchestrator-ui-components@5.2.1 generate-version
+> @orchestrator-ui/orchestrator-ui-components@5.2.3 generate-version
 > node -p "'export const ORCHESTRATOR_UI_LIBRARY_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'" > src/configuration/version.ts && prettier --write src/configuration/version.ts
 
-src/configuration/version.ts 42ms
+src/configuration/version.ts 46ms
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.build.json
 CLI tsup v8.4.0
@@ -15,7 +15,7 @@ src/configuration/version.ts 42ms
 ESM Build start
 DTS Build start
 ESM dist/index.js     1.99 MB
-ESM dist/index.js.map 3.70 MB
-ESM ⚡️ Build success in 593ms
-DTS ⚡️ Build success in 21433ms
-DTS dist/index.d.ts 813.29 KB
+ESM dist/index.js.map 3.69 MB
+ESM ⚡️ Build success in 672ms
+DTS ⚡️ Build success in 21236ms
+DTS dist/index.d.ts 813.26 KB

package/.turbo/turbo-lint.log

@@ -1,4 +1,4 @@
 
-> @orchestrator-ui/orchestrator-ui-components@5.2.1 lint
+> @orchestrator-ui/orchestrator-ui-components@5.2.3 lint
 > eslint
 

package/.turbo/turbo-test.log

@@ -1,13 +1,13 @@
 
-> @orchestrator-ui/orchestrator-ui-components@5.2.1 test
+> @orchestrator-ui/orchestrator-ui-components@5.2.3 test
 > jest
 
 PASS Wfo-UI Tests src/components/WfoSubscription/utils/utils.spec.ts
 PASS Wfo-UI Tests src/components/WfoTree/treeUtils.spec.ts
 PASS Wfo-UI Tests src/utils/date.spec.ts
 PASS Wfo-UI Tests src/pages/processes/timelineUtils.spec.ts
-PASS Wfo-UI Tests src/utils/string.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/WfoTable/WfoGroupedTable/utils.spec.ts
+PASS Wfo-UI Tests src/utils/string.spec.ts
 PASS Wfo-UI Tests src/utils/getProductNamesFromProcess.spec.ts
 PASS Wfo-UI Tests src/utils/compareVersions.spec.ts
 PASS Wfo-UI Tests src/components/WfoTable/utils/tableUtils.spec.ts
@@ -35,11 +35,11 @@ PASS Wfo-UI Tests src/utils/cacheTag.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryVariablesForExport.spec.ts
 PASS Wfo-UI Tests src/components/WfoPageTemplate/WfoPageHeader/utils/toHexColorWithOpacity.spec.ts
 PASS Wfo-UI Tests src/utils/getQueryUrl.spec.ts
-PASS Wfo-UI Tests src/components/WfoForms/formFields/utils.spec.ts (6.54 s)
-PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts (5.023 s)
+PASS Wfo-UI Tests src/components/WfoForms/formFields/utils.spec.ts (6.552 s)
+PASS Wfo-UI Tests src/components/WfoTable/WfoTable/utils.spec.ts
 
 Test Suites: 35 passed, 35 total
 Tests:       226 passed, 226 total
 Snapshots:   0 total
-Time:        8.195 s
+Time:        8.165 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @orchestrator-ui/orchestrator-ui-components
 
+## 5.2.3
+
+### Patch Changes
+
+- c3e62c9: 2001 fix filter of summarycard
+
+## 5.2.2
+
+### Patch Changes
+
+- 5fcb0c8: Fix regression in subscription delta
+
 ## 5.2.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -11631,7 +11631,7 @@ type SubscriptionListItem = Pick<Subscription, 'subscriptionId' | 'description'
     metadata: object | null;
 };
 declare const mapGraphQlSubscriptionsResultToPageInfo: (graphqlResponse: SubscriptionListResponse) => GraphQLPageInfo;
-declare const mapGraphQlSubscriptionsResultToSubscriptionListItems: (graphqlResponse: SubscriptionListResponse) => SubscriptionListItem[];
+declare const mapGraphQlSubscriptionsResultToSubscriptionListItems: (graphqlResponse: SubscriptionListResponse | undefined) => SubscriptionListItem[];
 
 declare enum WfoSubscriptionListTab {
     ACTIVE = "ACTIVE",
@@ -17796,10 +17796,10 @@ type WfoRadioDropdownOption<T> = {
 declare const WfoRadioDropdown: <T>({ options, onUpdateOption, selectedOption, }: WfoRadioDropdownProps<T>) => _emotion_react_jsx_runtime.JSX.Element;
 
 interface WfoSubscriptionNoteEditProps {
-    subscriptionId: Subscription['subscriptionId'];
     onlyShowOnHover?: boolean;
     queryVariables: Record<string, unknown>;
-    useQuery: UseQuery<SubscriptionListResponse, Subscription>;
+    endpointName: string | undefined;
+    subscription: SubscriptionListItem;
 }
 declare const WfoSubscriptionNoteEdit: FC<WfoSubscriptionNoteEditProps>;
 
@@ -17874,7 +17874,7 @@ declare const METADATA_PRODUCT_BLOCK_ENDPOINT = "product_blocks";
 declare const METADATA_RESOURCE_TYPE_ENDPOINT = "resource_types";
 declare const METADATA_WORKFLOWS_ENDPOINT = "workflows";
 
-declare const ORCHESTRATOR_UI_LIBRARY_VERSION = "5.2.1";
+declare const ORCHESTRATOR_UI_LIBRARY_VERSION = "5.2.3";
 
 declare const useGetTranslationMessages: (locale: string | undefined) => {
     pydanticForms: {

package/dist/index.js

@@ -26799,7 +26799,7 @@ var PolicyResource = /* @__PURE__ */ ((PolicyResource2) => {
 })(PolicyResource || {});
 
 // src/configuration/version.ts
-var ORCHESTRATOR_UI_LIBRARY_VERSION = "5.2.1";
+var ORCHESTRATOR_UI_LIBRARY_VERSION = "5.2.3";
 
 // src/types/types.ts
 var EngineStatus = /* @__PURE__ */ ((EngineStatus3) => {
@@ -51409,7 +51409,7 @@ var WfoProcessSubscriptionDelta = ({
   const subscriptionId = data?.current_state?.subscription?.subscription_id ?? "";
   const newText = data?.current_state?.subscription ?? null;
   const oldSubscriptions = data?.current_state?.__old_subscriptions__ || {};
-  const oldSubscription = subscriptionId in oldSubscriptions;
+  const oldSubscription = subscriptionId in oldSubscriptions ? oldSubscriptions[subscriptionId] : null;
   const oldText = oldSubscription || null;
   return isFetching ? /* @__PURE__ */ jsx218(WfoLoading, {}) : /* @__PURE__ */ jsx218(
     WfoDiff_default,
@@ -53085,36 +53085,39 @@ var WfoStartTaskButtonComboBox = () => {
 
 // src/components/WfoSubscriptionsList/subscriptionResultMappers.ts
 var mapGraphQlSubscriptionsResultToPageInfo = (graphqlResponse) => graphqlResponse.pageInfo;
-var mapGraphQlSubscriptionsResultToSubscriptionListItems = (graphqlResponse) => graphqlResponse.subscriptions.map((subscription) => {
-  const {
-    description,
-    insync,
-    product,
-    startDate,
-    endDate,
-    status,
-    subscriptionId,
-    note,
-    customer,
-    metadata
-  } = subscription;
-  const { name: productName, tag } = product;
-  const { fullname: customerFullname, shortcode: customerShortcode } = customer;
-  return {
-    subscriptionId,
-    description,
-    status,
-    insync,
-    startDate: parseDate(startDate),
-    endDate: parseDate(endDate),
-    note,
-    productName,
-    tag,
-    customerFullname,
-    customerShortcode,
-    metadata: Object.keys(metadata).length > 0 ? metadata : null
-  };
-});
+var mapGraphQlSubscriptionsResultToSubscriptionListItems = (graphqlResponse) => {
+  if (!graphqlResponse) return [];
+  return graphqlResponse.subscriptions.map((subscription) => {
+    const {
+      description,
+      insync,
+      product,
+      startDate,
+      endDate,
+      status,
+      subscriptionId,
+      note,
+      customer,
+      metadata
+    } = subscription;
+    const { name: productName, tag } = product;
+    const { fullname: customerFullname, shortcode: customerShortcode } = customer;
+    return {
+      subscriptionId,
+      description,
+      status,
+      insync,
+      startDate: parseDate(startDate),
+      endDate: parseDate(endDate),
+      note,
+      productName,
+      tag,
+      customerFullname,
+      customerShortcode,
+      metadata: Object.keys(metadata).length > 0 ? metadata : null
+    };
+  });
+};
 
 // src/components/WfoSubscriptionsList/subscriptionListTabs.ts
 var WfoSubscriptionListTab = /* @__PURE__ */ ((WfoSubscriptionListTab2) => {
@@ -53228,24 +53231,16 @@ var {
 // src/components/WfoInlineNoteEdit/WfoSubscriptionNoteEdit.tsx
 import { jsx as jsx241 } from "@emotion/react/jsx-runtime";
 var WfoSubscriptionNoteEdit = ({
-  subscriptionId,
   onlyShowOnHover = false,
   queryVariables,
-  useQuery
+  endpointName,
+  subscription
 }) => {
-  const { selectedItem } = useQuery(queryVariables, {
-    selectFromResult: (result) => ({
-      selectedItem: result?.data?.subscriptions?.find(
-        (sub) => sub.subscriptionId === subscriptionId
-      )
-    })
-  });
-  const endpointName = useQuery().endpointName;
   const [startProcess] = useStartProcessMutation();
   const [updateSub] = useUpdateSubscriptionNoteOptimisticMutation();
   const triggerNoteModifyWorkflow = (note) => {
     const noteModifyPayload = [
-      { subscription_id: subscriptionId },
+      { subscription_id: subscription.subscriptionId },
       { note: note === INVISIBLE_CHARACTER ? "" : note }
     ];
     startProcess({
@@ -53254,7 +53249,7 @@ var WfoSubscriptionNoteEdit = ({
     });
     updateSub({
       queryName: endpointName ?? "",
-      subscriptionId,
+      subscriptionId: subscription.subscriptionId,
       graphQlQueryVariables: queryVariables,
       note
     });
@@ -53262,7 +53257,7 @@ var WfoSubscriptionNoteEdit = ({
   return /* @__PURE__ */ jsx241(
     WfoInlineEdit,
     {
-      value: selectedItem?.note?.trim() ? selectedItem.note : INVISIBLE_CHARACTER,
+      value: subscription?.note?.trim() ? subscription.note : INVISIBLE_CHARACTER,
       onlyShowOnHover,
       onSave: triggerNoteModifyWorkflow
     }
@@ -53281,6 +53276,16 @@ var WfoSubscriptionsList = ({
   const t = useTranslations82("subscriptions.index");
   const tError = useTranslations82("errors");
   const { showToastMessage } = useShowToastMessage();
+  const { sortBy: sortBy2, queryString, pageIndex, pageSize } = dataDisplayParams;
+  const graphqlQueryVariables = {
+    first: pageSize,
+    after: pageIndex * pageSize,
+    sortBy: sortBy2,
+    filterBy: alwaysOnFilters,
+    query: queryString || void 0
+  };
+  const { data, isFetching, error, endpointName } = useGetSubscriptionListQuery(graphqlQueryVariables);
+  const subscriptionList = mapGraphQlSubscriptionsResultToSubscriptionListItems(data);
   const tableColumnConfig = {
     subscriptionId: {
       columnType: "data" /* DATA */,
@@ -53352,10 +53357,10 @@ var WfoSubscriptionsList = ({
         return /* @__PURE__ */ jsx242(
           WfoSubscriptionNoteEdit,
           {
-            queryVariables: graphqlQueryVariables,
-            subscriptionId: row.subscriptionId,
             onlyShowOnHover: true,
-            useQuery: useGetSubscriptionListQuery
+            endpointName,
+            queryVariables: graphqlQueryVariables,
+            subscription: row
           }
         );
       }
@@ -53369,17 +53374,6 @@ var WfoSubscriptionsList = ({
       renderTooltip: (value) => value && /* @__PURE__ */ jsx242(WfoJsonCodeBlock, { data: value, isBasicStyle: false })
     }
   };
-  const { sortBy: sortBy2, queryString, pageIndex, pageSize } = dataDisplayParams;
-  const graphqlQueryVariables = {
-    first: pageSize,
-    after: pageIndex * pageSize,
-    sortBy: sortBy2,
-    filterBy: alwaysOnFilters,
-    query: queryString || void 0
-  };
-  const { data, isFetching, error } = useGetSubscriptionListQuery(
-    graphqlQueryVariables
-  );
   const [getSubscriptionListTrigger, { isFetching: isFetchingCsv }] = useLazyGetSubscriptionListQuery();
   const getSubscriptionListForExport = () => getSubscriptionListTrigger(
     getQueryVariablesForExport(graphqlQueryVariables)
@@ -53397,29 +53391,39 @@ var WfoSubscriptionsList = ({
     sortOrder: dataDisplayParams.sortBy?.order ?? "ASC" /* ASC */
   };
   const { totalItems, sortFields, filterFields } = data?.pageInfo ?? {};
+  const pageChange = getPageIndexChangeHandler(setDataDisplayParam);
+  const pageSizeChange = getPageSizeChangeHandler(setDataDisplayParam);
+  const updateQuery = getQueryStringHandler(setDataDisplayParam);
+  const updateSorting = getDataSortHandler(setDataDisplayParam);
   const pagination = {
     pageIndex: dataDisplayParams.pageIndex,
     pageSize: dataDisplayParams.pageSize,
     pageSizeOptions: DEFAULT_PAGE_SIZES,
     totalItemCount: totalItems ?? 0,
-    onChangePage: getPageIndexChangeHandler(
-      setDataDisplayParam
-    ),
-    onChangeItemsPerPage: getPageSizeChangeHandler(setDataDisplayParam)
-  };
+    onChangePage: pageChange,
+    onChangeItemsPerPage: pageSizeChange
+  };
+  const exportData = csvDownloadHandler(
+    getSubscriptionListForExport,
+    mapGraphQlSubscriptionsResultToSubscriptionListItems,
+    mapGraphQlSubscriptionsResultToPageInfo,
+    Object.keys(tableColumnConfig),
+    getCsvFileNameWithDate("Subscriptions"),
+    showToastMessage,
+    tError
+  );
+  const tableConfig = mapSortableAndFilterableValuesToTableColumnConfig(
+    tableColumnConfig,
+    sortFields,
+    filterFields
+  );
   return /* @__PURE__ */ jsx242(
     WfoAdvancedTable,
     {
       queryString: dataDisplayParams.queryString,
-      onUpdateQueryString: getQueryStringHandler(
-        setDataDisplayParam
-      ),
-      data: data ? mapGraphQlSubscriptionsResultToSubscriptionListItems(data) : [],
-      tableColumnConfig: mapSortableAndFilterableValuesToTableColumnConfig(
-        tableColumnConfig,
-        sortFields,
-        filterFields
-      ),
+      onUpdateQueryString: updateQuery,
+      data: subscriptionList,
+      tableColumnConfig: tableConfig,
       defaultHiddenColumns: hiddenColumns,
       dataSorting: [dataSorting],
       isLoading: isFetching,
@@ -53427,18 +53431,8 @@ var WfoSubscriptionsList = ({
       detailModalTitle: "Details - Subscription",
       pagination,
       error: mapRtkErrorToWfoError(error),
-      onUpdateDataSorting: getDataSortHandler(
-        setDataDisplayParam
-      ),
-      onExportData: csvDownloadHandler(
-        getSubscriptionListForExport,
-        mapGraphQlSubscriptionsResultToSubscriptionListItems,
-        mapGraphQlSubscriptionsResultToPageInfo,
-        Object.keys(tableColumnConfig),
-        getCsvFileNameWithDate("Subscriptions"),
-        showToastMessage,
-        tError
-      ),
+      onUpdateDataSorting: updateSorting,
+      onExportData: exportData,
       exportDataIsLoading: isFetchingCsv
     }
   );
@@ -54054,7 +54048,7 @@ var WfoMyWorkflowsSummaryCard = ({
   const queryParams = {
     ["activeTab" /* ACTIVE_TAB */]: "COMPLETED" /* COMPLETED */,
     ["sortBy" /* SORT_BY */]: "field-lastModifiedAt_order-DESC",
-    ["queryString" /* QUERY_STRING */]: `createdBy:${username}`
+    ["queryString" /* QUERY_STRING */]: `createdBy:"${username}"`
   };
   return /* @__PURE__ */ jsx253(
     WfoSummaryCard,