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

chore: update versions
2023-05-23 10:20:13 +02:00 · 2023-05-23 08:16:17 +00:00 · 2023-05-23 10:15:03 +02:00 · 2023-05-23 09:46:27 +02:00 · 2023-05-23 09:43:41 +02:00 · 2023-05-22 13:29:08 +02:00
413 changed files with 6356 additions and 2856 deletions
--- a/dashboard/.eslintrc.js
+++ b/dashboard/.eslintrc.js
@@ -25,8 +25,11 @@ module.exports = {
      'error',
      { allowArrowFunctions: true, allowFunctions: true },
    ],
+    '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',
--- a/dashboard/CHANGELOG.md
+++ b/dashboard/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @nhost/dashboard

+## 0.16.13
+
+### Patch Changes
+
+- 78c7109c: feat(settings): allow selecting service versions
+
+## 0.16.12
+
+### Patch Changes
+
+- 399009d6: fix(gql): don't enter an infinite loop when fetching remote app data
+- 329e5a91: fix(deployments): use the same sorting of deployments everywhere
+- 6d559d6e: chore(settings): add under the hood improvements to the settings page
+- 12eb236c: chore(deps): bump `prettier-plugin-tailwindcss` to `v0.3.0`
+- f9b81a2a: chore(deps): bump `turbo` to `v1.9.8`
+- 1345741b: fix(projects): don't redirect to 404 on project creation
+- Updated dependencies [7fea29a8]
+  - @nhost/react-apollo@5.0.23
+  - @nhost/nextjs@1.13.25
+
 ## 0.16.11

 ### Patch Changes
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -3,7 +3,7 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app

-RUN yarn global add turbo@1.9.3
+RUN yarn global add turbo@1.9.8
 COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker

--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/dashboard",
-  "version": "0.16.11",
+  "version": "0.16.13",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -15,7 +15,7 @@
    "format": "prettier --write \"src/**/*.{js,ts,tsx,jsx,json,md}\" --plugin-search-dir=.",
    "storybook": "start-storybook -p 6006 -s public",
    "build-storybook": "build-storybook",
-    "e2e": "npx playwright@1.31.2 install --with-deps && playwright test"
+    "e2e": "npx playwright@1.33.0 install --with-deps && playwright test"
  },
  "dependencies": {
    "@apollo/client": "^3.7.10",
@@ -88,7 +88,7 @@
    "@graphql-codegen/typescript-operations": "^3.0.0",
    "@graphql-codegen/typescript-react-apollo": "^3.3.1",
    "@next/bundle-analyzer": "^12.3.1",
-    "@playwright/test": "^1.31.2",
+    "@playwright/test": "^1.33.0",
    "@storybook/addon-actions": "^6.5.14",
    "@storybook/addon-essentials": "^6.5.14",
    "@storybook/addon-interactions": "^6.5.14",
@@ -137,7 +137,7 @@
    "postcss": "^8.4.19",
    "prettier": "^2.7.1",
    "prettier-plugin-organize-imports": "^3.2.0",
-    "prettier-plugin-tailwindcss": "^0.2.0",
+    "prettier-plugin-tailwindcss": "^0.3.0",
    "react-date-fns-hooks": "^0.9.4",
    "require-from-string": "^2.0.2",
    "snake-case": "^3.0.4",
--- a/dashboard/src/components/applications/AppDeployments.tsx
+++ b/dashboard/src/components/applications/AppDeployments.tsx
@@ -114,6 +114,9 @@ export default function AppDeployments(props: AppDeploymentsProps) {
  const { deployments } = deploymentPageData || { deployments: [] };
  const { deployments: scheduledOrPendingDeployments } =
    scheduledOrPendingDeploymentsData || { deployments: [] };
+  const isDeploymentInProgress = deployments?.some((deployment) =>
+    ['PENDING', 'SCHEDULED'].includes(deployment.deploymentStatus),
+  );

  const latestDeployment = latestDeploymentData?.deployments[0];
  const latestLiveDeployment = latestLiveDeploymentData?.deployments[0];
@@ -135,7 +138,10 @@ export default function AppDeployments(props: AppDeploymentsProps) {
                  deployment={deployment}
                  isLive={liveDeploymentId === deployment.id}
                  showRedeploy={latestDeployment.id === deployment.id}
-                  disableRedeploy={scheduledOrPendingDeployments?.length > 0}
+                  disableRedeploy={
+                    scheduledOrPendingDeployments?.length > 0 ||
+                    isDeploymentInProgress
+                  }
                />

                {index !== deployments.length - 1 && <Divider component="li" />}
--- a/dashboard/src/components/applications/AppLoader.tsx
+++ b/dashboard/src/components/applications/AppLoader.tsx
@@ -1,5 +1,5 @@
-import FeedbackForm from '@/components/common/FeedbackForm';
-import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
 import { useInterval } from '@/hooks/useInterval';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Button from '@/ui/v2/Button';
--- a/dashboard/src/components/applications/ApplicationErrored.tsx
+++ b/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 { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import { useAppCreatedAt } from '@/hooks/useAppCreatedAt';
 import { useCurrentDate } from '@/hooks/useCurrentDate';
 import type { ApplicationState } from '@/types/application';
@@ -21,8 +21,6 @@ import { discordAnnounce } from '@/utils/discordAnnounce';
 import { getPreviousApplicationState } from '@/utils/getPreviousApplicationState';
 import { getApplicationStatusString } from '@/utils/helpers';
 import { triggerToast } from '@/utils/toast';
-import { updateOwnCache } from '@/utils/updateOwnCache';
-import { useApolloClient } from '@apollo/client';
 import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useState } from 'react';
@@ -32,7 +30,11 @@ import { RemoveApplicationModal } from './RemoveApplicationModal';
 import { StagingMetadata } from './StagingMetadata';

 export default function ApplicationErrored() {
-  const { currentWorkspace, currentProject } = useCurrentWorkspaceAndProject();
+  const {
+    currentWorkspace,
+    currentProject,
+    refetch: refetchProject,
+  } = useCurrentWorkspaceAndProject();
  const [changingApplicationStateLoading, setChangingApplicationStateLoading] =
    useState(false);

@@ -54,7 +56,6 @@ export default function ApplicationErrored() {
  const [showRecreateModal, setShowRecreateModal] = useState(false);
  const [showDeleteModal, setShowDeleteModal] = useState(false);
  const [insertApp] = useInsertApplicationMutation();
-  const client = useApolloClient();
  const { currentDate } = useCurrentDate();
  const user = useUserData();
  const isOwner = useIsCurrentUserOwner();
@@ -94,7 +95,7 @@ export default function ApplicationErrored() {
      });
      discordAnnounce(`Recreating: ${currentProject?.name} (${user.email})`);
      triggerToast(`Recreating ${currentProject?.name} `);
-      await updateOwnCache(client);
+      await refetchProject();
    } catch (e) {
      triggerToast(`Error trying to recreate: ${currentProject?.name}`);
    }
--- a/dashboard/src/components/applications/ApplicationInfo.tsx
+++ b/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,
@@ -18,18 +18,14 @@ import { toast } from 'react-hot-toast';
 export default function ApplicationInfo() {
  const { currentProject } = useCurrentWorkspaceAndProject();
  const [deleteApplication] = useDeleteApplicationMutation({
-    refetchQueries: [GetAllWorkspacesAndProjectsDocument],
+    refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
  });
  const router = useRouter();

  async function handleClickRemove() {
    try {
      await toast.promise(
-        deleteApplication({
-          variables: {
-            appId: currentProject.id,
-          },
-        }),
+        deleteApplication({ variables: { appId: currentProject.id } }),
        {
          loading: 'Deleting project...',
          success: 'The project has been deleted successfully.',
--- a/dashboard/src/components/applications/ApplicationPaused.tsx
+++ b/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 { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import {
  GetAllWorkspacesAndProjectsDocument,
  useGetFreeAndActiveProjectsQuery,
@@ -35,12 +35,11 @@ export default function ApplicationPaused() {
  const [showDeletingModal, setShowDeletingModal] = useState(false);
  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
    useUnpauseApplicationMutation({
-      refetchQueries: [GetAllWorkspacesAndProjectsDocument],
+      refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
    });

  const { data, loading } = useGetFreeAndActiveProjectsQuery({
    variables: { userId: user?.id },
-    fetchPolicy: 'cache-and-network',
    skip: !user,
  });

--- a/dashboard/src/components/applications/ApplicationProvisioning.tsx
+++ b/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';
--- a/dashboard/src/components/applications/ApplicationRestoring.tsx
+++ b/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';
--- a/dashboard/src/components/applications/ApplicationUnknown.tsx
+++ b/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 { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+import { useIsCurrentUserOwner } from '@/features/projects/hooks/useIsCurrentUserOwner';
 import { Modal } from '@/ui/Modal';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';
--- a/dashboard/src/components/applications/ApplicationUnpausing.tsx
+++ b/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';

--- a/dashboard/src/components/applications/ChangePlanModal.tsx
+++ b/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,
--- a/dashboard/src/components/applications/HasuraData.tsx
+++ b/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';
--- a/dashboard/src/components/applications/RemoveApplicationModal.tsx
+++ b/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';
@@ -46,7 +46,7 @@ export function RemoveApplicationModal({
  className,
 }: RemoveApplicationModalProps) {
  const [deleteApplication] = useDeleteApplicationMutation({
-    refetchQueries: [GetAllWorkspacesAndProjectsDocument],
+    refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
  });
  const [loadingRemove, setLoadingRemove] = useState(false);
  const { currentProject } = useCurrentWorkspaceAndProject();
--- a/dashboard/src/components/applications/RestoreBackupModal.tsx
+++ b/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';
--- a/dashboard/src/components/applications/UnlockFeatureByUpgrading.tsx
+++ b/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';
--- a/dashboard/src/components/applications/github/EditRepositorySettings.tsx
+++ b/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';

--- a/dashboard/src/components/applications/github/EditRepositorySettingsModal.tsx
+++ b/dashboard/src/components/applications/github/EditRepositorySettingsModal.tsx
@@ -2,14 +2,12 @@ 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';
 import { discordAnnounce } from '@/utils/discordAnnounce';
 import { triggerToast } from '@/utils/toast';
-import { updateOwnCache } from '@/utils/updateOwnCache';
-import { useApolloClient } from '@apollo/client';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useFormContext } from 'react-hook-form';
 import { RepoAndBranch } from './RepoAndBranch';
@@ -27,12 +25,11 @@ export function EditRepositorySettingsModal({
  const isNotCompleted = !watch('productionBranch') || !watch('repoBaseFolder');
  const { closeAlertDialog } = useDialog();

-  const { currentProject } = useCurrentWorkspaceAndProject();
+  const { currentProject, refetch: refetchProject } =
+    useCurrentWorkspaceAndProject();

  const [updateApp, { loading }] = useUpdateApplicationMutation();

-  const client = useApolloClient();
-
  const handleEditGitHubIntegration = async (
    data: EditRepositorySettingsFormData,
  ) => {
@@ -60,7 +57,8 @@ export function EditRepositorySettingsModal({
        });
      }

-      await updateOwnCache(client);
+      await refetchProject();
+
      if (close) {
        close();
      } else {
--- a/dashboard/src/components/applications/graphql/UserSelect.tsx
+++ b/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';
--- a/dashboard/src/components/common/Breadcrumbs/Breadcrumbs.tsx
+++ b/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';
--- a/dashboard/src/components/common/Breadcrumbs/index.ts
+++ b/dashboard/src/components/common/Breadcrumbs/index.ts
@@ -1,2 +1,2 @@
 export * from './Breadcrumbs';
-export { default } from './Breadcrumbs';
+export { default as Breadcrumbs } from './Breadcrumbs';
--- a/dashboard/src/components/common/ControlledAutocomplete/ControlledAutocomplete.tsx
+++ b/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';
--- a/dashboard/src/components/common/ControlledAutocomplete/index.ts
+++ b/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';
--- a/dashboard/src/components/common/ControlledSelect/ControlledSelect.tsx
+++ b/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';
--- a/dashboard/src/components/common/ControlledSelect/index.ts
+++ b/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';
--- a/dashboard/src/components/common/DataGridPreviewCell/DataGridPreviewCell.tsx
+++ b/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';
--- a/dashboard/src/components/common/FeedbackForm/index.ts
+++ b/dashboard/src/components/common/FeedbackForm/index.ts
@@ -1,2 +1,2 @@
 export * from './FeedbackForm';
-export { default } from './FeedbackForm';
+export { default as FeedbackForm } from './FeedbackForm';
--- a/dashboard/src/components/common/Form/index.ts
+++ b/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';
--- a/dashboard/src/components/common/Header/Header.tsx
+++ b/dashboard/src/components/common/Header/Header.tsx
@@ -1,15 +1,19 @@
-import Breadcrumbs from '@/components/common/Breadcrumbs';
-import FeedbackForm from '@/components/common/FeedbackForm';
-import LocalAccountMenu from '@/components/common/LocalAccountMenu';
-import Logo from '@/components/common/Logo';
-import MobileNav from '@/components/common/MobileNav';
-import NavLink from '@/components/common/NavLink';
+import { Breadcrumbs } from '@/components/common/Breadcrumbs';
+import { FeedbackForm } from '@/components/common/FeedbackForm';
+import { LocalAccountMenu } from '@/components/common/LocalAccountMenu';
+import { Logo } from '@/components/common/Logo';
+import { MobileNav } from '@/components/common/MobileNav';
+import { NavLink } from '@/components/common/NavLink';
 import { AccountMenu } from '@/components/dashboard/AccountMenu';
-import useIsPlatform from '@/hooks/common/useIsPlatform';
-import Box from '@/ui/v2/Box';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+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">
--- a/dashboard/src/components/common/LocalAccountMenu/index.ts
+++ b/dashboard/src/components/common/LocalAccountMenu/index.ts
@@ -1 +1 @@
-export { default } from './LocalAccountMenu';
+export { default as LocalAccountMenu } from './LocalAccountMenu';
--- a/dashboard/src/components/common/Logo/Logo.tsx
+++ b/dashboard/src/components/common/Logo/Logo.tsx
--- a/dashboard/src/components/common/Logo/index.ts
+++ b/dashboard/src/components/common/Logo/index.ts
@@ -0,0 +1 @@
+export { default as Logo } from './Logo';
--- a/dashboard/src/components/common/MobileNav/MobileNav.tsx
+++ b/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';
--- a/dashboard/src/components/common/MobileNav/index.ts
+++ b/dashboard/src/components/common/MobileNav/index.ts
@@ -1,2 +1,2 @@
 export * from './MobileNav';
-export { default } from './MobileNav';
+export { default as MobileNav } from './MobileNav';
--- a/dashboard/src/components/common/NavLink/index.ts
+++ b/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';
--- a/dashboard/src/components/dataBrowser/BaseColumnForm/BaseColumnForm.tsx
+++ b/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`
            }
--- a/dashboard/src/components/dataBrowser/BaseTableForm/ColumnEditorRow.tsx
+++ b/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`}
    />
  );
--- a/dashboard/src/components/dataBrowser/DataBrowserGrid/DataBrowserGrid.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/DataBrowserGridControls/DataBrowserGridControls.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/DataBrowserSidebar/DataBrowserSidebar.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/EditPermissionsForm/EditPermissionsForm.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/EditPermissionsForm/sections/ColumnPresetsSection.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.tsx
+++ b/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';
--- a/dashboard/src/components/dataBrowser/RuleGroupEditor/RuleValueInput.tsx
+++ b/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';
--- a/dashboard/src/components/deployments/DeploymentListItem/DeploymentListItem.tsx
+++ b/dashboard/src/components/deployments/DeploymentListItem/DeploymentListItem.tsx
@@ -1,20 +1,24 @@
 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';
 import Button from '@/ui/v2/Button';
-import Chip from '@/ui/v2/Chip';
+import { Chip } from '@/ui/v2/Chip';
 import { ListItem } from '@/ui/v2/ListItem';
-import Tooltip from '@/ui/v2/Tooltip';
+import { Tooltip } from '@/ui/v2/Tooltip';
 import ArrowCounterclockwiseIcon from '@/ui/v2/icons/ArrowCounterclockwiseIcon';
 import ChevronRightIcon from '@/ui/v2/icons/ChevronRightIcon';
 import type { DeploymentRowFragment } from '@/utils/__generated__/graphql';
-import { useInsertDeploymentMutation } from '@/utils/__generated__/graphql';
+import {
+  GetAllWorkspacesAndProjectsDocument,
+  useInsertDeploymentMutation,
+} from '@/utils/__generated__/graphql';
 import getServerError from '@/utils/settings/getServerError';
 import { getToastStyleProps } from '@/utils/settings/settingsConstants';
 import { formatDistanceToNowStrict, parseISO } from 'date-fns';
+import type { MouseEvent } from 'react';
 import { toast } from 'react-hot-toast';
 import { twMerge } from 'tailwind-merge';

@@ -52,9 +56,39 @@ export default function DeploymentListItem({
      })
    : '';

-  const [insertDeployment, { loading }] = useInsertDeploymentMutation();
+  const [insertDeployment, { loading }] = useInsertDeploymentMutation({
+    refetchQueries: [{ query: GetAllWorkspacesAndProjectsDocument }],
+  });
  const { commitMessage } = deployment;

+  async function redeployDeployment(event: MouseEvent<HTMLButtonElement>) {
+    event.stopPropagation();
+    event.preventDefault();
+
+    const insertDeploymentPromise = insertDeployment({
+      variables: {
+        object: {
+          appId: currentProject?.id,
+          commitMessage: deployment.commitMessage,
+          commitSHA: deployment.commitSHA,
+          commitUserAvatarUrl: deployment.commitUserAvatarUrl,
+          commitUserName: deployment.commitUserName,
+          deploymentStatus: 'SCHEDULED',
+        },
+      },
+    });
+
+    await toast.promise(
+      insertDeploymentPromise,
+      {
+        loading: 'Scheduling deployment...',
+        success: 'Deployment has been scheduled successfully.',
+        error: getServerError('An error occurred when scheduling deployment.'),
+      },
+      getToastStyleProps(),
+    );
+  }
+
  return (
    <ListItem.Root>
      <ListItem.Button
@@ -88,7 +122,7 @@ export default function DeploymentListItem({
          {showRedeploy && (
            <Tooltip
              title={
-                !disableRedeploy && !loading
+                disableRedeploy || loading
                  ? 'Deployments cannot be re-triggered when a deployment is in progress.'
                  : ''
              }
@@ -100,35 +134,7 @@ export default function DeploymentListItem({
                size="small"
                color="secondary"
                variant="outlined"
-                onClick={async (event) => {
-                  event.stopPropagation();
-                  event.preventDefault();
-
-                  const insertDeploymentPromise = insertDeployment({
-                    variables: {
-                      object: {
-                        appId: currentProject?.id,
-                        commitMessage: deployment.commitMessage,
-                        commitSHA: deployment.commitSHA,
-                        commitUserAvatarUrl: deployment.commitUserAvatarUrl,
-                        commitUserName: deployment.commitUserName,
-                        deploymentStatus: 'SCHEDULED',
-                      },
-                    },
-                  });
-
-                  await toast.promise(
-                    insertDeploymentPromise,
-                    {
-                      loading: 'Scheduling deployment...',
-                      success: 'Deployment has been scheduled successfully.',
-                      error: getServerError(
-                        'An error occurred when scheduling deployment.',
-                      ),
-                    },
-                    getToastStyleProps(),
-                  );
-                }}
+                onClick={redeployDeployment}
                startIcon={
                  <ArrowCounterclockwiseIcon className={twMerge('h-4 w-4')} />
                }
--- a/dashboard/src/components/files/FilesDataGrid/FilesDataGrid.tsx
+++ b/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;
--- a/dashboard/src/components/files/FilesDataGridControls/FilesDataGridControls.tsx
+++ b/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';
--- a/dashboard/src/components/home/InviteAnnounce.tsx
+++ b/dashboard/src/components/home/InviteAnnounce.tsx
@@ -10,7 +10,6 @@ import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
 import { nhost } from '@/utils/nhost';
 import { triggerToast } from '@/utils/toast';
-import { updateOwnCache } from '@/utils/updateOwnCache';
 import { useApolloClient } from '@apollo/client';
 import { alpha } from '@mui/system';
 import { useUserData } from '@nhost/nextjs';
@@ -28,13 +27,18 @@ export function InviteAnnounce() {
    useSubmitState();

  // @FIX: We probably don't want to poll every ten seconds for possible invites. (We can change later depending on how it works in production.) Maybe just on the workspace page?
-  const { data, loading, error, refetch, startPolling } =
-    useGetWorkspaceMemberInvitesToManageQuery({
-      variables: {
-        userId: user?.id,
-      },
-      skip: !isPlatform || !user,
-    });
+  const {
+    data,
+    loading,
+    error,
+    refetch: refetchInvitations,
+    startPolling,
+  } = useGetWorkspaceMemberInvitesToManageQuery({
+    variables: {
+      userId: user?.id,
+    },
+    skip: !isPlatform || !user,
+  });

  useEffect(() => {
    startPolling(15000);
@@ -79,9 +83,14 @@ export function InviteAnnounce() {
      });
    }

-    await updateOwnCache(client);
+    await client.refetchQueries({
+      include: [
+        GetAllWorkspacesAndProjectsDocument,
+        GetWorkspaceMemberInvitesToManageDocument,
+      ],
+    });
    await router.push(`/${invite.workspace.slug}`);
-    await refetch();
+    await refetchInvitations();
    triggerToast('Workspace invite accepted');
    return setSubmitState({
      error: null,
--- a/dashboard/src/components/home/SendFeedback.tsx
+++ b/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';
--- a/dashboard/src/components/home/WorkspaceAndProjectList/WorkspaceAndProjectList.tsx
+++ b/dashboard/src/components/home/WorkspaceAndProjectList/WorkspaceAndProjectList.tsx
@@ -207,19 +207,6 @@ export default function WorkspaceAndProjectList({
          </div>
        ))}
      </Box>
-
-      <Text className="font-medium" color="secondary">
-        Looking for your old apps? They&apos;re still on{' '}
-        <Link
-          href="https://console.nhost.io"
-          target="_blank"
-          rel="noreferrer"
-          underline="always"
-        >
-          console.nhost.io
-        </Link>{' '}
-        during this beta.
-      </Text>
    </Box>
  );
 }
--- a/dashboard/src/components/layout/Container/index.ts
+++ b/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';
--- a/dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx
+++ b/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';
--- a/dashboard/src/components/logs/LogsHeader/LogsHeader.tsx
+++ b/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';
--- a/dashboard/src/components/overview/OverviewDeployments/OverviewDeployments.tsx
+++ b/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';
@@ -119,6 +119,9 @@ function OverviewDeploymentList() {
  const liveDeploymentId = getLastLiveDeployment(deployments);
  const { deployments: scheduledOrPendingDeployments } =
    scheduledOrPendingDeploymentsData || { deployments: [] };
+  const isDeploymentInProgress = deployments?.some((deployment) =>
+    ['PENDING', 'SCHEDULED'].includes(deployment.deploymentStatus),
+  );

  return (
    <List
@@ -131,7 +134,10 @@ function OverviewDeploymentList() {
            deployment={deployment}
            isLive={deployment.id === liveDeploymentId}
            showRedeploy={index === 0}
-            disableRedeploy={scheduledOrPendingDeployments?.length > 0}
+            disableRedeploy={
+              scheduledOrPendingDeployments?.length > 0 ||
+              isDeploymentInProgress
+            }
          />

          {index !== deployments.length - 1 && <Divider component="li" />}
--- a/dashboard/src/components/overview/OverviewMetrics/OverviewMetrics.tsx
+++ b/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';
--- a/dashboard/src/components/overview/OverviewProjectInfo/OverviewProjectInfo.tsx
+++ b/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';

--- a/dashboard/src/components/overview/OverviewRepository/OverviewRepository.tsx
+++ b/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';
--- a/dashboard/src/components/overview/OverviewTopBar/OverviewTopBar.tsx
+++ b/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 { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+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';
--- a/dashboard/src/components/overview/OverviewUsage/OverviewUsage.tsx
+++ b/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,
--- a/dashboard/src/components/settings/ResetDatabasePasswordSettings/index.ts
+++ b/dashboard/src/components/settings/ResetDatabasePasswordSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './ResetDatabasePasswordSettings';
-export { default } from './ResetDatabasePasswordSettings';
--- a/dashboard/src/components/settings/SettingsContainer/index.ts
+++ b/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';
--- a/dashboard/src/components/settings/SettingsLayout/index.ts
+++ b/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';
--- a/dashboard/src/components/settings/SettingsSidebar/SettingsSidebar.tsx
+++ b/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}
--- a/dashboard/src/components/settings/authentication/AllowedEmailSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/AllowedEmailSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './AllowedEmailSettings';
-export { default } from './AllowedEmailSettings';
--- a/dashboard/src/components/settings/authentication/AllowedRedirectURLsSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/AllowedRedirectURLsSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './AllowedRedirectURLsSettings';
-export { default } from './AllowedRedirectURLsSettings';
--- a/dashboard/src/components/settings/authentication/BlockedEmailSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/BlockedEmailSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './BlockedEmailSettings';
-export { default } from './BlockedEmailSettings';
--- a/dashboard/src/components/settings/authentication/ClientURLSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/ClientURLSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './ClientURLSettings';
-export { default } from './ClientURLSettings';
--- a/dashboard/src/components/settings/authentication/DisableNewUsersSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/DisableNewUsersSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './DisableNewUsersSettings';
-export { default } from './DisableNewUsersSettings';
--- a/dashboard/src/components/settings/authentication/GravatarSettings/index.ts
+++ b/dashboard/src/components/settings/authentication/GravatarSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './GravatarSettings';
-export { default } from './GravatarSettings';
--- a/dashboard/src/components/settings/authentication/MFASettings/index.ts
+++ b/dashboard/src/components/settings/authentication/MFASettings/index.ts
@@ -1,2 +0,0 @@
-export * from './MFASettings';
-export { default } from './MFASettings';
--- a/dashboard/src/components/settings/environmentVariables/CreateEnvironmentVariableForm/CreateEnvironmentVariableForm.tsx
+++ b/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,
--- a/dashboard/src/components/settings/environmentVariables/EditEnvironmentVariableForm/EditEnvironmentVariableForm.tsx
+++ b/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 {
--- a/dashboard/src/components/settings/environmentVariables/EditJwtSecretForm/EditJwtSecretForm.tsx
+++ b/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';
--- a/dashboard/src/components/settings/environmentVariables/EnvironmentVariableSettings/EnvironmentVariableSettings.tsx
+++ b/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';
--- a/dashboard/src/components/settings/environmentVariables/SystemEnvironmentVariableSettings/SystemEnvironmentVariableSettings.tsx
+++ b/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';
--- a/dashboard/src/components/settings/git/BaseDirectorySettings/index.ts
+++ b/dashboard/src/components/settings/git/BaseDirectorySettings/index.ts
@@ -1,2 +0,0 @@
-export * from './BaseDirectorySettings';
-export { default } from './BaseDirectorySettings';
--- a/dashboard/src/components/settings/git/DeploymentBranchSettings/index.ts
+++ b/dashboard/src/components/settings/git/DeploymentBranchSettings/index.ts
@@ -1,2 +0,0 @@
-export * from './DeploymentBranchSettings';
-export { default } from './DeploymentBranchSettings';
--- a/dashboard/src/components/settings/permissions/CreatePermissionVariableForm/CreatePermissionVariableForm.tsx
+++ b/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,
--- a/dashboard/src/components/settings/permissions/EditPermissionVariableForm/EditPermissionVariableForm.tsx
+++ b/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 {
--- a/dashboard/src/components/settings/permissions/PermissionVariableSettings/PermissionVariableSettings.tsx
+++ b/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';
--- a/dashboard/src/components/settings/resources/ResourcesConfirmationDialog/ResourcesConfirmationDialog.tsx
+++ b/dashboard/src/components/settings/resources/ResourcesConfirmationDialog/ResourcesConfirmationDialog.tsx
@@ -1,7 +1,7 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
+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';
--- a/dashboard/src/components/settings/resources/ResourcesForm/ResourcesForm.tsx
+++ b/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 { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
-import { resourceSettingsValidationSchema } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/hooks/useCurrentWorkspaceAndProject';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
+import type { ResourceSettingsFormValues } from '@/features/resources/settings/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';
--- a/dashboard/src/components/settings/resources/ResourcesForm/ResourcesFormFooter.tsx
+++ b/dashboard/src/components/settings/resources/ResourcesForm/ResourcesFormFooter.tsx
@@ -1,5 +1,5 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
+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';
--- a/dashboard/src/components/settings/resources/ServiceResourcesFormFragment/ServiceResourcesFormFragment.tsx
+++ b/dashboard/src/components/settings/resources/ServiceResourcesFormFragment/ServiceResourcesFormFragment.tsx
@@ -1,6 +1,6 @@
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
+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';
--- a/dashboard/src/components/settings/resources/TotalResourcesFormFragment/TotalResourcesFormFragment.tsx
+++ b/dashboard/src/components/settings/resources/TotalResourcesFormFragment/TotalResourcesFormFragment.tsx
@@ -1,12 +1,12 @@
-import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
-import { getAllocatedResources } from '@/features/projects/settings/resources/utils/getAllocatedResources';
-import { prettifyMemory } from '@/features/projects/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/projects/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/utils/resourceSettingsValidationSchema';
+import { calculateBillableResources } from '@/features/resources/settings/utils/calculateBillableResources';
+import { getAllocatedResources } from '@/features/resources/settings/utils/getAllocatedResources';
+import { prettifyMemory } from '@/features/resources/settings/utils/prettifyMemory';
+import { prettifyVCPU } from '@/features/resources/settings/utils/prettifyVCPU';
+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';
--- a/dashboard/src/components/settings/roles/CreateRoleForm/CreateRoleForm.tsx
+++ b/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,
--- a/dashboard/src/components/settings/roles/EditRoleForm/EditRoleForm.tsx
+++ b/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 {
--- a/dashboard/src/components/settings/roles/RoleSettings/RoleSettings.tsx
+++ b/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';
--- a/dashboard/src/components/settings/secrets/CreateSecretForm/CreateSecretForm.tsx
+++ b/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,
--- a/dashboard/src/components/settings/secrets/EditSecretForm/EditSecretForm.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/AnonymousSignInSettings/AnonymousSignInSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/AzureADProviderSettings/AzureADProviderSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/DiscordProviderSettings/DiscordProviderSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/FacebookProviderSettings/FacebookProviderSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/GitHubProviderSettings/GitHubProviderSettings.tsx
+++ b/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,
--- a/dashboard/src/components/settings/signInMethods/GoogleProviderSettings/GoogleProviderSettings.tsx
+++ b/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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Szilárd Dóró	9421dda73d	Merge pull request #1953 from nhost/changeset-release/main chore: update versions	2023-05-23 10:20:13 +02:00
github-actions[bot]	f13dc75993	chore: update versions	2023-05-23 08:16:17 +00:00
Szilárd Dóró	0a8b42d371	Merge pull request #1939 from nhost/feat/service-versions feat(dashboard): add service version selectors	2023-05-23 10:15:03 +02:00
Szilárd Dóró	bd59d61e94	chore: update available Hasura Storage versions	2023-05-23 09:46:27 +02:00
Szilárd Dóró	349622fca2	chore: update available Hasura versions	2023-05-23 09:43:41 +02:00
Szilárd Dóró	daab7d8eeb	Merge branch 'main' into feat/service-versions	2023-05-22 13:29:08 +02:00
Szilárd Dóró	1b4f074dfd	chore: update Hasura version selector	2023-05-22 13:15:41 +02:00
Szilárd Dóró	cca7075721	fix: use tailwind classes in features	2023-05-22 12:26:18 +02:00
Szilárd Dóró	809a2d35f8	Merge pull request #1940 from nhost/changeset-release/main chore: update versions	2023-05-22 11:51:04 +02:00
Szilárd Dóró	084b7ce6d2	Merge branch 'main' into feat/service-versions	2023-05-22 09:41:39 +02:00
github-actions[bot]	e17ec7fce7	chore: update versions	2023-05-22 07:26:27 +00:00
Szilárd Dóró	241175b158	Merge pull request #1935 from nhost/renovate/prettier-plugin-tailwindcss-0.x chore(deps): update dependency prettier-plugin-tailwindcss to ^0.3.0	2023-05-22 09:14:39 +02:00
Szilárd Dóró	51ceaf2696	Merge pull request #1950 from nhost/fix/nextjs-react-error fix(nextjs): don't break Next.js when using SignedIn/SignedOut	2023-05-22 09:00:26 +02:00
Szilárd Dóró	490b77cde4	Merge pull request #1949 from nhost/fix/local-infinite-loop fix(dashboard): don't enter an infinite loop in local mode	2023-05-21 18:14:05 +02:00
Szilárd Dóró	7fea29a8b4	chore: add changeset	2023-05-21 18:13:34 +02:00
Szilárd Dóró	1a34e011ad	fix: don't break Next.js when using SignedIn/SignedOut	2023-05-21 18:08:42 +02:00
Szilárd Dóró	395839f449	chore: check service URL when creating client	2023-05-21 16:34:00 +02:00
Szilárd Dóró	399009d66a	fix(gql): don't enter an infinite loop when fetching remote app data	2023-05-21 16:31:57 +02:00
Szilárd Dóró	12eb236c4a	chore: add changeset	2023-05-19 17:14:22 +02:00
Szilárd Dóró	2218e5cd5b	Merge branch 'main' into renovate/prettier-plugin-tailwindcss-0.x	2023-05-19 17:12:36 +02:00
Szilárd Dóró	2dcf1b38c6	Merge pull request #1945 from nhost/fix/404-not-found fix(dashboard): don't redirect to 404 on project creation	2023-05-19 16:16:13 +02:00
Szilárd Dóró	ad49c92879	fix: trigger project list refetch properly	2023-05-19 15:31:17 +02:00
Szilárd Dóró	13dd57eeb4	Merge pull request #1943 from nhost/fix/deployment-sorting fix(dashboard): sync deployment sorting	2023-05-19 15:27:44 +02:00
Szilárd Dóró	1345741b11	fix: don't redirect to 404	2023-05-19 15:26:20 +02:00
Szilárd Dóró	985f648204	chore: simplify folder structure	2023-05-19 13:47:21 +02:00
Szilárd Dóró	bbc3aa8896	fix: don't hide custom option	2023-05-19 13:44:05 +02:00
renovate[bot]	511615f176	chore(deps): update dependency prettier-plugin-tailwindcss to ^0.3.0	2023-05-19 09:51:56 +00:00
Szilárd Dóró	1198c201f1	Merge pull request #1922 from nhost/renovate/turbo-1.x chore(deps): update dependency turbo to v1.9.8	2023-05-19 11:48:43 +02:00
Szilárd Dóró	f9b81a2ae9	chore: bump version in the Dockerfile as well	2023-05-19 10:34:21 +02:00
Szilárd Dóró	23bac2d29c	Merge branch 'main' into feat/service-versions	2023-05-19 10:27:55 +02:00
Szilárd Dóró	78739f77b1	feat: add support for project status indicator	2023-05-19 09:59:33 +02:00
Szilárd Dóró	dff0894f37	Revert "fix: sync deployment sorting" This reverts commit `80f3645d57`.	2023-05-19 09:38:04 +02:00
Szilárd Dóró	80f3645d57	fix: sync deployment sorting	2023-05-19 09:27:24 +02:00
Szilárd Dóró	7ddb9a654e	fix: sync deployment sorting	2023-05-19 09:10:44 +02:00
Szilárd Dóró	71f3be15d8	Merge pull request #1941 from nhost/chore/under-the-hood-improvements chore(dashboard): under the hood improvements	2023-05-19 09:03:46 +02:00
Szilárd Dóró	96a9070836	chore: loosen eslint rules	2023-05-18 17:07:15 +02:00
Szilárd Dóró	329e5a91b9	fix: use the correct deployment ordering	2023-05-18 16:01:44 +02:00
Szilárd Dóró	6d559d6e23	chore: under the hood improvements	2023-05-18 11:39:22 +02:00
renovate[bot]	f4f1450d06	chore(deps): update dependency turbo to v1.9.8	2023-05-18 08:22:54 +00:00
Szilárd Dóró	a1eea9df7d	Merge pull request #1932 from nhost/renovate/docusaurus-monorepo fix(deps): update docusaurus monorepo to v2.4.1	2023-05-18 10:16:23 +02:00
Szilárd Dóró	26f2b665e6	Merge pull request #1924 from nhost/feat/pat feat(hasura-auth-js): add support for personal access tokens	2023-05-18 10:14:12 +02:00
Szilárd Dóró	8989202692	chore: improve variable name	2023-05-18 10:09:03 +02:00
Szilárd Dóró	2ae463f11f	fix: don't break builds	2023-05-18 10:06:43 +02:00
Szilárd Dóró	18a786e880	feat: add storage settings page	2023-05-18 10:03:15 +02:00
Szilárd Dóró	c88fbe1e17	feat: allow changing db version chore: reorganize features folder	2023-05-18 09:50:36 +02:00
Szilárd Dóró	78c7109c46	chore: add changeset	2023-05-18 08:54:41 +02:00
Szilárd Dóró	c7b968868a	feat: use hardcoded images instead	2023-05-17 16:47:40 +02:00
Szilárd Dóró	77a3473166	feat: add support for version autocomplete	2023-05-17 13:51:39 +02:00
renovate[bot]	224a5cc805	fix(deps): update docusaurus monorepo to v2.4.1	2023-05-17 11:05:58 +00:00
David Barroso	59125b3c77	Merge pull request #1937 from nhost/dbarroso/react-apollo-example-update chore: update react-apollo example's dependencies	2023-05-17 13:02:09 +02:00
Szilárd Dóró	91e2affa6f	chore: use `cache-and-network` fetch policy	2023-05-17 12:52:52 +02:00
Szilárd Dóró	a8d747976b	feat: add support for changing hasura images	2023-05-17 11:23:44 +02:00
Szilárd Dóró	5b69e3efd8	fix: don't break builds	2023-05-17 10:41:27 +02:00
Szilárd Dóró	c9a444d048	chore: sync playwright versions	2023-05-17 10:21:03 +02:00
Szilárd Dóró	fc16fd5452	fix: refresh auth settings on page change	2023-05-17 10:04:19 +02:00
David Barroso	2eeac45718	asd	2023-05-17 09:54:44 +02:00
Szilárd Dóró	afc9de7994	chore: create dedicated hook	2023-05-17 09:40:36 +02:00
David Barroso	fe8ca8aba6	Update examples/react-apollo/package.json Co-authored-by: Szilárd Dóró <doroszilard@icloud.com>	2023-05-17 09:32:13 +02:00
David Barroso	086ee46b08	chore: update react-apollo example's dependencies	2023-05-17 09:21:25 +02:00
Szilárd Dóró	37c1c18b43	feat: fetch docker images from lambda	2023-05-16 16:50:23 +02:00
Szilárd Dóró	67078b9a72	feat: add support for selecting Auth version	2023-05-16 16:22:55 +02:00
Szilárd Dóró	203bc97f51	feat: add useSignInPAT to @nhost/vue	2023-05-16 14:42:55 +02:00
Szilárd Dóró	b24af44aac	feat: add support for `refreshTokenId`	2023-05-16 12:54:51 +02:00
Szilárd Dóró	cdaa6d4e73	chore: remove hash function	2023-05-16 12:16:35 +02:00
Szilárd Dóró	09e2c8f5c7	feat: add hash function	2023-05-16 11:24:52 +02:00
Szilárd Dóró	4581677830	chore: update docs	2023-05-16 09:37:51 +02:00
Szilárd Dóró	7bfa6c9f93	fix: use correct hasura-auth image	2023-05-16 08:59:17 +02:00
Szilárd Dóró	80ef430d70	feat: add personal access token docs	2023-05-16 08:51:22 +02:00
Szilárd Dóró	bad8af0fd1	Merge branch 'main' into feat/pat	2023-05-16 08:35:24 +02:00
Szilárd Dóró	a6120bf366	feat: update API chore: fix tests	2023-05-12 14:59:07 +02:00
Szilárd Dóró	b23dc058a6	Merge branch 'main' into feat/pat	2023-05-12 14:14:09 +02:00
Szilárd Dóró	ad0dda7493	feat: extend `nhost.auth.createPAT` with `id`	2023-05-12 14:09:57 +02:00
Szilárd Dóró	4063507d59	chore: improve CLI example	2023-05-12 14:01:11 +02:00
Szilárd Dóró	85439307a9	feat: finalize CLI example	2023-05-12 09:34:22 +02:00
Szilárd Dóró	0d8baa4065	feat: allow PAT creation through the example	2023-05-12 08:56:56 +02:00
Szilárd Dóró	4bca94425e	chore: add useful information to the README	2023-05-11 15:26:15 +02:00
Szilárd Dóró	9f948385c0	feat: improve readability, add book relationship	2023-05-11 15:23:59 +02:00
Szilárd Dóró	294c504b61	chore: update pnpm-lock file	2023-05-11 15:10:28 +02:00
Szilárd Dóró	1469ec2969	Merge branch 'main' into feat/pat	2023-05-11 15:09:31 +02:00
Szilárd Dóró	726c33d1b2	feat: finalize CLI example	2023-05-10 16:41:49 +02:00
Szilárd Dóró	11b9cfbc0d	feat: add an example CLI tool to showcase PATs	2023-05-10 15:35:54 +02:00
Szilárd Dóró	79aaa91e67	chore: update hasura-auth version	2023-05-09 17:19:40 +02:00
Szilárd Dóró	df4d24320a	chore: update example metadata	2023-05-09 14:33:49 +02:00
Szilárd Dóró	baa3ef794e	feat(examples): add PAT example	2023-05-08 17:03:49 +02:00
Szilárd Dóró	da7ffbe523	feat: add `useSignInPAT` hook	2023-05-08 16:04:00 +02:00
Szilárd Dóró	3ca70554c8	feat: add support for PAT sign in	2023-05-08 14:34:12 +02:00
Szilárd Dóró	077b200510	Merge branch 'main' into feat/pat	2023-05-08 14:04:11 +02:00
Szilárd Dóró	2f220db84a	extend machine with PAT sign in	2023-04-27 17:06:26 +02:00