Status service view includes extraneous top margin above heading (#2185)

* Error creating events by calendar if End Date before Start Date or End time is before Start time * fix:Status service view includes extraneous top margin above heading --------- Co-authored-by: Shuang chen <[email protected]> Co-authored-by: Shuang chen <[email protected]>
GovAlta · Oct 17, 2023 · 8971210 · 8971210
1 parent 0da936b
commit 8971210
Showing 1 changed file with 36 additions and 37 deletions.
diff --git a/apps/tenant-management-webapp/src/app/pages/admin/services/status/status.tsx b/apps/tenant-management-webapp/src/app/pages/admin/services/status/status.tsx
@@ -126,43 +126,6 @@ function Status(): JSX.Element {
   return (
     <Page>
       <Main>
-        <ApplicationFormModal
-          isOpen={showAddApplicationModal}
-          testId={'add-application'}
-          isEdit={false}
-          title="Add application"
-          onCancel={() => {
-            setShowAddApplicationModal(false);
-          }}
-          onSave={() => {
-            if (activeIndex !== 1) {
-              setActiveIndex(1);
-            }
-            setShowAddApplicationModal(false);
-          }}
-          defaultApplication={{
-            name: '',
-            appKey: '',
-            tenantId: '',
-            enabled: false,
-            description: '',
-            endpoint: { url: '', status: 'offline' },
-          }}
-        />
-
-        <WebhookFormModal
-          defaultWebhooks={defaultHooks}
-          isOpen={showAddWebhookModal}
-          testId={'add-webhook'}
-          isEdit={false}
-          title="Add webhook"
-          onCancel={() => {
-            setShowAddWebhookModal(false);
-          }}
-          onSave={() => {
-            setShowAddWebhookModal(false);
-          }}
-        />
         <h1 data-testid="status-title">Status service</h1>
         <Tabs activeIndex={activeIndex} data-testid="status-tabs">
           <Tab label="Overview" data-testid="status-overview-tab">
@@ -238,6 +201,42 @@ function Status(): JSX.Element {
             <NoticeList />
           </Tab>
         </Tabs>
+        <ApplicationFormModal
+          isOpen={showAddApplicationModal}
+          testId={'add-application'}
+          isEdit={false}
+          title="Add application"
+          onCancel={() => {
+            setShowAddApplicationModal(false);
+          }}
+          onSave={() => {
+            if (activeIndex !== 1) {
+              setActiveIndex(1);
+            }
+            setShowAddApplicationModal(false);
+          }}
+          defaultApplication={{
+            name: '',
+            appKey: '',
+            tenantId: '',
+            enabled: false,
+            description: '',
+            endpoint: { url: '', status: 'offline' },
+          }}
+        />
+        <WebhookFormModal
+          defaultWebhooks={defaultHooks}
+          isOpen={showAddWebhookModal}
+          testId={'add-webhook'}
+          isEdit={false}
+          title="Add webhook"
+          onCancel={() => {
+            setShowAddWebhookModal(false);
+          }}
+          onSave={() => {
+            setShowAddWebhookModal(false);
+          }}
+        />
       </Main>
 
       <Aside>