Skip to content
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.

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

fix: Show error when application is deleted form app service #896

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/pr-896-2237159974.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

---
"fusion-project-portal": patch
---
Show error when application is deleted form app service
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ export const AgStyles = {
padding: 0.5rem;
overflow: hidden;
`,
TextCellWrapperLeft: styled.div`
display: flex;
overflow: hidden;
`,
Chip: styled(Chip)`
margin-top: 0.25rem;
`,
Expand Down Expand Up @@ -59,5 +63,10 @@ export const AgStyles = {
}
height: 100%;
position: relative;

.notActive {
font-weight: bold;
background-color: ${tokens.colors.ui.background__danger.hex} !important;
}
`,
};
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { OnboardedAppsActionBar } from './OnboardedAppsActionBar';
import { useResizeObserver } from '../../hooks/use-resise-observer';
import { Message } from '../Message';

const FAIL_MESSAGE = 'Application Error!';

export const AppsTable = ({ onboardedApps }: { onboardedApps: PortalApp[] | undefined }) => {
const [selectedApps, setSelectedApps] = useState<PortalApp[]>([]);
const { mutateAsync: deleteAppByAppKey } = useDeleteOnboardedApp();
Expand All @@ -35,6 +37,9 @@ export const AppsTable = ({ onboardedApps }: { onboardedApps: PortalApp[] | unde
sortable: true,
resizable: true,
}}
rowClassRules={{
notActive: (params) => !Boolean(params.data?.displayName || params.data?.description),
}}
autoSizeStrategy={{
type: 'fitGridWidth',
defaultMinWidth: 80,
Expand All @@ -61,6 +66,9 @@ export const AppsTable = ({ onboardedApps }: { onboardedApps: PortalApp[] | unde
field: 'displayName',
headerName: 'Display Name',
filter: true,
valueFormatter: (params) => {
return params.value ? params.value : FAIL_MESSAGE;
},
},
{
field: 'appKey',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { ActionBar } from './ActionBar';
import { AgStyles } from '../AgStyle';
import { Message } from '../Message';

const FAIL_MESSAGE = 'Application Error!';

export const PortalAppTable = ({ portalApps, canEdit }: { portalApps: PortalApplication[]; canEdit?: boolean }) => {
const ref = useRef(null);
const [_, height] = useResizeObserver(ref);
Expand All @@ -28,6 +30,9 @@ export const PortalAppTable = ({ portalApps, canEdit }: { portalApps: PortalAppl
sortable: true,
resizable: true,
}}
rowClassRules={{
notActive: (params) => !Boolean(params.data?.appManifest),
}}
ensureDomOrder
onGridReady={(event) => {
const api = event.api;
Expand Down Expand Up @@ -57,19 +62,19 @@ export const PortalAppTable = ({ portalApps, canEdit }: { portalApps: PortalAppl
isActive?: boolean;
isContextual?: boolean;
appKey: string;
appManifest: { name: string };
appManifest?: { name: string };
}>
) => {
return (
<AgStyles.CellWrapper key={`active-${params.context?.appKey}`}>
{params.data?.isContextual ? (
<AgStyles.ContextIndicator
title={`${params.data?.appManifest.name} is activated with contexts`}
title={`${params.data?.appManifest?.name} is activated with contexts`}
active={params.data?.isContextual?.toString()}
/>
) : (
<AgStyles.Indicator
title={`${params.data?.appManifest.name} is active`}
title={`${params.data?.appManifest?.name} is active`}
active={params.data?.isActive?.toString()}
/>
)}
Expand Down Expand Up @@ -102,9 +107,20 @@ export const PortalAppTable = ({ portalApps, canEdit }: { portalApps: PortalAppl
filterOptions: ['contains', 'startsWith', 'endsWith'],
defaultOption: 'startsWith',
},
cellRenderer: (
params: CustomCellRendererProps<{
appManifest?: { displayName: string };
}>
) => {
return (
<AgStyles.TextCellWrapperLeft key={`active-${params.context?.appKey}`}>
{params.data?.appManifest ? params.data?.appManifest.displayName : FAIL_MESSAGE}
</AgStyles.TextCellWrapperLeft>
);
},
},
{
field: 'appManifest.appKey',
field: 'appKey',
maxWidth: 350,
headerName: 'Application key',
filterParams: {
Expand All @@ -120,16 +136,34 @@ export const PortalAppTable = ({ portalApps, canEdit }: { portalApps: PortalAppl
filterOptions: ['contains', 'startsWith', 'endsWith'],
defaultOption: 'startsWith',
},
cellRenderer: (
params: CustomCellRendererProps<{
appManifest?: { category: { displayName: string } };
}>
) => {
return (
<AgStyles.TextCellWrapperLeft key={`active-${params.context?.appKey}`}>
{params.data?.appManifest
? params.data?.appManifest.category.displayName
: FAIL_MESSAGE}
</AgStyles.TextCellWrapperLeft>
);
},
},

{
field: 'appManifest.description',
field: 'appManifest',
headerName: 'Description',
filterParams: {
filterOptions: ['contains', 'startsWith', 'endsWith'],
defaultOption: 'startsWith',
},
width: 500,
valueFormatter: (params) => {
return params.data?.appManifest
? params.data?.appManifest.description
: 'Application Missing application manifest! Application may have been deleted from Fusion app service.';
},
},

{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient } from '@tanstack/react-query';
import { PortalApplication } from '../types';
import { PortalApplication } from '../types';

export const mutatePortalApps = (queryClient: QueryClient, portalId: string | undefined, apps: PortalApplication[]) => {
queryClient.cancelQueries({ queryKey: ['portal-onboarded-apps', portalId] });
Expand All @@ -26,8 +26,10 @@ export const mutateDeletePortalApps = (
queryClient.cancelQueries({ queryKey: ['portal-onboarded-apps', portalId] });
const prevApps = queryClient.getQueryData<PortalApplication[]>(['portal-onboarded-apps', portalId]) || [];

const appKeys = apps.map((app) => app.appManifest.appKey);
const newApps = prevApps?.map((prevApp) => (appKeys.includes(prevApp.appManifest.appKey) ? { ...prevApp, isActive: false } : prevApp));
const appKeys = apps.map((app) => app.appKey);
const newApps = prevApps?.map((prevApp) =>
appKeys.includes(prevApp.appKey) ? { ...prevApp, isActive: false } : prevApp
);
queryClient.setQueryData(['portal-onboarded-apps', portalId], newApps);
return { prevApps, newApps };
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const removePortalApps = async (client: IHttpClient, portalApps: PortalAp
const results: Result[] = [];

for (const app of portalApps) {
const result = await removePortalApp(client, app.appManifest.appKey, portalId);
const result = await removePortalApp(client, app.appKey, portalId);
results.push(result);
}

Expand Down
1 change: 1 addition & 0 deletions client/apps/portal-administration/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export type FormattedError = {

export type PortalApp = {
name: string;
displayName: string;
id: string;
appKey: string;
isLegacy: boolean;
Expand Down