[Gitar] Updating TSX files

Unleash · Sep 20, 2024 · 24ac541 · 24ac541
1 parent 0e6d062
commit 24ac541
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 40 deletions.
diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx
@@ -44,7 +44,6 @@ import { ProjectApplications } from '../ProjectApplications/ProjectApplications'
 import { ProjectInsights } from './ProjectInsights/ProjectInsights';
 import useProjectOverview from 'hooks/api/getters/useProjectOverview/useProjectOverview';
 import { ProjectArchived } from './ArchiveProject/ProjectArchived';
-import { useUiFlag } from 'hooks/useUiFlag';
 
 const StyledBadge = styled(Badge)(({ theme }) => ({
     position: 'absolute',
@@ -77,7 +76,6 @@ export const Project = () => {
     const basePath = `/projects/${projectId}`;
     const projectName = project?.name || projectId;
     const { favorite, unfavorite } = useFavoriteProjectsApi();
-    const archiveProjectsEnabled = useUiFlag('archiveProjects');
 
     const [showDelDialog, setShowDelDialog] = useState(false);
 
@@ -192,7 +190,7 @@ export const Project = () => {
         </Box>
     );
 
-    if (archiveProjectsEnabled && Boolean(project.archivedAt)) {
+    if (project.archivedAt) {
         return <ProjectArchived name={project.name} />;
     }
 

diff --git a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/EditProject.tsx b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/EditProject.tsx
@@ -10,12 +10,10 @@ import { Alert, styled } from '@mui/material';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import { UpdateEnterpriseSettings } from './UpdateEnterpriseSettings';
 import { UpdateProject } from './UpdateProject';
-import { DeleteProjectForm } from './DeleteProjectForm';
 import useProjectOverview, {
     featuresCount,
 } from 'hooks/api/getters/useProjectOverview/useProjectOverview';
 import { ArchiveProjectForm } from './ArchiveProjectForm';
-import { useUiFlag } from 'hooks/useUiFlag';
 
 const StyledFormContainer = styled('div')(({ theme }) => ({
     display: 'flex',
@@ -28,7 +26,6 @@ const EditProject = () => {
     const { hasAccess } = useContext(AccessContext);
     const id = useRequiredPathParam('projectId');
     const { project } = useProjectOverview(id);
-    const archiveProjectsEnabled = useUiFlag('archiveProjects');
 
     if (!project.name) {
         return null;
@@ -52,19 +49,7 @@ const EditProject = () => {
                     condition={isEnterprise()}
                     show={<UpdateEnterpriseSettings project={project} />}
                 />
-                <ConditionallyRender
-                    condition={archiveProjectsEnabled}
-                    show={
-                        <ArchiveProjectForm
-                            featureCount={featuresCount(project)}
-                        />
-                    }
-                    elseShow={
-                        <DeleteProjectForm
-                            featureCount={featuresCount(project)}
-                        />
-                    }
-                />
+                <ArchiveProjectForm featureCount={featuresCount(project)} />
             </StyledFormContainer>
         </>
     );

diff --git a/frontend/src/component/project/ProjectList/LegacyProjectList.tsx b/frontend/src/component/project/ProjectList/LegacyProjectList.tsx
@@ -25,7 +25,6 @@ import { useProfile } from 'hooks/api/getters/useProfile/useProfile';
 import { groupProjects } from './group-projects';
 import { ProjectGroup } from './ProjectGroup';
 import { CreateProjectDialog } from '../Project/CreateProject/NewCreateProjectForm/CreateProjectDialog';
-import { useUiFlag } from 'hooks/useUiFlag';
 
 const StyledApiError = styled(ApiError)(({ theme }) => ({
     maxWidth: '500px',
@@ -126,7 +125,6 @@ export const ProjectList = () => {
     const [searchValue, setSearchValue] = useState(
         searchParams.get('search') || '',
     );
-    const archiveProjectsEnabled = useUiFlag('archiveProjects');
 
     const myProjects = new Set(useProfile().profile?.projects || []);
 
@@ -200,20 +198,15 @@ export const ProjectList = () => {
                                     </>
                                 }
                             />
-                            <ConditionallyRender
-                                condition={Boolean(archiveProjectsEnabled)}
-                                show={
-                                    <>
-                                        <Link
-                                            component={RouterLink}
-                                            to='/projects-archive'
-                                        >
-                                            Archived projects
-                                        </Link>
-                                        <PageHeader.Divider />
-                                    </>
-                                }
-                            />
+                            <>
+                                <Link
+                                    component={RouterLink}
+                                    to='/projects-archive'
+                                >
+                                    Archived projects
+                                </Link>
+                                <PageHeader.Divider />
+                            </>
 
                             <ProjectCreationButton />
                         </>

diff --git a/frontend/src/component/project/ProjectList/ProjectList.tsx b/frontend/src/component/project/ProjectList/ProjectList.tsx
@@ -36,7 +36,6 @@ const NewProjectList = () => {
     const isSmallScreen = useMediaQuery(theme.breakpoints.down('md'));
 
     const [state, setState] = useProjectsListState();
-    const archiveProjectsEnabled = useUiFlag('archiveProjects');
 
     const myProjects = new Set(useProfile().profile?.projects || []);
 
@@ -78,10 +77,7 @@ const NewProjectList = () => {
                                 }
                             />
 
-                            <ConditionallyRender
-                                condition={Boolean(archiveProjectsEnabled)}
-                                show={<ProjectArchiveLink />}
-                            />
+                            <ProjectArchiveLink />
                             <ProjectCreationButton
                                 isDialogOpen={Boolean(state.create)}
                                 setIsDialogOpen={(create) =>