move around folder structure

web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetsIndividualHeader.tsx

@@ -2,8 +2,7 @@
 
 import React from 'react';
 import { Button, Divider } from 'antd';
-import { PreventNavigation } from '@/components/ui';
+import { AppContentHeader, PreventNavigation } from '@/components/ui/layout';
-import { AppContentHeader } from '../../../components/ui/layout/AppContentHeader';
 import { useMemoizedFn } from 'ahooks';
 import { useUserConfigContextSelector } from '@/context/Users';
 import { DatasetsHeaderOptions } from './DatasetHeaderOptions';

web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsLayout.tsx

@@ -11,16 +11,8 @@ export const DatasetPageLayout: React.FC<{ children: React.ReactNode; datasetId:
 }) => {
   return (
     <DatasetPageProvider datasetId={datasetId}>
-      <LayoutContent>{children}</LayoutContent>
+      <DatasetsIndividualHeader />
+      <AppContent>{children}</AppContent>
     </DatasetPageProvider>
   );
 };
-
-const LayoutContent: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  return (
-    <>
-      <DatasetsIndividualHeader />
-      <AppContent>{children}</AppContent>
-    </>
-  );
-};

web/src/app/app/datasets/[datasetId]/_DatasetsLayout/index.ts

@@ -0,0 +1 @@
+export * from './DatasetsLayout';

web/src/app/app/datasets/[datasetId]/editor/EditorContent.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import React, { useMemo, useRef, useState } from 'react';
-import { useDatasetPageContextSelector } from '../../../../../layouts/DatasetsLayout/DatasetPageContext';
 import { useMemoizedFn, useRequest } from 'ahooks';
 import type { IDataResult } from '@/api/asset_interfaces';
 import { EditorApps, EditorContainerSubHeader } from './EditorContainerSubHeader';
@@ -12,6 +11,7 @@ import type { RustApiError } from '@/api/buster_rest/errors';
 import isEmpty from 'lodash/isEmpty';
 import type { AppSplitterRef } from '@/components/ui/layout/AppSplitter';
 import { AppVerticalCodeSplitter } from '@/components/ui/layout/AppVerticalCodeSplitter';
+import { useDatasetPageContextSelector } from '../_DatasetsLayout/DatasetPageContext';
 
 export const EditorContent: React.FC<{
   defaultLayout: [string, string];

web/src/app/app/datasets/[datasetId]/layout.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { DatasetPageLayout } from '../../../../layouts/DatasetsLayout/DatasetPageLayout';
 import { prefetchGetDatasetMetadata } from '@/api/buster_rest/datasets';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
+import { DatasetPageLayout } from './_DatasetsLayout';
 
 export default async function Layout({
   params,

web/src/app/app/datasets/[datasetId]/overview/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import { useDatasetPageContextSelector } from '../../../../../layouts/DatasetsLayout/DatasetPageContext';
+import { useDatasetPageContextSelector } from '../_DatasetsLayout/DatasetPageContext';
 import { OverviewHeader } from './OverviewHeader';
 import { OverviewData } from './OverviewData';
 import { Divider } from 'antd';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/PermissionGroupIndividualLayout.tsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import { PermissionAppSegments } from './PermissionAppSegments';
+import { PermissionGroupBackButton } from './PermissionBackButton';
+import { PermissionGroupTitleAndDescription } from './PermissionGroupTitleAndDescription';
+
+export const PermissionGroupIndividualLayout: React.FC<{
+  children: React.ReactNode;
+  permissionGroupId: string;
+}> = ({ children, permissionGroupId }) => {
+  return (
+    <div className="flex h-full flex-col space-y-5 overflow-y-auto px-12 py-12">
+      <PermissionGroupBackButton />
+      <PermissionGroupTitleAndDescription permissionGroupId={permissionGroupId} />
+      <PermissionAppSegments permissionGroupId={permissionGroupId} />
+      {children}
+    </div>
+  );
+};

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/index.ts

@@ -0,0 +1 @@
+export * from './PermissionGroupIndividualLayout';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/index.ts

@@ -0,0 +1 @@
+export * from './PermissionGroupDatasetGroupsController';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/page.tsx

@@ -1,6 +1,6 @@
 import { prefetchPermissionGroupDatasetGroups } from '@/api/buster_rest';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { PermissionGroupDatasetGroupsController } from './PermissionGroupDatasetGroupsController';
+import { PermissionGroupDatasetGroupsController } from './_PermissionGroupDatasetGroupsController';
 
 export default async function Page({
   params: { permissionGroupId }

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/index.ts

@@ -0,0 +1 @@
+export * from './PermissionGroupDatasetsController';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/page.tsx

@@ -1,6 +1,6 @@
 import { prefetchPermissionGroupDatasets } from '@/api/buster_rest';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { PermissionGroupDatasetsController } from './PermissionGroupDatasetsController';
+import { PermissionGroupDatasetsController } from './_PermissionGroupDatasetsController';
 
 export default async function Page({
   params: { permissionGroupId }

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/layout.tsx

@@ -1,9 +1,7 @@
 import React from 'react';
-import { PermissionGroupTitleAndDescription } from './PermissionGroupTitleAndDescription';
 import { prefetchPermissionGroup } from '@/api/buster_rest';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { PermissionGroupBackButton } from './PermissionBackButton';
+import { PermissionGroupIndividualLayout } from './_PermissionGroupIndividualLayout';
-import { PermissionAppSegments } from './PermissionAppSegments';
 
 export default async function Layout({
   children,
@@ -16,12 +14,9 @@ export default async function Layout({
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <div className="flex h-full flex-col space-y-5 overflow-y-auto px-12 py-12">
+      <PermissionGroupIndividualLayout permissionGroupId={permissionGroupId}>
-        <PermissionGroupBackButton />
-        <PermissionGroupTitleAndDescription permissionGroupId={permissionGroupId} />
-        <PermissionAppSegments permissionGroupId={permissionGroupId} />
         {children}
-      </div>
+      </PermissionGroupIndividualLayout>
     </HydrationBoundary>
   );
 }

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersSelectedPopup.tsx

@@ -1,4 +1,4 @@
-import { useUpdatePermissionGroupUsers, useUpdateUserDatasets } from '@/api/buster_rest';
+import { useUpdatePermissionGroupUsers } from '@/api/buster_rest';
 import { PermissionAssignedButton } from '@/components/features/PermissionComponents';
 import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list';
 import React from 'react';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/index.ts

@@ -0,0 +1 @@
+export * from './PermissionGroupUsersController';

web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/page.tsx

@@ -1,6 +1,6 @@
 import { prefetchPermissionGroupUsers } from '@/api/buster_rest';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { PermissionGroupUsersController } from './PermissionGroupUsersController';
+import { PermissionGroupUsersController } from './_PermissionGroupUsersController';
 
 export default async function Page({
   params: { permissionGroupId }

web/src/app/app/settings/(permissions)/permission-groups/page.tsx

@@ -1,4 +1,5 @@
 'use client';
+
 import React, { useState } from 'react';
 import { SettingsPageHeader } from '../../_components/SettingsPageHeader';
 import {

web/src/app/auth/layout.tsx

@@ -1,7 +1,7 @@
 import React, { PropsWithChildren } from 'react';
-import { WelcomeToBuster } from '@/app/auth/_LoginComponents/WelcomeSidebar';
 import { Metadata } from 'next';
-import { LoginConfigProvider } from '@/app/auth/_LoginComponents/LoginConfigProvider';
+import { LoginConfigProvider } from './_LoginComponents/LoginConfigProvider';
+import { WelcomeToBuster } from './_LoginComponents/WelcomeSidebar';
 
 export const metadata: Metadata = {
   title: 'Buster Login'