Skip to content

Fix query error in WfoSubscriptionNoteEdit by using existing data #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −76
Open

Fix query error in WfoSubscriptionNoteEdit by using existing data #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions ...s/orchestrator-ui-components/src/components/WfoInlineNoteEdit/WfoSubscriptionNoteEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
import type { FC } from 'react';
import React from 'react';

import { ApiResult, SubscriptionListResponse, UseQuery } from '@/rtk';
import { useStartProcessMutation } from '@/rtk/endpoints/forms';
import { useUpdateSubscriptionNoteOptimisticMutation } from '@/rtk/endpoints/subscriptionListMutation';
import { Subscription } from '@/types';
import { INVISIBLE_CHARACTER } from '@/utils';

import { WfoInlineEdit } from '../WfoInlineEdit';
import { SubscriptionListItem } from '../WfoSubscriptionsList';

interface WfoSubscriptionNoteEditProps {
subscriptionId: Subscription['subscriptionId'];
onlyShowOnHover?: boolean;
queryVariables: Record<string, unknown>;
useQuery: UseQuery<SubscriptionListResponse, Subscription>;
endpointName: string | undefined;
subscription: SubscriptionListItem;
}

export const WfoSubscriptionNoteEdit: FC<WfoSubscriptionNoteEditProps> = ({
subscriptionId,
onlyShowOnHover = false,
queryVariables,
useQuery,
endpointName,
subscription,
}) => {
const { selectedItem } = useQuery(queryVariables, {
selectFromResult: (result: ApiResult<SubscriptionListResponse>) => ({
selectedItem: result?.data?.subscriptions?.find(
(sub) => sub.subscriptionId === subscriptionId,
),
}),
});
const endpointName = useQuery().endpointName;
const [startProcess] = useStartProcessMutation();
const [updateSub] = useUpdateSubscriptionNoteOptimisticMutation();

const triggerNoteModifyWorkflow = (note: string) => {
const noteModifyPayload = [
{ subscription_id: subscriptionId },
{ subscription_id: subscription.subscriptionId },
{ note: note === INVISIBLE_CHARACTER ? '' : note },
];
startProcess({
Expand All @@ -45,7 +36,7 @@ export const WfoSubscriptionNoteEdit: FC<WfoSubscriptionNoteEditProps> = ({

updateSub({
queryName: endpointName ?? '',
subscriptionId: subscriptionId,
subscriptionId: subscription.subscriptionId,
graphQlQueryVariables: queryVariables,
note: note,
});
Expand All @@ -54,8 +45,8 @@ export const WfoSubscriptionNoteEdit: FC<WfoSubscriptionNoteEditProps> = ({
return (
<WfoInlineEdit
value={
selectedItem?.note?.trim()
? selectedItem.note
subscription?.note?.trim()
? subscription.note
: INVISIBLE_CHARACTER
}
onlyShowOnHover={onlyShowOnHover}
Expand Down
107 changes: 52 additions & 55 deletions ...s/orchestrator-ui-components/src/components/WfoSubscriptionsList/WfoSubscriptionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ import { WfoAdvancedTableColumnConfig } from '@/components/WfoTable/WfoAdvancedT
import { ColumnType } from '@/components/WfoTable/WfoTable';
import { mapSortableAndFilterableValuesToTableColumnConfig } from '@/components/WfoTable/WfoTable/utils';
import { DataDisplayParams, useShowToastMessage } from '@/hooks';
import { UseQuery } from '@/rtk';
import {
SubscriptionListResponse,
useGetSubscriptionListQuery,
useLazyGetSubscriptionListQuery,
} from '@/rtk/endpoints/subscriptionList';
import { mapRtkErrorToWfoError } from '@/rtk/utils';
import { GraphqlQueryVariables, SortOrder, Subscription } from '@/types';
import { GraphqlQueryVariables, SortOrder } from '@/types';
import {
getQueryVariablesForExport,
getTypedFieldFromObject,
Expand Down Expand Up @@ -78,6 +76,22 @@ export const WfoSubscriptionsList: FC<WfoSubscriptionsListProps> = ({
const tError = useTranslations('errors');
const { showToastMessage } = useShowToastMessage();

const { sortBy, queryString, pageIndex, pageSize } = dataDisplayParams;

const graphqlQueryVariables: GraphqlQueryVariables<SubscriptionListItem> = {
first: pageSize,
after: pageIndex * pageSize,
sortBy,
filterBy: alwaysOnFilters,
query: queryString || undefined,
};

const { data, isFetching, error, endpointName } =
useGetSubscriptionListQuery(graphqlQueryVariables);

const subscriptionList =
mapGraphQlSubscriptionsResultToSubscriptionListItems(data);

const tableColumnConfig: WfoAdvancedTableColumnConfig<SubscriptionListItem> =
{
subscriptionId: {
Expand Down Expand Up @@ -155,15 +169,10 @@ export const WfoSubscriptionsList: FC<WfoSubscriptionsListProps> = ({
renderData: (cellValue, row) => {
return (
<WfoSubscriptionNoteEdit
queryVariables={graphqlQueryVariables}
subscriptionId={row.subscriptionId}
onlyShowOnHover={true}
useQuery={
useGetSubscriptionListQuery as UseQuery<
SubscriptionListResponse,
Subscription
>
}
endpointName={endpointName}
queryVariables={graphqlQueryVariables}
subscription={row}
/>
);
},
Expand All @@ -182,19 +191,6 @@ export const WfoSubscriptionsList: FC<WfoSubscriptionsListProps> = ({
},
};

const { sortBy, queryString, pageIndex, pageSize } = dataDisplayParams;

const graphqlQueryVariables: GraphqlQueryVariables<SubscriptionListItem> = {
first: pageSize,
after: pageIndex * pageSize,
sortBy,
filterBy: alwaysOnFilters,
query: queryString || undefined,
};

const { data, isFetching, error } = useGetSubscriptionListQuery(
graphqlQueryVariables,
);
const [getSubscriptionListTrigger, { isFetching: isFetchingCsv }] =
useLazyGetSubscriptionListQuery();
const getSubscriptionListForExport = () =>
Expand All @@ -217,54 +213,55 @@ export const WfoSubscriptionsList: FC<WfoSubscriptionsListProps> = ({
};
const { totalItems, sortFields, filterFields } = data?.pageInfo ?? {};

const pageChange =
getPageIndexChangeHandler<SubscriptionListItem>(setDataDisplayParam);
const pageSizeChange =
getPageSizeChangeHandler<SubscriptionListItem>(setDataDisplayParam);
const updateQuery =
getQueryStringHandler<SubscriptionListItem>(setDataDisplayParam);
const updateSorting =
getDataSortHandler<SubscriptionListItem>(setDataDisplayParam);

const pagination: Pagination = {
pageIndex: dataDisplayParams.pageIndex,
pageSize: dataDisplayParams.pageSize,
pageSizeOptions: DEFAULT_PAGE_SIZES,
totalItemCount: totalItems ?? 0,
onChangePage:
getPageIndexChangeHandler<SubscriptionListItem>(
setDataDisplayParam,
),
onChangeItemsPerPage:
getPageSizeChangeHandler<SubscriptionListItem>(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 (
<WfoAdvancedTable
queryString={dataDisplayParams.queryString}
onUpdateQueryString={getQueryStringHandler<SubscriptionListItem>(
setDataDisplayParam,
)}
data={
data
? mapGraphQlSubscriptionsResultToSubscriptionListItems(data)
: []
}
tableColumnConfig={mapSortableAndFilterableValuesToTableColumnConfig(
tableColumnConfig,
sortFields,
filterFields,
)}
onUpdateQueryString={updateQuery}
data={subscriptionList}
tableColumnConfig={tableConfig}
defaultHiddenColumns={hiddenColumns}
dataSorting={[dataSorting]}
isLoading={isFetching}
localStorageKey={SUBSCRIPTIONS_TABLE_LOCAL_STORAGE_KEY}
detailModalTitle={'Details - Subscription'}
pagination={pagination}
error={mapRtkErrorToWfoError(error)}
onUpdateDataSorting={getDataSortHandler<SubscriptionListItem>(
setDataDisplayParam,
)}
onExportData={csvDownloadHandler(
getSubscriptionListForExport,
mapGraphQlSubscriptionsResultToSubscriptionListItems,
mapGraphQlSubscriptionsResultToPageInfo,
Object.keys(tableColumnConfig),
getCsvFileNameWithDate('Subscriptions'),
showToastMessage,
tError,
)}
onUpdateDataSorting={updateSorting}
onExportData={exportData}
exportDataIsLoading={isFetchingCsv}
/>
);
Expand Down
8 changes: 5 additions & 3 deletions ...chestrator-ui-components/src/components/WfoSubscriptionsList/subscriptionResultMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ export const mapGraphQlSubscriptionsResultToPageInfo = (
) => graphqlResponse.pageInfo;

export const mapGraphQlSubscriptionsResultToSubscriptionListItems = (
graphqlResponse: SubscriptionListResponse,
): SubscriptionListItem[] =>
graphqlResponse.subscriptions.map((subscription) => {
graphqlResponse: SubscriptionListResponse | undefined,
): SubscriptionListItem[] => {
if (!graphqlResponse) return [];
return graphqlResponse.subscriptions.map((subscription) => {
const {
description,
insync,
Expand Down Expand Up @@ -55,3 +56,4 @@ export const mapGraphQlSubscriptionsResultToSubscriptionListItems = (
metadata: Object.keys(metadata).length > 0 ? metadata : null,
};
});
};