renaming folder and components to Workspace

RocketChat · Oct 17, 2023 · 769e341 · 769e341
1 parent 59b63bf
commit 769e341
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 15 deletions.
diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx
@@ -126,12 +126,12 @@ registerAdminRoute('/sounds/:context?/:id?', {
 /** @deprecated in favor of `/workspace` route, this is a fallback to work in Mobile app, should be removed in the next major  */
 registerAdminRoute('/info', {
 	name: 'info',
-	component: lazy(() => import('./workspaceStatus/WorkspaceStatusRoute')),
+	component: lazy(() => import('./workspace/WorkspaceRoute')),
 });
 
 registerAdminRoute('/workspace', {
 	name: 'workspace',
-	component: lazy(() => import('./workspaceStatus/WorkspaceStatusRoute')),
+	component: lazy(() => import('./workspace/WorkspaceRoute')),
 });
 
 registerAdminRoute('/import', {

diff --git a/...DeploymentCard/DeploymentCard.stories.tsx → ...DeploymentCard/DeploymentCard.stories.tsx b/...DeploymentCard/DeploymentCard.stories.tsx → ...DeploymentCard/DeploymentCard.stories.tsx
diff --git a/...eStatus/DeploymentCard/DeploymentCard.tsx → ...rkspace/DeploymentCard/DeploymentCard.tsx b/...eStatus/DeploymentCard/DeploymentCard.tsx → ...rkspace/DeploymentCard/DeploymentCard.tsx
diff --git a/...nstancesModal/DescriptionList.stories.tsx → ...nstancesModal/DescriptionList.stories.tsx b/...nstancesModal/DescriptionList.stories.tsx → ...nstancesModal/DescriptionList.stories.tsx
diff --git a/...onents/InstancesModal/DescriptionList.tsx → ...onents/InstancesModal/DescriptionList.tsx b/...onents/InstancesModal/DescriptionList.tsx → ...onents/InstancesModal/DescriptionList.tsx
diff --git a/...s/InstancesModal/DescriptionListEntry.tsx → ...s/InstancesModal/DescriptionListEntry.tsx b/...s/InstancesModal/DescriptionListEntry.tsx → ...s/InstancesModal/DescriptionListEntry.tsx
diff --git a/...InstancesModal/InstancesModal.stories.tsx → ...InstancesModal/InstancesModal.stories.tsx b/...InstancesModal/InstancesModal.stories.tsx → ...InstancesModal/InstancesModal.stories.tsx
diff --git a/...ponents/InstancesModal/InstancesModal.tsx → ...ponents/InstancesModal/InstancesModal.tsx b/...ponents/InstancesModal/InstancesModal.tsx → ...ponents/InstancesModal/InstancesModal.tsx
diff --git a/...ntCard/components/InstancesModal/index.ts → ...ntCard/components/InstancesModal/index.ts b/...ntCard/components/InstancesModal/index.ts → ...ntCard/components/InstancesModal/index.ts
diff --git a/...esRoomsCard/MessagesRoomsCard.stories.tsx → ...esRoomsCard/MessagesRoomsCard.stories.tsx b/...esRoomsCard/MessagesRoomsCard.stories.tsx → ...esRoomsCard/MessagesRoomsCard.stories.tsx
diff --git a/...s/MessagesRoomsCard/MessagesRoomsCard.tsx → ...e/MessagesRoomsCard/MessagesRoomsCard.tsx b/...s/MessagesRoomsCard/MessagesRoomsCard.tsx → ...e/MessagesRoomsCard/MessagesRoomsCard.tsx
diff --git a/...workspaceStatus/UsagePieGraph.stories.tsx → ...admin/workspace/UsagePieGraph.stories.tsx b/...workspaceStatus/UsagePieGraph.stories.tsx → ...admin/workspace/UsagePieGraph.stories.tsx
diff --git a/...s/admin/workspaceStatus/UsagePieGraph.tsx → ...t/views/admin/workspace/UsagePieGraph.tsx b/...s/admin/workspaceStatus/UsagePieGraph.tsx → ...t/views/admin/workspace/UsagePieGraph.tsx
diff --git a/...tus/UsersUploadsCard/UsersUploadsCard.tsx → ...ace/UsersUploadsCard/UsersUploadsCard.tsx b/...tus/UsersUploadsCard/UsersUploadsCard.tsx → ...ace/UsersUploadsCard/UsersUploadsCard.tsx
diff --git a/...rkspaceStatus/VersionCard/VersionCard.tsx → ...min/workspace/VersionCard/VersionCard.tsx b/...rkspaceStatus/VersionCard/VersionCard.tsx → ...min/workspace/VersionCard/VersionCard.tsx
@@ -40,7 +40,7 @@ const VersionCard = ({ serverInfo }: VersionCardProps): ReactElement => {
 
 	const formatDate = useFormatDate();
 
-	const { data: licenseData, isLoading } = useLicense();
+	const { data: licenseData, isLoading, refetch: refetchLicense } = useLicense();
 	const { data: regStatus } = useRegistrationStatus();
 
 	const [actionItems, setActionItems] = useState<VersionActionItem[]>([]);
@@ -201,7 +201,7 @@ const VersionCard = ({ serverInfo }: VersionCardProps): ReactElement => {
 							<CardColSection>{actionItems && <VersionCardActionItemList actionItems={actionItems} />}</CardColSection>
 						</CardCol>
 					</CardBody>
-					<CardFooter>{actionButton && <VersionCardActionButton actionButton={actionButton} />}</CardFooter>
+					<CardFooter>{actionButton && <VersionCardActionButton actionButton={actionButton} refetch={refetchLicense} />}</CardFooter>
 				</>
 			) : (
 				<VersionCardSkeleton />

diff --git a/...rd/components/VersionCardActionButton.tsx → ...rd/components/VersionCardActionButton.tsx b/...rd/components/VersionCardActionButton.tsx → ...rd/components/VersionCardActionButton.tsx
@@ -8,14 +8,15 @@ import RegisterWorkspaceModal from '../../../cloud/modals/RegisterWorkspaceModal
 
 type VersionCardActionButtonProps = {
 	actionButton: VersionActionButton;
+	refetch: () => void;
 };
 
 export type VersionActionButton = {
 	path: string;
 	label: ReactElement;
 };
 
-const VersionCardActionButton = ({ actionButton }: VersionCardActionButtonProps): ReactElement => {
+const VersionCardActionButton = ({ actionButton, refetch }: VersionCardActionButtonProps): ReactElement => {
 	const router = useRouter();
 	const setModal = useSetModal();
 
@@ -47,8 +48,4 @@ const VersionCardActionButton = ({ actionButton }: VersionCardActionButtonProps)
 	);
 };
 
-const refetch = (): void => {
-	window.location.reload();
-};
-
 export default memo(VersionCardActionButton);
diff --git a/...Card/components/VersionCardActionItem.tsx → ...Card/components/VersionCardActionItem.tsx b/...Card/components/VersionCardActionItem.tsx → ...Card/components/VersionCardActionItem.tsx
diff --git a/.../components/VersionCardActionItemList.tsx → .../components/VersionCardActionItemList.tsx b/.../components/VersionCardActionItemList.tsx → .../components/VersionCardActionItemList.tsx
diff --git a/...onCard/components/VersionCardSkeleton.tsx → ...onCard/components/VersionCardSkeleton.tsx b/...onCard/components/VersionCardSkeleton.tsx → ...onCard/components/VersionCardSkeleton.tsx
diff --git a/...tus/VersionCard/components/VersionTag.tsx → ...ace/VersionCard/components/VersionTag.tsx b/...tus/VersionCard/components/VersionTag.tsx → ...ace/VersionCard/components/VersionTag.tsx
diff --git a/...n/workspaceStatus/WorkspaceStatusPage.tsx → ...t/views/admin/workspace/WorkspacePage.tsx b/...n/workspaceStatus/WorkspaceStatusPage.tsx → ...t/views/admin/workspace/WorkspacePage.tsx
@@ -20,7 +20,7 @@ type WorkspaceStatusPageProps = {
 	onClickDownloadInfo: () => void;
 };
 
-const WorkspaceStatusPage = ({
+const WorkspacePage = ({
 	canViewStatistics,
 	serverInfo,
 	statistics,
@@ -99,4 +99,4 @@ const WorkspaceStatusPage = ({
 	);
 };
 
-export default memo(WorkspaceStatusPage);
+export default memo(WorkspacePage);
diff --git a/.../workspaceStatus/WorkspaceStatusRoute.tsx → .../views/admin/workspace/WorkspaceRoute.tsx b/.../workspaceStatus/WorkspaceStatusRoute.tsx → .../views/admin/workspace/WorkspaceRoute.tsx
@@ -8,9 +8,9 @@ import PageSkeleton from '../../../components/PageSkeleton';
 import { useWorkspaceInfo } from '../../../hooks/useWorkspaceInfo';
 import { downloadJsonAs } from '../../../lib/download';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import WorkspaceStatusPage from './WorkspaceStatusPage';
+import WorkspacePage from './WorkspacePage';
 
-const WorkspaceStatusRoute = (): ReactElement => {
+const WorkspaceRoute = (): ReactElement => {
 	const t = useTranslation();
 	const canViewStatistics = usePermission('view-statistics');
 
@@ -57,7 +57,7 @@ const WorkspaceStatusRoute = (): ReactElement => {
 	}
 
 	return (
-		<WorkspaceStatusPage
+		<WorkspacePage
 			canViewStatistics={canViewStatistics}
 			serverInfo={serverInfo}
 			statistics={statistics}
@@ -68,4 +68,4 @@ const WorkspaceStatusRoute = (): ReactElement => {
 	);
 };
 
-export default memo(WorkspaceStatusRoute);
+export default memo(WorkspaceRoute);