Merge pull request #1953 from nhost/changeset-release/main

chore: update versions

dashboard/.eslintrc.js

@@ -28,6 +28,8 @@ module.exports = {
     'import/no-named-as-default': 'off',
     'import/prefer-default-export': 'off',
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
+    // TODO: Temporarily disable this rule because of a WIP refactoring
+    'import/no-named-as-default': 'off',
     curly: ['error', 'all'],
     'no-restricted-exports': 'off',
     'no-undef': 'off',

dashboard/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/dashboard
 
+## 0.16.13
+
+### Patch Changes
+
+- 78c7109c: feat(settings): allow selecting service versions
+
 ## 0.16.12
 
 ### Patch Changes

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.16.12",
+  "version": "0.16.13",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",

dashboard/src/components/applications/AppLoader.tsx

@@ -1,5 +1,5 @@
-import FeedbackForm from '@/components/common/FeedbackForm';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useInterval } from '@/hooks/useInterval';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Button from '@/ui/v2/Button';

dashboard/src/components/applications/ApplicationErrored.tsx

@@ -1,7 +1,7 @@
-import FeedbackForm from '@/components/common/FeedbackForm';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import { useAppCreatedAt } from '@/hooks/useAppCreatedAt';
 import { useCurrentDate } from '@/hooks/useCurrentDate';
 import type { ApplicationState } from '@/types/application';

dashboard/src/components/applications/ApplicationInfo.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetAllWorkspacesAndProjectsDocument,
   useDeleteApplicationMutation,

dashboard/src/components/applications/ApplicationPaused.tsx

@@ -3,8 +3,8 @@ import { ChangePlanModal } from '@/components/applications/ChangePlanModal';
 import { StagingMetadata } from '@/components/applications/StagingMetadata';
 import { useDialog } from '@/components/common/DialogProvider';
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import {
   GetAllWorkspacesAndProjectsDocument,
   useGetFreeAndActiveProjectsQuery,
@@ -40,7 +40,6 @@ export default function ApplicationPaused() {
 
   const { data, loading } = useGetFreeAndActiveProjectsQuery({
     variables: { userId: user?.id },
-    fetchPolicy: 'cache-and-network',
     skip: !user,
   });
 

dashboard/src/components/applications/ApplicationProvisioning.tsx

@@ -1,5 +1,5 @@
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useCheckProvisioning } from '@/hooks/useCheckProvisioning';
 import { ApplicationStatus } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';

dashboard/src/components/applications/ApplicationRestoring.tsx

@@ -1,5 +1,5 @@
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useCheckProvisioning } from '@/hooks/useCheckProvisioning';
 import { ApplicationStatus } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';

dashboard/src/components/applications/ApplicationUnknown.tsx

@@ -1,7 +1,7 @@
-import FeedbackForm from '@/components/common/FeedbackForm';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import { Modal } from '@/ui/Modal';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';

dashboard/src/components/applications/ApplicationUnpausing.tsx

@@ -1,5 +1,5 @@
 import Container from '@/components/layout/Container';
-import { useProjectRedirectWhenReady } from '@/features/projects/common/hooks/useProjectRedirectWhenReady';
+import { useProjectRedirectWhenReady } from '@/features/projects/hooks/useProjectRedirectWhenReady';
 import Image from 'next/image';
 import { AppLoader } from './AppLoader';
 

dashboard/src/components/applications/ChangePlanModal.tsx

@@ -1,6 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import { BillingPaymentMethodForm } from '@/components/workspace/BillingPaymentMethodForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   refetchGetApplicationPlanQuery,
   useGetAppPlanAndGlobalPlansQuery,

dashboard/src/components/applications/HasuraData.tsx

@@ -1,5 +1,5 @@
 import { LoadingScreen } from '@/components/common/LoadingScreen';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';

dashboard/src/components/applications/RemoveApplicationModal.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Checkbox from '@/ui/v2/Checkbox';

dashboard/src/components/applications/RestoreBackupModal.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Checkbox from '@/ui/v2/Checkbox';

dashboard/src/components/applications/UnlockFeatureByUpgrading.tsx

@@ -1,6 +1,6 @@
 import { ChangePlanModal } from '@/components/applications/ChangePlanModal';
 import { useDialog } from '@/components/common/DialogProvider';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';

dashboard/src/components/applications/github/EditRepositorySettings.tsx

@@ -1,5 +1,5 @@
 import type { ConnectGithubModalState } from '@/components/applications/ConnectGithubModal';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { FormProvider, useForm } from 'react-hook-form';
 import { EditRepositorySettingsModal } from './EditRepositorySettingsModal';
 

dashboard/src/components/applications/github/EditRepositorySettingsModal.tsx

@@ -2,7 +2,7 @@ import type { EditRepositorySettingsFormData } from '@/components/applications/g
 import { useDialog } from '@/components/common/DialogProvider';
 import ErrorBoundaryFallback from '@/components/common/ErrorBoundaryFallback';
 import GithubIcon from '@/components/icons/GithubIcon';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useUpdateApplicationMutation } from '@/generated/graphql';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';

dashboard/src/components/applications/graphql/UserSelect.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Option from '@/ui/v2/Option';

dashboard/src/components/common/Breadcrumbs/Breadcrumbs.tsx

@@ -1,5 +1,5 @@
 import NavLink from '@/components/common/NavLink';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import type { BoxProps } from '@/ui/v2/Box';
 import Box from '@/ui/v2/Box';

dashboard/src/components/common/Breadcrumbs/index.ts

@@ -1,2 +1,2 @@
 export * from './Breadcrumbs';
-export { default } from './Breadcrumbs';
+export { default as Breadcrumbs } from './Breadcrumbs';

dashboard/src/components/common/ControlledAutocomplete/ControlledAutocomplete.tsx

@@ -2,7 +2,7 @@ import type {
   AutocompleteOption,
   AutocompleteProps,
 } from '@/ui/v2/Autocomplete';
-import Autocomplete from '@/ui/v2/Autocomplete';
+import { Autocomplete } from '@/ui/v2/Autocomplete';
 import callAll from '@/utils/callAll';
 import type { ForwardedRef } from 'react';
 import { forwardRef } from 'react';

dashboard/src/components/common/ControlledAutocomplete/index.ts

@@ -1,2 +1,5 @@
 export * from './ControlledAutocomplete';
-export { default } from './ControlledAutocomplete';
+export {
+  default as ControlledAutocomplete,
+  default,
+} from './ControlledAutocomplete';

dashboard/src/components/common/ControlledSelect/ControlledSelect.tsx

@@ -1,5 +1,5 @@
 import type { SelectProps } from '@/ui/v2/Select';
-import Select from '@/ui/v2/Select';
+import { Select } from '@/ui/v2/Select';
 import type { ForwardedRef } from 'react';
 import { forwardRef } from 'react';
 import type { FieldValues, UseControllerProps } from 'react-hook-form';

dashboard/src/components/common/ControlledSelect/index.ts

@@ -1,2 +1,2 @@
 export * from './ControlledSelect';
-export { default } from './ControlledSelect';
+export { default as ControlledSelect, default } from './ControlledSelect';

dashboard/src/components/common/DataGridPreviewCell/DataGridPreviewCell.tsx

@@ -2,7 +2,7 @@ import AudioPreview from '@/components/icons/AudioPreview';
 import { FileIcon } from '@/components/icons/FileIcon';
 import PDFPreview from '@/components/icons/PDFPreview';
 import VideoPreview from '@/components/icons/VideoPreview';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useAppClient } from '@/hooks/useAppClient';
 import { Modal } from '@/ui/Modal';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';

dashboard/src/components/common/FeedbackForm/index.ts

@@ -1,2 +1,2 @@
 export * from './FeedbackForm';
-export { default } from './FeedbackForm';
+export { default as FeedbackForm } from './FeedbackForm';

dashboard/src/components/common/Form/index.ts

@@ -1,2 +1,2 @@
 export * from './Form';
-export { default } from './Form';
+export { default as Form, default } from './Form';

dashboard/src/components/common/Header/Header.tsx

@@ -1,15 +1,19 @@
-import Breadcrumbs from '@/components/common/Breadcrumbs';
+import { Breadcrumbs } from '@/components/common/Breadcrumbs';
-import FeedbackForm from '@/components/common/FeedbackForm';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
-import LocalAccountMenu from '@/components/common/LocalAccountMenu';
+import { LocalAccountMenu } from '@/components/common/LocalAccountMenu';
-import Logo from '@/components/common/Logo';
+import { Logo } from '@/components/common/Logo';
-import MobileNav from '@/components/common/MobileNav';
+import { MobileNav } from '@/components/common/MobileNav';
-import NavLink from '@/components/common/NavLink';
+import { NavLink } from '@/components/common/NavLink';
 import { AccountMenu } from '@/components/dashboard/AccountMenu';
-import useIsPlatform from '@/hooks/common/useIsPlatform';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import Box from '@/ui/v2/Box';
+import { useIsPlatform } from '@/hooks/common/useIsPlatform';
+import { ApplicationStatus } from '@/types/application';
+import { Box } from '@/ui/v2/Box';
+import { Chip } from '@/ui/v2/Chip';
 import { Dropdown } from '@/ui/v2/Dropdown';
 import { useRouter } from 'next/router';
 import type { DetailedHTMLProps, HTMLProps, PropsWithoutRef } from 'react';
+import { useEffect } from 'react';
 import { twMerge } from 'tailwind-merge';
 
 export interface HeaderProps
@@ -20,6 +24,25 @@ export interface HeaderProps
 export default function Header({ className, ...props }: HeaderProps) {
   const router = useRouter();
   const isPlatform = useIsPlatform();
+  const { currentProject, refetch: refetchProject } =
+    useCurrentWorkspaceAndProject();
+  const isProjectUpdating =
+    currentProject?.appStates[0]?.stateId === ApplicationStatus.Updating;
+
+  // Poll for project updates
+  useEffect(() => {
+    if (!isProjectUpdating) {
+      return () => {};
+    }
+
+    const interval = setInterval(async () => {
+      await refetchProject();
+    }, 5000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [isProjectUpdating, refetchProject]);
 
   return (
     <Box
@@ -39,6 +62,10 @@ export default function Header({ className, ...props }: HeaderProps) {
         {(router.query.workspaceSlug || router.query.appSlug) && (
           <Breadcrumbs aria-label="Workspace breadcrumbs" />
         )}
+
+        {isProjectUpdating && (
+          <Chip size="small" label="Updating" color="warning" />
+        )}
       </div>
 
       <div className="hidden grid-flow-col items-center gap-2 sm:grid">

dashboard/src/components/common/LocalAccountMenu/index.ts

@@ -1 +1 @@
-export { default } from './LocalAccountMenu';
+export { default as LocalAccountMenu } from './LocalAccountMenu';

dashboard/src/components/common/Logo/index.ts

@@ -0,0 +1 @@
+export { default as Logo } from './Logo';

dashboard/src/components/common/MobileNav/MobileNav.tsx

@@ -1,5 +1,5 @@
 import { ChangePasswordModal } from '@/components/applications/ChangePasswordModal';
-import FeedbackForm from '@/components/common/FeedbackForm';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
 import NavLink from '@/components/common/NavLink';
 import ThemeSwitcher from '@/components/common/ThemeSwitcher';
 import { Nav } from '@/components/dashboard/Nav';

dashboard/src/components/common/MobileNav/index.ts

@@ -1,2 +1,2 @@
 export * from './MobileNav';
-export { default } from './MobileNav';
+export { default as MobileNav } from './MobileNav';

dashboard/src/components/common/NavLink/index.ts

@@ -1,2 +1,2 @@
 export * from './NavLink';
-export { default } from './NavLink';
+export { default as NavLink, default } from './NavLink';

dashboard/src/components/dataBrowser/BaseColumnForm/BaseColumnForm.tsx

@@ -238,7 +238,7 @@ export default function BaseColumnForm({
             variant="inline"
             options={availableFunctions}
             disabled={isIdentity}
-            showCustomOption
+            showCustomOption="always"
             customOptionLabel={(optionLabel) =>
               `Use "${optionLabel}" as a literal`
             }

dashboard/src/components/dataBrowser/BaseTableForm/ColumnEditorRow.tsx

@@ -180,7 +180,7 @@ function DefaultValueAutocomplete({ index }: FieldArrayInputProps) {
           setValue(`columns.${index}.defaultValue`, null);
         }
       }}
-      showCustomOption
+      showCustomOption="always"
       customOptionLabel={(optionLabel) => `Use "${optionLabel}" as a literal`}
     />
   );

dashboard/src/components/dataBrowser/DataBrowserGrid/DataBrowserGrid.tsx

@@ -9,7 +9,7 @@ import FormActivityIndicator from '@/components/common/FormActivityIndicator';
 import InlineCode from '@/components/common/InlineCode';
 import DataBrowserEmptyState from '@/components/dataBrowser/DataBrowserEmptyState';
 import DataBrowserGridControls from '@/components/dataBrowser/DataBrowserGridControls';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useDeleteColumnWithToastMutation from '@/hooks/dataBrowser/useDeleteColumnMutation/useDeleteColumnWithToastMutation';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import type { UpdateRecordVariables } from '@/hooks/dataBrowser/useUpdateRecordMutation';

dashboard/src/components/dataBrowser/DataBrowserGridControls/DataBrowserGridControls.tsx

@@ -1,7 +1,7 @@
 import type { DataGridPaginationProps } from '@/components/common/DataGridPagination';
 import DataGridPagination from '@/components/common/DataGridPagination';
 import { useDialog } from '@/components/common/DialogProvider';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useDeleteRecordMutation from '@/hooks/dataBrowser/useDeleteRecordMutation';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
 import type { DataBrowserGridColumn } from '@/types/dataBrowser';

dashboard/src/components/dataBrowser/DataBrowserSidebar/DataBrowserSidebar.tsx

@@ -3,7 +3,7 @@ import FormActivityIndicator from '@/components/common/FormActivityIndicator';
 import InlineCode from '@/components/common/InlineCode';
 import NavLink from '@/components/common/NavLink';
 import RetryableErrorBoundary from '@/components/common/RetryableErrorBoundary';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import useDatabaseQuery from '@/hooks/dataBrowser/useDatabaseQuery';
 import useDeleteTableWithToastMutation from '@/hooks/dataBrowser/useDeleteTableMutation/useDeleteTableWithToastMutation';

dashboard/src/components/dataBrowser/EditPermissionsForm/EditPermissionsForm.tsx

@@ -1,5 +1,5 @@
 import { useDialog } from '@/components/common/DialogProvider';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useMetadataQuery from '@/hooks/dataBrowser/useMetadataQuery';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';

dashboard/src/components/dataBrowser/EditPermissionsForm/sections/ColumnPresetsSection.tsx

@@ -1,6 +1,6 @@
 import ControlledSelect from '@/components/common/ControlledSelect';
 import type { RolePermissionEditorFormValues } from '@/components/dataBrowser/EditPermissionsForm/RolePermissionEditorForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Autocomplete from '@/ui/v2/Autocomplete';

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { Rule, RuleGroup } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import type { BoxProps } from '@/ui/v2/Box';

dashboard/src/components/dataBrowser/RuleGroupEditor/RuleValueInput.tsx

@@ -3,7 +3,7 @@ import ControlledSelect from '@/components/common/ControlledSelect';
 import ReadOnlyToggle from '@/components/common/ReadOnlyToggle';
 import type { ColumnAutocompleteProps } from '@/components/dataBrowser/ColumnAutocomplete';
 import ColumnAutocomplete from '@/components/dataBrowser/ColumnAutocomplete';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { HasuraOperator } from '@/types/dataBrowser';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import type { AutocompleteOption } from '@/ui/v2/Autocomplete';

dashboard/src/components/deployments/DeploymentListItem/DeploymentListItem.tsx

@@ -1,6 +1,6 @@
 import NavLink from '@/components/common/NavLink';
 import AppDeploymentDuration from '@/components/deployments/AppDeploymentDuration';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { Avatar } from '@/ui/Avatar';
 import type { DeploymentStatus } from '@/ui/StatusCircle';
 import { StatusCircle } from '@/ui/StatusCircle';

dashboard/src/components/files/FilesDataGrid/FilesDataGrid.tsx

@@ -7,7 +7,7 @@ import DataGridPreviewCell from '@/components/common/DataGridPreviewCell';
 import DataGridTextCell from '@/components/common/DataGridTextCell';
 import FilesDataGridControls from '@/components/files/FilesDataGridControls';
 import { FileIcon } from '@/components/icons/FileIcon';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useAppClient } from '@/hooks/useAppClient';
 import useBuckets from '@/hooks/useBuckets';
 import useFiles from '@/hooks/useFiles';
@@ -66,16 +66,10 @@ export default function FilesDataGrid(props: FilesDataGridProps) {
             {},
           )
         : { updatedAt: OrderBy.Desc },
-    options: {
-      fetchPolicy: 'cache-and-network',
-    },
   });
 
   const { numberOfFiles, refetch: refetchFilesAggregate } = useFilesAggregate({
     searchString,
-    options: {
-      fetchPolicy: 'cache-and-network',
-    },
   });
 
   const numberOfPages = numberOfFiles ? Math.ceil(numberOfFiles / limit) : 0;

dashboard/src/components/files/FilesDataGridControls/FilesDataGridControls.tsx

@@ -1,7 +1,7 @@
 import type { DataGridPaginationProps } from '@/components/common/DataGridPagination';
 import DataGridPagination from '@/components/common/DataGridPagination';
 import { useDialog } from '@/components/common/DialogProvider';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useAppClient } from '@/hooks/useAppClient';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
 import type { FileUploadButtonProps } from '@/ui/FileUploadButton';

dashboard/src/components/home/SendFeedback.tsx

@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useInsertFeedbackOneMutation } from '@/generated/graphql';
 import { Avatar } from '@/ui/Avatar';
 import Button from '@/ui/v2/Button';

dashboard/src/components/layout/Container/index.ts

@@ -1,2 +1,2 @@
 export * from './Container';
-export { default } from './Container';
+export { default as Container, default } from './Container';

dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx

@@ -2,7 +2,7 @@ import DesktopNav from '@/components/common/DesktopNav';
 import { LoadingScreen } from '@/components/common/LoadingScreen';
 import type { AuthenticatedLayoutProps } from '@/components/layout/AuthenticatedLayout';
 import AuthenticatedLayout from '@/components/layout/AuthenticatedLayout';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import useProjectRoutes from '@/hooks/common/useProjectRoutes';
 import { useNavigationVisible } from '@/hooks/useNavigationVisible';

dashboard/src/components/logs/LogsHeader/LogsHeader.tsx

@@ -1,5 +1,5 @@
 import LogsDatePicker from '@/components/logs/LogsDatePicker';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { AvailableLogsServices, LogsCustomInterval } from '@/types/logs';
 import type { BoxProps } from '@/ui/v2/Box';
 import Box from '@/ui/v2/Box';

dashboard/src/components/overview/OverviewDeployments/OverviewDeployments.tsx

@@ -2,7 +2,7 @@ import useGitHubModal from '@/components/applications/github/useGitHubModal';
 import DeploymentListItem from '@/components/deployments/DeploymentListItem';
 import GithubIcon from '@/components/icons/GithubIcon';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';

dashboard/src/components/overview/OverviewMetrics/OverviewMetrics.tsx

@@ -1,6 +1,6 @@
 import type { MetricsCardProps } from '@/components/overview/MetricsCard';
 import { MetricsCard } from '@/components/overview/MetricsCard';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import Text from '@/ui/v2/Text';
 import { useGetProjectMetricsQuery } from '@/utils/__generated__/graphql';
 import { prettifyNumber } from '@/utils/common/prettifyNumber';

dashboard/src/components/overview/OverviewProjectInfo/OverviewProjectInfo.tsx

@@ -1,5 +1,5 @@
 import InfoCard from '@/components/overview/InfoCard';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import Text from '@/ui/v2/Text';
 import Image from 'next/image';
 

dashboard/src/components/overview/OverviewRepository/OverviewRepository.tsx

@@ -1,6 +1,6 @@
 import GithubIcon from '@/components/icons/GithubIcon';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';

dashboard/src/components/overview/OverviewTopBar/OverviewTopBar.tsx

@@ -1,8 +1,8 @@
 import { ChangePlanModal } from '@/components/applications/ChangePlanModal';
 import { useDialog } from '@/components/common/DialogProvider';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import Button from '@/ui/v2/Button';
 import Chip from '@/ui/v2/Chip';

dashboard/src/components/overview/OverviewUsage/OverviewUsage.tsx

@@ -1,5 +1,5 @@
 import RetryableErrorBoundary from '@/components/common/RetryableErrorBoundary';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   useGetAppFunctionsMetadataQuery,
   useGetProjectMetricsQuery,

dashboard/src/components/settings/ResetDatabasePasswordSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './ResetDatabasePasswordSettings';
-export { default } from './ResetDatabasePasswordSettings';

dashboard/src/components/settings/SettingsContainer/index.ts

@@ -1,2 +1,2 @@
 export * from './SettingsContainer';
-export { default } from './SettingsContainer';
+export { default as SettingsContainer, default } from './SettingsContainer';

dashboard/src/components/settings/SettingsLayout/index.ts

@@ -1,2 +1,2 @@
 export * from './SettingsLayout';
-export { default } from './SettingsLayout';
+export { default as SettingsLayout, default } from './SettingsLayout';

dashboard/src/components/settings/SettingsSidebar/SettingsSidebar.tsx

@@ -1,5 +1,5 @@
 import NavLink from '@/components/common/NavLink';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import FloatingActionButton from '@/ui/FloatingActionButton';
 import Backdrop from '@/ui/v2/Backdrop';
 import type { BoxProps } from '@/ui/v2/Box';
@@ -144,6 +144,13 @@ export default function SettingsSidebar({
                 Database
               </SettingsNavLink>
             )}
+            <SettingsNavLink
+              href="/hasura"
+              exact={false}
+              onClick={handleSelect}
+            >
+              Hasura
+            </SettingsNavLink>
             <SettingsNavLink
               href="/authentication"
               exact={false}
@@ -158,7 +165,13 @@ export default function SettingsSidebar({
             >
               Sign-In Methods
             </SettingsNavLink>
-
+            <SettingsNavLink
+              href="/storage"
+              exact={false}
+              onClick={handleSelect}
+            >
+              Storage
+            </SettingsNavLink>
             <SettingsNavLink
               href="/roles-and-permissions"
               exact={false}

dashboard/src/components/settings/authentication/AllowedEmailSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './AllowedEmailSettings';
-export { default } from './AllowedEmailSettings';

dashboard/src/components/settings/authentication/AllowedRedirectURLsSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './AllowedRedirectURLsSettings';
-export { default } from './AllowedRedirectURLsSettings';

dashboard/src/components/settings/authentication/BlockedEmailSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './BlockedEmailSettings';
-export { default } from './BlockedEmailSettings';

dashboard/src/components/settings/authentication/ClientURLSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './ClientURLSettings';
-export { default } from './ClientURLSettings';

dashboard/src/components/settings/authentication/DisableNewUsersSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './DisableNewUsersSettings';
-export { default } from './DisableNewUsersSettings';

dashboard/src/components/settings/authentication/GravatarSettings/index.ts

@@ -1,2 +0,0 @@
-export * from './GravatarSettings';
-export { default } from './GravatarSettings';

dashboard/src/components/settings/authentication/MFASettings/index.ts

@@ -1,2 +0,0 @@
-export * from './MFASettings';
-export { default } from './MFASettings';

dashboard/src/components/settings/environmentVariables/CreateEnvironmentVariableForm/CreateEnvironmentVariableForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseEnvironmentVariableForm, {
   baseEnvironmentVariableFormValidationSchema,
 } from '@/components/settings/environmentVariables/BaseEnvironmentVariableForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {
   GetEnvironmentVariablesDocument,

dashboard/src/components/settings/environmentVariables/EditEnvironmentVariableForm/EditEnvironmentVariableForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseEnvironmentVariableForm, {
   baseEnvironmentVariableFormValidationSchema,
 } from '@/components/settings/environmentVariables/BaseEnvironmentVariableForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { EnvironmentVariable } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {

dashboard/src/components/settings/environmentVariables/EditJwtSecretForm/EditJwtSecretForm.tsx

@@ -1,6 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { DialogFormProps } from '@/types/common';
 import Button from '@/ui/v2/Button';
 import Input from '@/ui/v2/Input';

dashboard/src/components/settings/environmentVariables/EnvironmentVariableSettings/EnvironmentVariableSettings.tsx

@@ -3,7 +3,7 @@ import SettingsContainer from '@/components/settings/SettingsContainer';
 import CreateEnvironmentVariableForm from '@/components/settings/environmentVariables/CreateEnvironmentVariableForm';
 import EditEnvironmentVariableForm from '@/components/settings/environmentVariables/EditEnvironmentVariableForm';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { EnvironmentVariable } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/environmentVariables/SystemEnvironmentVariableSettings/SystemEnvironmentVariableSettings.tsx

@@ -3,7 +3,7 @@ import InlineCode from '@/components/common/InlineCode';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import EditJwtSecretForm from '@/components/settings/environmentVariables/EditJwtSecretForm';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import { useAppClient } from '@/hooks/useAppClient';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';

dashboard/src/components/settings/permissions/CreatePermissionVariableForm/CreatePermissionVariableForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BasePermissionVariableForm, {
   basePermissionVariableValidationSchema,
 } from '@/components/settings/permissions/BasePermissionVariableForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {
   GetRolesPermissionsDocument,

dashboard/src/components/settings/permissions/EditPermissionVariableForm/EditPermissionVariableForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BasePermissionVariableForm, {
   basePermissionVariableValidationSchema,
 } from '@/components/settings/permissions/BasePermissionVariableForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { PermissionVariable } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {

dashboard/src/components/settings/permissions/PermissionVariableSettings/PermissionVariableSettings.tsx

@@ -3,7 +3,7 @@ import SettingsContainer from '@/components/settings/SettingsContainer';
 import CreatePermissionVariableForm from '@/components/settings/permissions/CreatePermissionVariableForm';
 import EditPermissionVariableForm from '@/components/settings/permissions/EditPermissionVariableForm';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { PermissionVariable } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/resources/ResourcesConfirmationDialog/ResourcesConfirmationDialog.tsx

@@ -1,7 +1,7 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import { useProPlan } from '@/hooks/common/useProPlan';
 import { Alert } from '@/ui/Alert';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/resources/ResourcesForm/ResourcesForm.tsx

@@ -4,10 +4,10 @@ import SettingsContainer from '@/components/settings/SettingsContainer';
 import ResourcesConfirmationDialog from '@/components/settings/resources/ResourcesConfirmationDialog';
 import ServiceResourcesFormFragment from '@/components/settings/resources/ServiceResourcesFormFragment';
 import TotalResourcesFormFragment from '@/components/settings/resources/TotalResourcesFormFragment';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
-import { resourceSettingsValidationSchema } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { resourceSettingsValidationSchema } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import { useProPlan } from '@/hooks/common/useProPlan';
 import { Alert } from '@/ui/Alert';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';

dashboard/src/components/settings/resources/ResourcesForm/ResourcesFormFooter.tsx

@@ -1,5 +1,5 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import { useProPlan } from '@/hooks/common/useProPlan';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/resources/ServiceResourcesFormFragment/ServiceResourcesFormFragment.tsx

@@ -1,6 +1,6 @@
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import {
   MAX_SERVICE_MEMORY,
   MAX_SERVICE_REPLICAS,
@@ -8,7 +8,7 @@ import {
   MIN_SERVICE_MEMORY,
   MIN_SERVICE_REPLICAS,
   MIN_SERVICE_VCPU,
-} from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+} from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import Box from '@/ui/v2/Box';
 import Slider from '@/ui/v2/Slider';
 import Text from '@/ui/v2/Text';

dashboard/src/components/settings/resources/TotalResourcesFormFragment/TotalResourcesFormFragment.tsx

@@ -1,12 +1,12 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
-import { getAllocatedResources } from '@/features/projects/settings/resources/utils/getAllocatedResources';
+import { getAllocatedResources } from '@/features/resources/settings/utils/getAllocatedResources';
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import {
   MAX_TOTAL_VCPU,
   MIN_TOTAL_VCPU,
-} from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+} from '@/features/resources/settings/utils/resourceSettingsValidationSchema';
 import { useProPlan } from '@/hooks/common/useProPlan';
 import { Alert } from '@/ui/Alert';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/roles/CreateRoleForm/CreateRoleForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseRoleForm, {
   baseRoleFormValidationSchema,
 } from '@/components/settings/roles/BaseRoleForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {
   GetRolesPermissionsDocument,

dashboard/src/components/settings/roles/EditRoleForm/EditRoleForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseRoleForm, {
   baseRoleFormValidationSchema,
 } from '@/components/settings/roles/BaseRoleForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { Role } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {

dashboard/src/components/settings/roles/RoleSettings/RoleSettings.tsx

@@ -3,7 +3,7 @@ import SettingsContainer from '@/components/settings/SettingsContainer';
 import CreateRoleForm from '@/components/settings/roles/CreateRoleForm';
 import EditRoleForm from '@/components/settings/roles/EditRoleForm';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { Role } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';

dashboard/src/components/settings/secrets/CreateSecretForm/CreateSecretForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseSecretForm, {
   baseSecretFormValidationSchema,
 } from '@/components/settings/secrets/BaseSecretForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSecretsDocument,
   useInsertSecretMutation,

dashboard/src/components/settings/secrets/EditSecretForm/EditSecretForm.tsx

@@ -5,7 +5,7 @@ import type {
 import BaseSecretForm, {
   baseSecretFormValidationSchema,
 } from '@/components/settings/secrets/BaseSecretForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import type { Secret } from '@/types/application';
 import {
   GetSecretsDocument,

dashboard/src/components/settings/signInMethods/AnonymousSignInSettings/AnonymousSignInSettings.tsx

@@ -1,7 +1,7 @@
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx

@@ -1,7 +1,7 @@
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/AzureADProviderSettings/AzureADProviderSettings.tsx

@@ -2,7 +2,7 @@ import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import BaseProviderSettings from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/DiscordProviderSettings/DiscordProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx

@@ -2,7 +2,7 @@ import ControlledCheckbox from '@/components/common/ControlledCheckbox';
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/FacebookProviderSettings/FacebookProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/GitHubProviderSettings/GitHubProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/GoogleProviderSettings/GoogleProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/LinkedInProviderSettings/LinkedInProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/MagicLinkSettings/MagicLinkSettings.tsx

@@ -1,7 +1,7 @@
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/SMSSettings/SMSSettings.tsx

@@ -1,7 +1,7 @@
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/SpotifyProviderSettings/SpotifyProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/TwitchProviderSettings/TwitchProviderSettings.tsx

@@ -5,7 +5,7 @@ import BaseProviderSettings, {
   baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,

dashboard/src/components/settings/signInMethods/TwitterProviderSettings/TwitterProviderSettings.tsx

@@ -1,7 +1,7 @@
 import Form from '@/components/common/Form';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import {
   GetSignInMethodsDocument,
   useGetSignInMethodsQuery,