Merge branch 'dev' into feature/518-public-keys

bcgov · May 18, 2023 · 296c7e1 · 296c7e1
2 parents fcf5cea + e011b1c
commit 296c7e1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/ci-build-deploy.yaml b/.github/workflows/ci-build-deploy.yaml
@@ -310,7 +310,9 @@ jobs:
               - sh
               - -c
               - 'state=\$(curl -XGET -m 2 --silent -f -H \"Accept: application/json\" http://localhost:3000/health | jq -r \".status | ascii_downcase\"); if [ ! \"\$state\" == \"ready\" ]; then exit 1; fi'
-
+            timeoutSeconds: 3
+            periodSeconds: 10
+        
           " > values.yaml
 
           helm repo add bcgov http://bcgov.github.io/helm-charts

diff --git a/src/nextapp/components/authorization-profile-form/authorization-profile-dialog.tsx b/src/nextapp/components/authorization-profile-form/authorization-profile-dialog.tsx
@@ -270,6 +270,7 @@ const AuthorizationProfileDialog: React.FC<AuthorizationProfileDialogProps> = ({
     },
     [data, handleCreateProfile, handleSaveProfile, id]
   );
+  const owner = id ? data?.owner : data?.owner ?? user;
 
   React.useEffect(() => {
     setName(data?.name);
@@ -305,7 +306,7 @@ const AuthorizationProfileDialog: React.FC<AuthorizationProfileDialogProps> = ({
                   </Tab>
                   <Box flex={1} />
                   <Box p="relative" mt={-10} mb={2}>
-                    <UserProfile data={user} />
+                    <UserProfile heading="Owner" data={owner} />
                   </Box>
                 </TabList>
               </Tabs>

diff --git a/src/nextapp/components/table/table.tsx b/src/nextapp/components/table/table.tsx
@@ -22,6 +22,7 @@ interface Column extends TableColumnHeaderProps {
   name: React.ReactNode;
   key?: string;
   sortable?: boolean;
+  sortKey?: string;
 }
 
 interface ApsTableProps extends TableProps {
@@ -109,7 +110,7 @@ const ApsTable: React.FC<ApsTableProps> = ({
                 }
                 onClick={
                   sort && tableProps.key
-                    ? handleSort(tableProps.key)
+                    ? handleSort(tableProps.sortKey ?? tableProps.key)
                     : undefined
                 }
                 _hover={{

diff --git a/src/nextapp/components/user-profile/user-profile.tsx b/src/nextapp/components/user-profile/user-profile.tsx
@@ -26,6 +26,10 @@ const UserProfile: React.FC<UserProfileProps> = ({
   ...props
 }) => {
   const testId = props['data-testid'] ?? 'user-profile';
+  if (!data) {
+    return null;
+  }
+
   return (
     <Box {...props}>
       <Heading size="sm" mb={3.5}>

diff --git a/src/nextapp/pages/manager/consumers/index.tsx b/src/nextapp/pages/manager/consumers/index.tsx
@@ -248,7 +248,7 @@ const ConsumersPage: React.FC<
                 key: 'tags',
                 sortable: false,
               },
-              { name: 'Updated', key: 'sortDate' },
+              { name: 'Updated', key: 'sortDate', sortKey: 'updatedAt' },
             ]}
             data={consumers}
             data-testid="all-consumer-control-tbl"