Skip to content

Add subscriptionPath option for Subscriptions in NMS #1627

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 1 commit into from
Dec 12, 2024
Merged

Add subscriptionPath option for Subscriptions in NMS #1627

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
5 changes: 5 additions & 0 deletions .changeset/thick-melons-agree.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
---

1620 Add subscriptionPath option for WfoRelatedSubscriptions, WfoSubscriptionDetailTree
4 changes: 3 additions & 1 deletion ...ges/orchestrator-ui-components/src/components/WfoSubscription/WfoRelatedSubscriptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@ export type RelatedSubscriptionListItem = Pick<

interface WfoRelatedSubscriptionsProps {
subscriptionId: string;
subscriptionPath?: string;
}

export const WfoRelatedSubscriptions = ({
subscriptionId,
subscriptionPath = PATH_SUBSCRIPTIONS,
}: WfoRelatedSubscriptionsProps) => {
const [hideTerminatedSubscriptions, setHideTerminatedSubscriptions] =
useState<boolean>(true);
Expand Down Expand Up @@ -109,7 +111,7 @@ export const WfoRelatedSubscriptions = ({
renderData: (value, record) => (
<Link
target="_blank"
href={`${PATH_SUBSCRIPTIONS}/${record.subscriptionId}`}
href={`${subscriptionPath}/${record.subscriptionId}`}
>
{value}
</Link>
Expand Down
5 changes: 4 additions & 1 deletion ...s/orchestrator-ui-components/src/components/WfoSubscription/WfoSubscriptionDetailTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useTranslations } from 'next-intl';

import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';

import { WfoLoading, WfoTextAnchor } from '@/components';
import { PATH_SUBSCRIPTIONS, WfoLoading, WfoTextAnchor } from '@/components';
import { TreeContext, TreeContextType } from '@/contexts';
import { useOrchestratorTheme, useWithOrchestratorTheme } from '@/hooks';
import {
Expand All @@ -24,11 +24,13 @@ import { getProductBlockTitle } from './utils';
interface WfoSubscriptionDetailTreeProps {
productBlockInstances: ProductBlockInstance[];
subscriptionId: Subscription['subscriptionId'];
subscriptionPath?: string;
}

export const WfoSubscriptionDetailTree = ({
productBlockInstances,
subscriptionId,
subscriptionPath = PATH_SUBSCRIPTIONS,
}: WfoSubscriptionDetailTreeProps) => {
const t = useTranslations('subscriptions.detail');
const { theme } = useOrchestratorTheme();
Expand Down Expand Up @@ -210,6 +212,7 @@ export const WfoSubscriptionDetailTree = ({
key={id}
subscriptionId={subscriptionId}
productBlock={block}
subscriptionPath={subscriptionPath}
/>
);
})}
Expand Down
10 changes: 4 additions & 6 deletions ...rc/components/WfoSubscription/WfoSubscriptionProductBlock/WfoSubscriptionProductBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ import {
EuiText,
} from '@elastic/eui';

import {
PATH_SUBSCRIPTIONS,
WfoProductBlockKeyValueRow,
WfoValueCell,
} from '@/components';
import { WfoProductBlockKeyValueRow, WfoValueCell } from '@/components';
import { useWithOrchestratorTheme } from '@/hooks';
import { ProductBlockInstance, Subscription } from '@/types';
import { getFirstUuidPart } from '@/utils';
Expand All @@ -32,13 +28,15 @@ import { getStyles } from './styles';
interface WfoSubscriptionProductBlockProps {
productBlock: ProductBlockInstance;
subscriptionId: Subscription['subscriptionId'];
subscriptionPath: string;
}

export const HIDDEN_KEYS = ['title', 'name', 'label', 'inUseByIds'];

export const WfoSubscriptionProductBlock = ({
productBlock,
subscriptionId,
subscriptionPath,
}: WfoSubscriptionProductBlockProps) => {
const t = useTranslations('subscriptions.detail');
const {
Expand Down Expand Up @@ -139,7 +137,7 @@ export const WfoSubscriptionProductBlock = ({
value={
<>
<a
href={`${PATH_SUBSCRIPTIONS}/${ownerSubscriptionId}`}
href={`${subscriptionPath}/${ownerSubscriptionId}`}
target="_blank"
>
{
Expand Down
Loading