bug: Project Create

packages/client/src/pages/projects/NewProject.tsx

@@ -1,28 +1,27 @@
 import { useNavigate } from 'react-router-dom';
-import { Button, Typography } from '@mui/material';
+import { Button } from '@mui/material';
 import { useEffect, useState } from 'react';
 import { materialRenderers, materialCells } from '@jsonforms/material-renderers';
 import { JsonForms } from '@jsonforms/react';
 import { useCreateProjectMutation, useProjectExistsLazyQuery } from '../../graphql/project/project';
 import { ErrorObject } from 'ajv';
 import { useTranslation } from 'react-i18next';
 import { useSnackbar } from '../../context/Snackbar.context';
-
-const initialData = {
-  name: '',
-  description: ''
-};
+import { useProject } from '../../context/Project.context';
+import { ProjectCreate } from '../../graphql/graphql';
 
 export const NewProject: React.FC = () => {
   const navigate = useNavigate();
-  const [data, setData] = useState(initialData);
+  const [data, setData] = useState<ProjectCreate>({} as any);
   const [createProject, { error, data: createProjectResults, loading }] = useCreateProjectMutation({
     variables: { project: data }
   });
   const [projectExistsQuery, projectExistsResults] = useProjectExistsLazyQuery();
   const [additionalErrors, setAdditionalErrors] = useState<ErrorObject[]>([]);
   const { t } = useTranslation();
   const { pushSnackbarMessage } = useSnackbar();
+  const { updateProjectList } = useProject();
+  const [valid, setValid] = useState<boolean>(false);
 
   const schema = {
     type: 'object',
@@ -73,13 +72,16 @@ export const NewProject: React.FC = () => {
           params: { keyword: 'uniqueProjectName' }
         }
       ]);
+      setValid(false);
     } else {
       setAdditionalErrors([]);
+      setValid(true);
     }
   }, [projectExistsResults.data]);
 
   useEffect(() => {
     if (createProjectResults) {
+      updateProjectList();
       navigate('/successpage');
     }
   }, [createProjectResults]);
@@ -88,13 +90,16 @@ export const NewProject: React.FC = () => {
     if (error) {
       pushSnackbarMessage(t('errors.projectCreate'), 'error');
       console.error(error);
+      setValid(false);
     }
   }, [error]);
 
   const handleChange = (data: any, errors: ErrorObject[] | undefined) => {
     setData(data);
     if (!errors || errors.length === 0) {
       projectExistsQuery({ variables: { name: data.name } });
+    } else {
+      setValid(false);
     }
   };
 
@@ -104,11 +109,6 @@ export const NewProject: React.FC = () => {
 
   return (
     <>
-      {error && (
-        <Typography color={'red'} variant="h6">
-          {t('components.newProject.failMessage')}
-        </Typography>
-      )}
       <JsonForms
         schema={schema}
         uischema={uischema}
@@ -118,7 +118,7 @@ export const NewProject: React.FC = () => {
         onChange={({ data, errors }) => handleChange(data, errors)}
         additionalErrors={additionalErrors}
       />
-      <Button variant="contained" onClick={handleSubmit} disabled={loading || projectExistsResults.data?.projectExists}>
+      <Button variant="contained" onClick={handleSubmit} disabled={loading || !valid}>
         {t('common.submit')}
       </Button>
     </>

packages/server/src/project/project.service.ts

@@ -7,7 +7,6 @@ import { CASBIN_PROVIDER } from '../permission/casbin.provider';
 import * as casbin from 'casbin';
 import { TokenPayload } from 'src/jwt/token.dto';
 import { ProjectPermissions } from 'src/permission/permissions/project';
-import { Roles } from 'src/permission/permissions/roles';
 
 @Injectable()
 export class ProjectService {
@@ -47,6 +46,7 @@ export class ProjectService {
   }
 
   async findAllForUser(user: TokenPayload, organization: string): Promise<Project[]> {
+    await this.enforcer.loadPolicy();
     const projects = await this.findAll(organization);
     const allowedProjects: Project[] = [];
     for (const project of projects) {