#538 - wip - fix notification list

MAIF · Aug 22, 2023 · b9fce4b · b9fce4b
1 parent 54f09b4
commit b9fce4b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/daikoku/javascript/src/components/backoffice/notifications/SimpleNotification.tsx b/daikoku/javascript/src/components/backoffice/notifications/SimpleNotification.tsx
@@ -275,6 +275,7 @@ export function SimpleNotification(props: ISimpleNotificationProps) {
                         openSubMetadataModal({
                           save: props.accept,
                           value: props.notification.action.api!,
+                          api: props.notification.action.api?._id,
                           plan: props.notification.action.plan!._id,
                           team: props.notification.action.team,
                           notification: props.notification,

diff --git a/daikoku/javascript/src/contexts/modals/SubscriptionMetadataModal.tsx b/daikoku/javascript/src/contexts/modals/SubscriptionMetadataModal.tsx
@@ -143,9 +143,11 @@ export const SubscriptionMetadataModal = <T extends IWithTesting>(props: Subscri
   })
 
 
-  if (!!props.api && apiQuery.isLoading) {
+  console.debug(props.plan, planQuery.data, apiQuery.data)
+
+  if (!!props.api && apiQuery.isLoading || props.plan && planQuery.isLoading) {
     return <div className="modal-content"><Spinner /></div>
-  } else if (!props.api || (apiQuery.data && !isError(apiQuery.data))) {
+  } else if (!props.api && planQuery.data || (apiQuery.data && !isError(apiQuery.data))) {
     const plan = !!props.plan ? !isError(planQuery.data) ? planQuery.data : undefined : undefined
 
     const maybeSubMetadata = Option(props.subscription)

diff --git a/daikoku/javascript/src/services/index.ts b/daikoku/javascript/src/services/index.ts
@@ -1516,7 +1516,6 @@ export const graphql = {
               api {
                 _id
                 name
-                testing
               }
               team {
                 _id