Merge pull request #1693 from vivid-planet/merge-main-into-next

Merge main into next
vivid-planet · Feb 13, 2024 · 0ba88ac · 0ba88ac
2 parents ec4ef75 + 8f7129a
commit 0ba88ac
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 49 deletions.
diff --git a/.changeset/atlantic-scallop-fisherman b/.changeset/atlantic-scallop-fisherman
@@ -0,0 +1,5 @@
+---
+"@comet/cms-api": patch
+---
+
+API Generator: Disable input generation if `create` and `update` are set to `false` in the decorator
diff --git a/.changeset/neat-rivers-hammer.md b/.changeset/neat-rivers-hammer.md
@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": patch
+---
+
+Use `useCurrentUser` hook where possible
diff --git a/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx b/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
@@ -6,7 +6,7 @@ import React from "react";
 import { FormattedMessage } from "react-intl";
 
 import { AboutModal } from "./about/AboutModal";
-import { GQLCurrentUserQuery, GQLSignOutMutation } from "./UserHeaderItem.generated";
+import { GQLSignOutMutation } from "./UserHeaderItem.generated";
 
 const DropdownContent = styled(Box)`
     width: 250px;
@@ -24,21 +24,9 @@ const Separator = styled(Box)`
     margin-bottom: 20px;
 `;
 
-const LoadingWrapper = styled("div")`
-    width: 60px;
-    height: 100%;
-    border-left: 1px solid rgba(255, 255, 255, 0.2);
-`;
+import { gql, useMutation } from "@apollo/client";
 
-import { gql, useMutation, useQuery } from "@apollo/client";
-
-const currentUserQuery = gql`
-    query CurrentUser {
-        currentUser {
-            name
-        }
-    }
-`;
+import { useCurrentUser } from "../../userPermissions/hooks/currentUser";
 
 const signOutMutation = gql`
     mutation SignOut {
@@ -53,19 +41,12 @@ interface UserHeaderItemProps {
 export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
     const { aboutModalLogo } = props;
 
+    const user = useCurrentUser();
     const [showAboutModal, setShowAboutModal] = React.useState(false);
-    const { loading, data } = useQuery<GQLCurrentUserQuery>(currentUserQuery);
     const [signOut, { loading: isSigningOut }] = useMutation<GQLSignOutMutation>(signOutMutation);
 
-    if (loading || !data)
-        return (
-            <LoadingWrapper>
-                <Loading behavior="fillParent" sx={{ fontSize: 20 }} color="inherit" />
-            </LoadingWrapper>
-        );
-
     return (
-        <AppHeaderDropdown buttonChildren={data.currentUser.name} startIcon={<Account />}>
+        <AppHeaderDropdown buttonChildren={user.name} startIcon={<Account />}>
             <DropdownContent padding={4}>
                 <Button
                     fullWidth={true}

diff --git a/packages/admin/cms-admin/src/dashboard/DefaultGreeting.tsx b/packages/admin/cms-admin/src/dashboard/DefaultGreeting.tsx
@@ -1,23 +1,9 @@
-import { gql, useQuery } from "@apollo/client";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 
-import { GQLDashboardCurrentUserNameQuery } from "./DefaultGreeting.generated";
-
-const CURRENT_USER_NAME_QUERY = gql`
-    query DashboardCurrentUserName {
-        currentUser {
-            name
-        }
-    }
-`;
+import { useCurrentUser } from "../userPermissions/hooks/currentUser";
 
 export const DefaultGreeting = () => {
-    const { data } = useQuery<GQLDashboardCurrentUserNameQuery>(CURRENT_USER_NAME_QUERY);
-
-    if (data) {
-        return <FormattedMessage id="dashboard.userGreeting" defaultMessage="Hello {givenName}!" values={{ givenName: data.currentUser.name }} />;
-    }
-
-    return <FormattedMessage id="dashboard.greeting" defaultMessage="Hello!" />;
+    const user = useCurrentUser();
+    return <FormattedMessage id="dashboard.userGreeting" defaultMessage="Hello {givenName}!" values={{ givenName: user.name }} />;
 };
diff --git a/packages/api/cms-api/src/generator/generate-crud-input.ts b/packages/api/cms-api/src/generator/generate-crud-input.ts
@@ -12,13 +12,7 @@ import {
     findInputClassImportPath,
     morphTsProperty,
 } from "./utils/ts-morph-helper";
-import { GeneratedFile, writeGeneratedFiles } from "./utils/write-generated-files";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function writeCrudInput(generatorOptions: { targetDirectory: string }, metadata: EntityMetadata<any>): Promise<void> {
-    const files = await generateCrudInput(generatorOptions, metadata);
-    await writeGeneratedFiles(files, generatorOptions);
-}
+import { GeneratedFile } from "./utils/write-generated-files";
 
 function tsCodeRecordToString(object: Record<string, string | undefined>) {
     const filteredEntries = Object.entries(object).filter(([key, value]) => value !== undefined);

diff --git a/packages/api/cms-api/src/generator/generate-crud.ts b/packages/api/cms-api/src/generator/generate-crud.ts
@@ -982,5 +982,8 @@ export async function generateCrud(generatorOptionsParam: CrudGeneratorOptions,
         return generatedFiles;
     }
 
-    return [...(await generateCrudInput(generatorOptions, metadata)), ...(await generateCrudResolver())];
+    const crudInput = await generateCrudInput(generatorOptions, metadata);
+    const crudResolver = await generateCrudResolver();
+
+    return generatorOptions.create || generatorOptions.update ? [...crudInput, ...crudResolver] : [...crudResolver];
 }