Skip to content

1240 Refactor WfoSubscriptionGeneral, use WfoSubscriptionDetailSection in form #1410

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

Merged
Georgi2704 merged 3 commits into from
Sep 9, 2024
Merged

1240 Refactor WfoSubscriptionGeneral, use WfoSubscriptionDetailSection in form #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3d4f6b
Refactor the WfoSubscriptionDetail sections, now using the WfoSubscri…
Georgi2704 Sep 5, 2024
74b1593
Fix imports
Georgi2704 Sep 5, 2024
05a32c9
Small refactor
Georgi2704 Sep 9, 2024
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
5 changes: 5 additions & 0 deletions .changeset/curvy-rabbits-arrive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@orchestrator-ui/orchestrator-ui-components': minor
---

Refactor WfoSubscriptionGeneral, use WfoSubscriptionDetailSection in forms
2 changes: 1 addition & 1 deletion apps/wfo-ui
Open in desktop
Submodule wfo-ui updated 3 files
+3 −1 .env.example
+7 −0 configuration/configuration.ts
+4 −3 package-lock.json
9 changes: 5 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...rchestrator-ui-components/src/components/WfoForms/formFields/SubscriptionSummaryField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 SURF.
* Copyright 2019-2024 SURF.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand All @@ -18,7 +18,7 @@ import { connectField, filterDOMProps } from 'uniforms';

import { EuiFormRow, EuiText } from '@elastic/eui';

import { WfoLoading, WfoSubscriptionGeneral } from '@/components';
import { WfoLoading, WfoSubscriptionDetailSection } from '@/components';
import { useGetSubscriptionDetailQuery } from '@/rtk';

import { FieldProps } from './types';
Expand All @@ -35,14 +35,15 @@ const SubscriptionSummaryDisplay = ({
const { data, isFetching } = useGetSubscriptionDetailQuery({
subscriptionId,
});
const subscriptionDetail = data?.subscription;

if (!data) {
if (!subscriptionDetail) {
return <WfoLoading />;
}

return (
<WfoSubscriptionGeneral
subscriptionDetail={data.subscription}
<WfoSubscriptionDetailSection
subscriptionDetail={subscriptionDetail}
isFetching={isFetching}
/>
);
Expand Down
174 changes: 18 additions & 156 deletions ...ages/orchestrator-ui-components/src/components/WfoSubscription/WfoSubscriptionGeneral.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
import React from 'react';

import { useTranslations } from 'next-intl';

import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';

import { WfoJsonCodeBlock } from '@/components';
import { WfoCustomerDescriptionsField } from '@/components/WfoSubscription/WfoCustomerDescriptionsField';
import { useSubscriptionDetailGeneralSectionConfigurationOverride } from '@/components/WfoSubscription/overrides/useSubscriptionDetailGeneralSectionConfigurationOverride';
import {
WfoSubscriptionDetailSection,
WfoSubscriptionFixedInputSection,
WfoSubscriptionMetadataSection,
WfoSubscriptionProductInfoSection,
useSubscriptionDetailGeneralSectionConfigurationOverride,
} from '@/components';
import { WfoSubscriptionDetailGeneralConfiguration } from '@/rtk';
import { SubscriptionDetail } from '@/types';
import { camelToHuman, formatDate, toOptionalArrayEntry } from '@/utils';

import {
WfoProductStatusBadge,
WfoSubscriptionStatusBadge,
} from '../WfoBadges';
import { WfoKeyValueTableDataType } from '../WfoKeyValueTable/WfoKeyValueTable';
import { SubscriptionKeyValueBlock } from './SubscriptionKeyValueBlock';
import { WfoInSyncField } from './WfoInSyncField';
import { toOptionalArrayEntry } from '@/utils';

interface WfoSubscriptionGeneralProps {
subscriptionDetail: SubscriptionDetail;
Expand All @@ -35,177 +29,45 @@ export const WfoSubscriptionGeneral = ({
subscriptionDetail,
isFetching,
}: WfoSubscriptionGeneralProps) => {
const t = useTranslations('subscriptions.detail');
const { overrideSections } =
useSubscriptionDetailGeneralSectionConfigurationOverride();

const hasCustomerDescriptions =
subscriptionDetail.customerDescriptions.length > 0;
const { metadata, fixedInputs, product } = subscriptionDetail;

const getSubscriptionDetailBlockData = (): WfoKeyValueTableDataType[] => [
{
key: t('subscriptionId'),
value: subscriptionDetail.subscriptionId,
textToCopy: subscriptionDetail.subscriptionId,
},
{
key: t('productName'),
value: subscriptionDetail.product.name,
},
{
key: t('description'),
value: subscriptionDetail.description,
},
{
key: t('startDate'),
value: formatDate(subscriptionDetail.startDate),
},
{
key: t('endDate'),
value: formatDate(subscriptionDetail.endDate),
},
{
key: t('status'),
value: (
<WfoSubscriptionStatusBadge
status={subscriptionDetail.status}
/>
),
},
{
key: t('insync'),
value: (
<WfoInSyncField
subscriptionDetail={subscriptionDetail}
isFetching={isFetching}
/>
),
},
{
key: t('customer'),
value:
subscriptionDetail && subscriptionDetail.customer
? `${subscriptionDetail.customer?.fullname}`
: '-',
},
{
key: t('customerUuid'),
value:
subscriptionDetail && subscriptionDetail.customer
? `${subscriptionDetail.customer?.customerId}`
: '-',
textToCopy: subscriptionDetail.customer?.customerId,
},
...toOptionalArrayEntry(
{
key: t('customerDescriptions'),
value: (
<WfoCustomerDescriptionsField
customerDescriptions={
subscriptionDetail.customerDescriptions
}
/>
),
},
hasCustomerDescriptions,
),
{
key: t('note'),
value: (subscriptionDetail && subscriptionDetail.note) || '-',
},
];

const getMetadataBlockData = (): WfoKeyValueTableDataType[] =>
Object.entries(subscriptionDetail.metadata).map(([key, value]) => ({
key: camelToHuman(key),
value: <WfoJsonCodeBlock data={value} isBasicStyle />,
}));

const getFixedInputBlockData = (): WfoKeyValueTableDataType[] =>
subscriptionDetail.fixedInputs.map((fixedInput) => ({
key: fixedInput.field,
value: fixedInput.value,
}));

const getProductInfoBlockData = (): WfoKeyValueTableDataType[] => {
const product = subscriptionDetail.product;
return [
{
key: t('name'),
value: product.name,
},
{
key: t('description'),
value: product.description,
},
{
key: t('productType'),
value: product.productType,
},
{
key: t('tag'),
value: product.tag,
},
{
key: t('status'),
value: <WfoProductStatusBadge status={product.status} />,
},
{
key: t('created'),
value: formatDate(product.createdAt),
},
{
key: t('endDate'),
value: formatDate(product.endDate),
},
];
};

const hasMetadata = Object.entries(subscriptionDetail.metadata).length > 0;
const hasFixedInputs = subscriptionDetail.fixedInputs.length > 0;
const hasMetadata = Object.entries(metadata).length > 0;
const hasFixedInputs = fixedInputs.length > 0;

const defaultConfiguration: WfoSubscriptionDetailGeneralConfiguration[] = [
{
id: WfoSubscriptionGeneralSections.BLOCK_TITLE_SUBSCRIPTION_DETAILS,
node: (
<SubscriptionKeyValueBlock
title={t('blockTitleSubscriptionDetails')}
keyValues={getSubscriptionDetailBlockData()}
<WfoSubscriptionDetailSection
subscriptionDetail={subscriptionDetail}
isFetching={isFetching}
/>
),
},
...toOptionalArrayEntry(
{
id: WfoSubscriptionGeneralSections.BLOCK_TITLE_METADATA,
node: (
<SubscriptionKeyValueBlock
title={t('metadata')}
keyValues={getMetadataBlockData()}
/>
),
node: <WfoSubscriptionMetadataSection metadata={metadata} />,
},
hasMetadata,
),
...toOptionalArrayEntry(
{
id: WfoSubscriptionGeneralSections.BLOCK_TITLE_FIXED_INPUTS,
node: (
<SubscriptionKeyValueBlock
title={t('blockTitleFixedInputs')}
keyValues={getFixedInputBlockData()}
<WfoSubscriptionFixedInputSection
fixedInputs={fixedInputs}
/>
),
},
hasFixedInputs,
),
{
id: WfoSubscriptionGeneralSections.BLOCK_TITLE_PRODUCT_INFO,
node: (
<SubscriptionKeyValueBlock
title={t('blockTitleProductInfo')}
keyValues={getProductInfoBlockData()}
/>
),
node: <WfoSubscriptionProductInfoSection product={product} />,
},
];

Expand Down
Loading