refactor: change the workspaceName into the prettyName into tenant qu…

…ery/sub
netgroup-polito · Dec 14, 2021 · a224ed1 · a224ed1
1 parent 3743c97
commit a224ed1
Show file tree

Hide file tree

Showing 24 changed files with 118 additions and 103 deletions.
diff --git a/frontend/src/components/activePage/ActiveViewLogic/ActiveViewLogic.tsx b/frontend/src/components/activePage/ActiveViewLogic/ActiveViewLogic.tsx
@@ -13,14 +13,14 @@ const ActiveViewLogic: FC<{}> = ({ ...props }) => {
 
   const workspaces =
     tenantData?.tenant?.spec?.workspaces?.map(workspace => {
-      const { workspaceWrapperTenantV1alpha2, workspaceId, role } = workspace!;
+      const { workspaceWrapperTenantV1alpha2, name, role } = workspace!;
       const { spec, status } =
         workspaceWrapperTenantV1alpha2?.itPolitoCrownlabsV1alpha1Workspace!;
       return {
-        prettyName: spec?.workspaceName as string,
+        prettyName: spec?.prettyName as string,
         role: WorkspaceRole[role!],
-        namespace: status?.namespace?.workspaceNamespace!,
-        id: workspaceId!,
+        namespace: status?.namespace?.name!,
+        id: name!,
       };
     }) || [];
 
@@ -31,7 +31,7 @@ const ActiveViewLogic: FC<{}> = ({ ...props }) => {
   return !tenantLoading && tenantData && !tenantError ? (
     <ActiveView
       user={{
-        tenantId: tenantData.tenant?.metadata?.tenantId!,
+        tenantId: tenantData.tenant?.metadata?.name!,
         tenantNamespace: tenantData!.tenant?.status?.personalNamespace?.name!,
       }}
       managerView={managerWorkspaces.length > 0}

diff --git a/frontend/src/components/common/Navbar/Navbar.tsx b/frontend/src/components/common/Navbar/Navbar.tsx
@@ -202,7 +202,7 @@ const Navbar: FC<INavbarProps> = ({ ...props }) => {
               <Title
                 className="mb-0"
                 level={5}
-              >{`${data?.tenant?.metadata?.tenantId}`}</Title>
+              >{`${data?.tenant?.metadata?.name}`}</Title>
             )}
             <LogoutButton
               logoutHandler={logoutHandler}

diff --git a/frontend/src/components/common/Navbar/NavbarMenu/NavbarMenu.tsx b/frontend/src/components/common/Navbar/NavbarMenu/NavbarMenu.tsx
@@ -17,7 +17,7 @@ export interface INavbarMenuProps {
 const NavbarMenu: FC<INavbarMenuProps> = ({ ...props }) => {
   const { routes } = props;
   const { data } = useContext(TenantContext);
-  const tenantId = data?.tenant?.metadata?.tenantId!;
+  const tenantId = data?.tenant?.metadata?.name!;
   const currentPath = useLocation().pathname;
 
   const [visible, setVisible] = useState(false);

diff --git a/frontend/src/components/workspaces/DashboardLogic/DashboardLogic.tsx b/frontend/src/components/workspaces/DashboardLogic/DashboardLogic.tsx
@@ -20,13 +20,13 @@ const DashboardLogic: FC<{}> = () => {
             return {
               workspaceId: workspace?.workspaceWrapperTenantV1alpha2
                 ?.itPolitoCrownlabsV1alpha1Workspace?.spec
-                ?.workspaceName as string,
+                ?.prettyName as string,
               role: WorkspaceRole[workspace?.role!],
               workspaceNamespace:
                 workspace?.workspaceWrapperTenantV1alpha2
                   ?.itPolitoCrownlabsV1alpha1Workspace?.status?.namespace
-                  ?.workspaceNamespace!,
-              workspaceName: workspace?.workspaceId!,
+                  ?.name!,
+              workspaceName: workspace?.name!,
             };
           }) ?? []
         }

diff --git a/frontend/src/components/workspaces/ModalCreateTemplate/ModalCreateTemplate.tsx b/frontend/src/components/workspaces/ModalCreateTemplate/ModalCreateTemplate.tsx
@@ -143,7 +143,7 @@ const ModalCreateTemplate: FC<IModalCreateTemplateProps> = ({ ...props }) => {
       !errorFetchTemplates &&
       !loadingFetchTemplates &&
       dataFetchTemplates?.templateList?.templates
-        ?.map(t => t?.spec?.name)
+        ?.map(t => t?.spec?.prettyName)
         .includes(formTemplate.name.trim())
     ) {
       setValid(old => {

diff --git a/frontend/src/components/workspaces/Templates/TemplatesTableLogic/TemplatesTableLogic.tsx b/frontend/src/components/workspaces/Templates/TemplatesTableLogic/TemplatesTableLogic.tsx
@@ -94,8 +94,8 @@ const TemplatesTableLogic: FC<ITemplateTableLogicProps> = ({ ...props }) => {
           getTemplate({
             original: t!,
             alias: {
-              id: t?.metadata?.id!,
-              name: t?.spec?.name!,
+              id: t?.metadata?.name!,
+              name: t?.spec?.prettyName!,
             },
           })
         )!

diff --git a/frontend/src/generated-types.tsx b/frontend/src/generated-types.tsx
diff --git a/frontend/src/graphql-components/mutation/applyTenant.mutation.graphql b/frontend/src/graphql-components/mutation/applyTenant.mutation.graphql
@@ -10,7 +10,7 @@ mutation applyTenant(
     applicationApplyPatchYamlInput: $patchJson
   ) {
     metadata {
-      tenantId: name
+      name
     }
     spec {
       firstName

diff --git a/frontend/src/graphql-components/mutation/createInstance.mutation.graphql b/frontend/src/graphql-components/mutation/createInstance.mutation.graphql
@@ -42,8 +42,8 @@ mutation createInstance(
         templateWrapper {
           itPolitoCrownlabsV1alpha2Template {
             spec {
-              templateName: prettyName
-              templateDescription: description
+              prettyName
+              description
               environmentList {
                 guiEnabled
                 persistent

diff --git a/frontend/src/graphql-components/mutation/createTemplate.mutation.graphql b/frontend/src/graphql-components/mutation/createTemplate.mutation.graphql
@@ -34,7 +34,7 @@ mutation createTemplate(
     }
   ) {
     spec {
-      name: prettyName
+      prettyName
       description
       environmentList {
         guiEnabled
@@ -47,7 +47,7 @@ mutation createTemplate(
       }
     }
     metadata {
-      id: name
+      name
       namespace
     }
   }

diff --git a/frontend/src/graphql-components/query/instances.query.graphql b/frontend/src/graphql-components/query/instances.query.graphql
@@ -22,8 +22,8 @@ query ownedInstances($tenantNamespace: String!) {
           templateWrapper {
             itPolitoCrownlabsV1alpha2Template {
               spec {
-                templateName: prettyName
-                templateDescription: description
+                prettyName
+                description
                 environmentList {
                   guiEnabled
                   persistent

diff --git a/frontend/src/graphql-components/query/instancesLabelSelector.query.graphql b/frontend/src/graphql-components/query/instancesLabelSelector.query.graphql
@@ -15,7 +15,7 @@ query instancesLabelSelector($labels: String) {
         running
         prettyName
         tenantCrownlabsPolitoItTenantRef {
-          tenantId: name
+          name
           tenantV1alpha2Wrapper {
             itPolitoCrownlabsV1alpha2Tenant {
               spec {
@@ -31,8 +31,8 @@ query instancesLabelSelector($labels: String) {
           templateWrapper {
             itPolitoCrownlabsV1alpha2Template {
               spec {
-                templateName: prettyName
-                templateDescription: description
+                prettyName
+                description
                 environmentList {
                   guiEnabled
                   persistent

diff --git a/frontend/src/graphql-components/query/keys.query.graphql b/frontend/src/graphql-components/query/keys.query.graphql
@@ -1,7 +1,7 @@
 query sshKeys($tenantId: String!) {
   tenant: itPolitoCrownlabsV1alpha2Tenant(name: $tenantId) {
     metadata {
-      tenantId: name
+      name
     }
     spec {
       email

diff --git a/frontend/src/graphql-components/query/templates.query.graphql b/frontend/src/graphql-components/query/templates.query.graphql
@@ -4,7 +4,7 @@ query workspaceTemplates($workspaceNamespace: String!) {
   ) {
     templates: items {
       spec {
-        name: prettyName
+        prettyName
         description
         environmentList {
           guiEnabled
@@ -17,7 +17,7 @@ query workspaceTemplates($workspaceNamespace: String!) {
         }
       }
       metadata {
-        id: name
+        name
         namespace
       }
     }

diff --git a/frontend/src/graphql-components/query/tenant.query.graphql b/frontend/src/graphql-components/query/tenant.query.graphql
@@ -6,23 +6,23 @@ query tenant($tenantId: String!) {
       lastName
       workspaces {
         role
-        workspaceId: name
+        name
         workspaceWrapperTenantV1alpha2 {
           itPolitoCrownlabsV1alpha1Workspace {
             spec {
-              workspaceName: prettyName
+              prettyName
             }
             status {
               namespace {
-                workspaceNamespace: name
+                name
               }
             }
           }
         }
       }
     }
     metadata {
-      tenantId: name
+      name
     }
     status {
       personalNamespace {

diff --git a/frontend/src/graphql-components/query/tenants.query.graphql b/frontend/src/graphql-components/query/tenants.query.graphql
@@ -2,7 +2,7 @@ query tenants($labels: String, $retrieveWorkspaces: Boolean = false) {
   tenants: itPolitoCrownlabsV1alpha2TenantList(labelSelector: $labels) {
     items {
       metadata {
-        tenantId: name
+        name
       }
       spec {
         firstName

diff --git a/frontend/src/graphql-components/subscription/instances.subscription.ts b/frontend/src/graphql-components/subscription/instances.subscription.ts
@@ -30,8 +30,8 @@ export default gql`
             templateWrapper {
               itPolitoCrownlabsV1alpha2Template {
                 spec {
-                  templateName: prettyName
-                  templateDescription: description
+                  prettyName
+                  description
                   environmentList {
                     guiEnabled
                     persistent

diff --git a/frontend/src/graphql-components/subscription/instancesLabelSelector.subscription.ts b/frontend/src/graphql-components/subscription/instancesLabelSelector.subscription.ts
@@ -21,7 +21,7 @@ export default gql`
           running
           prettyName
           tenantCrownlabsPolitoItTenantRef {
-            tenantId: name
+            name
             tenantV1alpha2Wrapper {
               itPolitoCrownlabsV1alpha2Tenant {
                 spec {
@@ -37,8 +37,8 @@ export default gql`
             templateWrapper {
               itPolitoCrownlabsV1alpha2Template {
                 spec {
-                  templateName: prettyName
-                  templateDescription: description
+                  prettyName
+                  description
                   environmentList {
                     guiEnabled
                     persistent

diff --git a/frontend/src/graphql-components/subscription/key.subscription.ts b/frontend/src/graphql-components/subscription/key.subscription.ts
@@ -6,7 +6,7 @@ export default gql`
       updateType
       updatedKeys: payload {
         metadata {
-          tenantId: name
+          name
         }
         spec {
           email

diff --git a/frontend/src/graphql-components/subscription/templates.subscription.ts b/frontend/src/graphql-components/subscription/templates.subscription.ts
@@ -12,7 +12,7 @@ export default gql`
       updateType
       template: payload {
         spec {
-          name: prettyName
+          prettyName
           description
           environmentList {
             guiEnabled
@@ -25,7 +25,7 @@ export default gql`
           }
         }
         metadata {
-          id: name
+          name
           namespace
         }
       }

diff --git a/frontend/src/graphql-components/subscription/tenant.subscription.ts b/frontend/src/graphql-components/subscription/tenant.subscription.ts
@@ -11,23 +11,23 @@ export default gql`
           lastName
           workspaces {
             role
-            workspaceId: name
+            name
             workspaceWrapperTenantV1alpha2 {
               itPolitoCrownlabsV1alpha1Workspace {
                 spec {
-                  workspaceName: prettyName
+                  prettyName
                 }
                 status {
                   namespace {
-                    workspaceNamespace: name
+                    name
                   }
                 }
               }
             }
           }
         }
         metadata {
-          tenantId: name
+          name
         }
         status {
           personalNamespace {

diff --git a/frontend/src/graphql-components/tenantContext/TenantContext.tsx b/frontend/src/graphql-components/tenantContext/TenantContext.tsx
@@ -15,6 +15,8 @@ import {
   useSshKeysQuery,
   useTenantQuery,
 } from '../../generated-types';
+import { JSONDeepCopy } from '../../utils';
+import { workspaceGetName } from '../../utilsLogic';
 import { updatedTenant } from '../subscription';
 
 interface ITenantContext {
@@ -52,7 +54,12 @@ const TenantContextProvider: FC<PropsWithChildren<{}>> = props => {
 
   const { loading, error, subscribeToMore } = useTenantQuery({
     variables: { tenantId: userId ?? '' },
-    onCompleted: setData,
+    onCompleted: d => {
+      d!.tenant!.spec?.workspaces!.sort((a, b) =>
+        workspaceGetName(a!).localeCompare(workspaceGetName(b!))
+      );
+      setData(JSONDeepCopy(d));
+    },
     fetchPolicy: 'network-only',
     onError: apolloErrorCatcher,
   });

diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
@@ -114,3 +114,5 @@ export function makeListToggler<T>(
     );
   };
 }
+
+export const JSONDeepCopy = <T>(obj: T) => JSON.parse(JSON.stringify(obj)) as T;
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,3 +114,5 @@ export function makeListToggler<T>( @@
         );
       };
     }
+    export const JSONDeepCopy = <T>(obj: T) => JSON.parse(JSON.stringify(obj)) as T;