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

chore: update versions
2023-05-16 08:34:38 +02:00 · 2023-05-15 18:43:10 +00:00 · 2023-05-15 20:41:59 +02:00 · 2023-05-15 19:46:26 +02:00 · 2023-05-15 16:59:00 +02:00 · 2023-05-15 16:05:45 +02:00
214 changed files with 9234 additions and 8645 deletions
--- a/.github/actions/install-dependencies/action.yaml
+++ b/.github/actions/install-dependencies/action.yaml
@@ -14,7 +14,7 @@ runs:
  steps:
    - uses: pnpm/action-setup@v2.2.4
      with:
-        version: 7.17.0
+        version: 8.4.0
        run_install: false
    - name: Get pnpm cache directory
      id: pnpm-cache-dir
--- a/config/vite.lib.config.js
+++ b/config/vite.lib.config.js
@@ -36,6 +36,7 @@ export default defineConfig({
    }
  },
  build: {
+    target: 'es2019',
    sourcemap: true,
    lib: {
      entry,
--- a/dashboard/CHANGELOG.md
+++ b/dashboard/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @nhost/dashboard

+## 0.16.11
+
+### Patch Changes
+
+- 1230b722: fix(projects): don't redirect to 404 on when the project is renamed
+  - @nhost/react-apollo@5.0.22
+  - @nhost/nextjs@1.13.24
+
+## 0.16.10
+
+### Patch Changes
+
+- Updated dependencies [da03bf39]
+  - @nhost/react-apollo@5.0.21
+  - @nhost/nextjs@1.13.23
+
+## 0.16.9
+
+### Patch Changes
+
+- 349aac36: fix(settings): use region domain when constructing the postgres connection string
+
+## 0.16.8
+
+### Patch Changes
+
+- 20fb69fa: chore(projects): change the way how API URLs are constructed
+
+## 0.16.7
+
+### Patch Changes
+
+- 49f9b837: chore(docker): bump `pnpm` to `v8.4.0` and `turbo` to `v1.9.3`
+- 3f478a4e: chore(deps): bump `vitest` to `v0.31.0`, `@types/react` to `v18.2.6` and `@types/react-dom` to `v18.2.4`
+
+## 0.16.6
+
+### Patch Changes
+
+- d926f156: fix(projects): redirect to 404 when an invalid project is opened
+- 49b99728: fix(projects): disable features for non-owner members of workspaces
+
+## 0.16.5
+
+### Patch Changes
+
+- 12e2855f: chore(deps): bump `jsdom` to v22
+- e4972b83: feat(metrics): add Grafana page
+
+## 0.16.4
+
+### Patch Changes
+
+- 3f396a9e: fix(projects): unpause after upgrading a paused project to pro
+- 3f396a9e: fix(projects): don't redirect to 404 page after project creation
+
 ## 0.16.3

 ### 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.8.6
+RUN yarn global add turbo@1.9.3
 COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker

@@ -29,7 +29,7 @@ ENV NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL __NEXT_PUBLIC_NHOST_HASURA_CONSOLE_URL_
 ENV NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL __NEXT_PUBLIC_NHOST_HASURA_MIGRATIONS_API_URL__
 ENV NEXT_PUBLIC_NHOST_HASURA_API_URL __NEXT_PUBLIC_NHOST_HASURA_API_URL__

-RUN yarn global add pnpm@7.17.0
+RUN yarn global add pnpm@8.4.0
 COPY .gitignore .gitignore
 COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-*.yaml .
--- a/dashboard/e2e/overview/overview.test.ts
+++ b/dashboard/e2e/overview/overview.test.ts
@@ -30,7 +30,7 @@ test('should show a sidebar with menu items', async () => {
  const navLocator = page.getByRole('navigation', { name: /main navigation/i });
  await expect(navLocator).toBeVisible();
  await expect(navLocator.getByRole('list').getByRole('listitem')).toHaveCount(
-    10,
+    11,
  );
  await expect(
    navLocator.getByRole('link', { name: /overview/i }),
@@ -53,6 +53,9 @@ test('should show a sidebar with menu items', async () => {
    navLocator.getByRole('link', { name: /backups/i }),
  ).toBeVisible();
  await expect(navLocator.getByRole('link', { name: /logs/i })).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /metrics/i }),
+  ).toBeVisible();
  await expect(
    navLocator.getByRole('link', { name: /settings/i }),
  ).toBeVisible();
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nhost/dashboard",
-  "version": "0.16.3",
+  "version": "0.16.11",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -105,15 +105,15 @@
    "@types/lodash.debounce": "^4.0.7",
    "@types/node": "^16.11.7",
    "@types/pluralize": "^0.0.29",
-    "@types/react": "18.2.0",
-    "@types/react-dom": "18.2.1",
+    "@types/react": "18.2.6",
+    "@types/react-dom": "18.2.4",
    "@types/react-table": "^7.7.12",
    "@types/testing-library__jest-dom": "^5.14.5",
    "@types/validator": "^13.7.10",
    "@typescript-eslint/eslint-plugin": "^5.43.0",
    "@typescript-eslint/parser": "^5.43.0",
    "@vitejs/plugin-react": "^4.0.0",
-    "@vitest/coverage-c8": "^0.30.0",
+    "@vitest/coverage-c8": "^0.31.0",
    "autoprefixer": "^10.4.13",
    "babel-loader": "^8.3.0",
    "babel-plugin-transform-remove-console": "^6.9.4",
@@ -129,7 +129,7 @@
    "eslint-plugin-jsx-a11y": "^6.6.1",
    "eslint-plugin-react": "^7.31.11",
    "eslint-plugin-react-hooks": "^4.6.0",
-    "jsdom": "^21.0.0",
+    "jsdom": "^22.0.0",
    "lint-staged": ">=13",
    "msw": "^1.0.1",
    "msw-storybook-addon": "^1.6.3",
@@ -147,8 +147,7 @@
    "tsconfig-paths-webpack-plugin": "^4.0.0",
    "vite": "^4.0.2",
    "vite-tsconfig-paths": "^4.0.3",
-    "vitest": "^0.30.1",
-    "webpack": "^5.75.0"
+    "vitest": "^0.31.0"
  },
  "browserslist": {
    "production": [
--- a/dashboard/public/assets/grafana.svg
+++ b/dashboard/public/assets/grafana.svg
--- a/dashboard/src/components/applications/AppLoader.tsx
+++ b/dashboard/src/components/applications/AppLoader.tsx
@@ -1,6 +1,6 @@
 import FeedbackForm from '@/components/common/FeedbackForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useInterval } from '@/hooks/useInterval';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';
--- a/dashboard/src/components/applications/ApplicationErrored.tsx
+++ b/dashboard/src/components/applications/ApplicationErrored.tsx
@@ -1,8 +1,9 @@
 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 { useAppCreatedAt } from '@/hooks/useAppCreatedAt';
 import { useCurrentDate } from '@/hooks/useCurrentDate';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { ApplicationState } from '@/types/application';
 import { ApplicationStatus } from '@/types/application';
 import { Modal } from '@/ui/Modal';
@@ -56,9 +57,7 @@ export default function ApplicationErrored() {
  const client = useApolloClient();
  const { currentDate } = useCurrentDate();
  const user = useUserData();
-  const isOwner = currentWorkspace.workspaceMembers.some(
-    ({ id, type }) => id === user?.id && type === 'owner',
-  );
+  const isOwner = useIsCurrentUserOwner();

  const { appCreatedAt } = useAppCreatedAt();

--- a/dashboard/src/components/applications/ApplicationInfo.tsx
+++ b/dashboard/src/components/applications/ApplicationInfo.tsx
@@ -1,12 +1,12 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetAllWorkspacesAndProjectsDocument,
  useDeleteApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import Button from '@/ui/v2/Button';
-import ArrowRightIcon from '@/ui/v2/icons/ArrowRightIcon';
 import Link from '@/ui/v2/Link';
 import Text from '@/ui/v2/Text';
+import ArrowRightIcon from '@/ui/v2/icons/ArrowRightIcon';
 import { copy } from '@/utils/copy';
 import { getApplicationStatusString } from '@/utils/helpers';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/applications/ApplicationPaused.tsx
+++ b/dashboard/src/components/applications/ApplicationPaused.tsx
@@ -3,12 +3,13 @@ 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 {
  GetAllWorkspacesAndProjectsDocument,
  useGetFreeAndActiveProjectsQuery,
  useUnpauseApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Modal } from '@/ui';
 import { Alert } from '@/ui/Alert';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
@@ -26,15 +27,11 @@ import { RemoveApplicationModal } from './RemoveApplicationModal';

 export default function ApplicationPaused() {
  const { openDialog } = useDialog();
-  const {
-    currentWorkspace,
-    currentProject,
-    refetch: refetchWorkspaceAndProject,
-  } = useCurrentWorkspaceAndProject();
+  const { currentProject, refetch: refetchWorkspaceAndProject } =
+    useCurrentWorkspaceAndProject();
+  const isOwner = useIsCurrentUserOwner();
  const user = useUserData();
-  const isOwner = currentWorkspace.workspaceMembers.some(
-    ({ id, type }) => id === user?.id && type === 'owner',
-  );
+
  const [showDeletingModal, setShowDeletingModal] = useState(false);
  const [unpauseApplication, { loading: changingApplicationStateLoading }] =
    useUnpauseApplicationMutation({
@@ -120,20 +117,22 @@ export default function ApplicationPaused() {
        </Box>

        <Box className="grid grid-flow-row gap-2">
-          <Button
-            className="mx-auto w-full max-w-[280px]"
-            onClick={() => {
-              openDialog({
-                component: <ChangePlanModal />,
-                props: {
-                  PaperProps: { className: 'p-0' },
-                  maxWidth: 'lg',
-                },
-              });
-            }}
-          >
-            Upgrade to Pro
-          </Button>
+          {isOwner && (
+            <Button
+              className="mx-auto w-full max-w-[280px]"
+              onClick={() => {
+                openDialog({
+                  component: <ChangePlanModal />,
+                  props: {
+                    PaperProps: { className: 'p-0' },
+                    maxWidth: 'lg',
+                  },
+                });
+              }}
+            >
+              Upgrade to Pro
+            </Button>
+          )}

          <div className="grid grid-flow-row gap-2">
            <Button
--- a/dashboard/src/components/applications/ApplicationProvisioning.tsx
+++ b/dashboard/src/components/applications/ApplicationProvisioning.tsx
@@ -1,6 +1,6 @@
 import Container from '@/components/layout/Container';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useCheckProvisioning } from '@/hooks/useCheckProvisioning';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { ApplicationStatus } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Text from '@/ui/v2/Text';
--- a/dashboard/src/components/applications/ApplicationRestoring.tsx
+++ b/dashboard/src/components/applications/ApplicationRestoring.tsx
@@ -1,6 +1,6 @@
 import Container from '@/components/layout/Container';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useCheckProvisioning } from '@/hooks/useCheckProvisioning';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { ApplicationStatus } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Text from '@/ui/v2/Text';
--- a/dashboard/src/components/applications/ApplicationUnknown.tsx
+++ b/dashboard/src/components/applications/ApplicationUnknown.tsx
@@ -1,11 +1,11 @@
 import FeedbackForm from '@/components/common/FeedbackForm';
 import Container from '@/components/layout/Container';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
 import { Modal } from '@/ui/Modal';
 import Button from '@/ui/v2/Button';
 import { Dropdown } from '@/ui/v2/Dropdown';
 import Text from '@/ui/v2/Text';
-import { useUserData } from '@nhost/nextjs';
 import Image from 'next/image';
 import { useState } from 'react';
 import ApplicationInfo from './ApplicationInfo';
@@ -13,12 +13,9 @@ import { RemoveApplicationModal } from './RemoveApplicationModal';
 import { StagingMetadata } from './StagingMetadata';

 export default function ApplicationUnknown() {
-  const { currentWorkspace, currentProject } = useCurrentWorkspaceAndProject();
+  const { currentProject } = useCurrentWorkspaceAndProject();
  const [showDeleteModal, setShowDeleteModal] = useState(false);
-  const user = useUserData();
-  const isOwner = currentWorkspace.workspaceMembers.some(
-    ({ id, type }) => id === user?.id && type === 'owner',
-  );
+  const isOwner = useIsCurrentUserOwner();

  return (
    <>
--- 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 '@/hooks/common/useProjectRedirectWhenReady';
+import { useProjectRedirectWhenReady } from '@/features/projects/common/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,12 +1,14 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import { BillingPaymentMethodForm } from '@/components/workspace/BillingPaymentMethodForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  refetchGetApplicationPlanQuery,
  useGetAppPlanAndGlobalPlansQuery,
  useGetPaymentMethodsQuery,
  useUpdateApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import useApplicationState from '@/hooks/useApplicationState';
+import { ApplicationStatus } from '@/types/application';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
@@ -15,11 +17,11 @@ import { BaseDialog } from '@/ui/v2/Dialog';
 import Link from '@/ui/v2/Link';
 import Text from '@/ui/v2/Text';
 import { planDescriptions } from '@/utils/planDescriptions';
-import getServerError from '@/utils/settings/getServerError/getServerError';
+import getServerError from '@/utils/settings/getServerError';
 import { getToastStyleProps } from '@/utils/settings/settingsConstants';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { toast } from 'react-hot-toast';

 function Plan({ planName, price, setPlan, planId, selectedPlanId }: any) {
@@ -53,7 +55,7 @@ function Plan({ planName, price, setPlan, planId, selectedPlanId }: any) {
      </div>

      <Text variant="h3" component="p">
-        $ {price}/mo
+        ${price}/mo
      </Text>
    </button>
  );
@@ -62,12 +64,14 @@ function Plan({ planName, price, setPlan, planId, selectedPlanId }: any) {
 export function ChangePlanModalWithData({ app, plans, close }: any) {
  const [selectedPlanId, setSelectedPlanId] = useState('');
  const { closeAlertDialog } = useDialog();
+  const [pollingCurrentProject, setPollingCurrentProject] = useState(false);

  const {
    currentWorkspace,
    currentProject,
    refetch: refetchWorkspaceAndProject,
  } = useCurrentWorkspaceAndProject();
+  const { state } = useApplicationState();

  const { data } = useGetPaymentMethodsQuery({
    variables: {
@@ -82,6 +86,29 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
  const currentPlan = plans.find((plan) => plan.id === app.plan.id);
  const selectedPlan = plans.find((plan) => plan.id === selectedPlanId);

+  useEffect(() => {
+    if (!pollingCurrentProject || state === ApplicationStatus.Paused) {
+      return;
+    }
+
+    close?.();
+    closeAlertDialog();
+    setShowPaymentModal(false);
+    setPollingCurrentProject(false);
+  }, [state, pollingCurrentProject, close, closeAlertDialog]);
+
+  useEffect(() => {
+    if (!pollingCurrentProject) {
+      return () => {};
+    }
+
+    const interval = setInterval(() => {
+      refetchWorkspaceAndProject();
+    }, 1000);
+
+    return () => clearInterval(interval);
+  }, [pollingCurrentProject, refetchWorkspaceAndProject, currentProject]);
+
  const [updateApp] = useUpdateApplicationMutation({
    refetchQueries: [
      refetchGetApplicationPlanQuery({
@@ -99,6 +126,7 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
            appId: app.id,
            app: {
              planId: selectedPlan.id,
+              desiredState: 5,
            },
          },
        }),
@@ -112,11 +140,7 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
        getToastStyleProps(),
      );

-      await refetchWorkspaceAndProject();
-
-      close?.();
-      closeAlertDialog();
-      setShowPaymentModal(false);
+      setPollingCurrentProject(true);
    } catch (error) {
      // Note: Error is handled by the toast.
    }
@@ -134,12 +158,49 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
    }

    await handleUpdateAppPlan();
-
-    setShowPaymentModal(false);
-    close?.();
-    closeAlertDialog();
  };

+  if (pollingCurrentProject) {
+    return (
+      <Box className="mx-auto w-full max-w-xl rounded-lg p-6 text-left">
+        <div className="flex flex-col">
+          <div className="mx-auto">
+            <Image
+              src="/assets/upgrade.svg"
+              alt="Nhost Logo"
+              width={72}
+              height={72}
+            />
+          </div>
+
+          <Text variant="h3" component="h2" className="mt-2 text-center">
+            Successfully upgraded to {currentPlan.name}
+          </Text>
+
+          <ActivityIndicator
+            label="We are unpausing your project. This may take some time..."
+            className="mx-auto mt-2"
+          />
+
+          <Button
+            variant="outlined"
+            color="secondary"
+            className="mx-auto mt-4 w-full max-w-sm"
+            onClick={() => {
+              if (close) {
+                close();
+              }
+
+              closeAlertDialog();
+            }}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Box>
+    );
+  }
+
  if (app.plan.id !== plans.find((plan) => plan.isFree)?.id) {
    return (
      <Box className="mx-auto w-full max-w-xl rounded-lg p-6 text-left">
@@ -215,7 +276,7 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
          You&apos;re currently on the <strong>{app.plan.name}</strong> plan.
        </Text>

-        <div className="mt-5">
+        <div className="mt-2">
          {plans
            .filter((plan) => plan.id !== app.plan.id)
            .map((plan) => (
@@ -233,8 +294,12 @@ export function ChangePlanModalWithData({ app, plans, close }: any) {
            ))}
        </div>

-        <div className="mt-6 grid grid-flow-row gap-2">
-          <Button onClick={handleChangePlanClick} disabled={!selectedPlan}>
+        <div className="mt-2 grid grid-flow-row gap-2">
+          <Button
+            onClick={handleChangePlanClick}
+            disabled={!selectedPlan}
+            loading={pollingCurrentProject}
+          >
            Upgrade
          </Button>

--- a/dashboard/src/components/applications/HasuraData.tsx
+++ b/dashboard/src/components/applications/HasuraData.tsx
@@ -1,12 +1,12 @@
 import { LoadingScreen } from '@/components/common/LoadingScreen';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import IconButton from '@/ui/v2/IconButton';
+import Text from '@/ui/v2/Text';
 import ArrowSquareOutIcon from '@/ui/v2/icons/ArrowSquareOutIcon';
 import CopyIcon from '@/ui/v2/icons/CopyIcon';
-import Text from '@/ui/v2/Text';
 import generateAppServiceUrl, {
  defaultLocalBackendSlugs,
  defaultRemoteBackendSlugs,
@@ -33,7 +33,7 @@ export function HasuraData({ close }: HasuraDataProps) {
      ? `${getHasuraConsoleServiceUrl()}`
      : generateAppServiceUrl(
          currentProject?.subdomain,
-          currentProject?.region.awsName,
+          currentProject?.region,
          'hasura',
          defaultLocalBackendSlugs,
          { ...defaultRemoteBackendSlugs, hasura: '/console' },
--- a/dashboard/src/components/applications/RemoveApplicationModal.tsx
+++ b/dashboard/src/components/applications/RemoveApplicationModal.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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/RestoreBackupModal.tsx
+++ b/dashboard/src/components/applications/RestoreBackupModal.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,5 +1,6 @@
 import { ChangePlanModal } from '@/components/applications/ChangePlanModal';
 import { useDialog } from '@/components/common/DialogProvider';
+import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
@@ -20,25 +21,36 @@ export function UnlockFeatureByUpgrading({
  ...props
 }: UnlockFeatureByUpgradingProps) {
  const { openDialog } = useDialog();
+  const isOwner = useIsCurrentUserOwner();

  return (
    <div className={twMerge('flex', className)} {...props}>
      <Alert className="grid w-full grid-flow-col place-content-between items-center gap-2">
-        <Text className="text-left">{message}</Text>
+        <Text className="grid grid-flow-row justify-items-start gap-0.5">
+          <Text component="span">{message}</Text>

-        <Button
-          variant="borderless"
-          onClick={() => {
-            openDialog({
-              component: <ChangePlanModal />,
-              props: {
-                PaperProps: { className: 'p-0 max-w-xl w-full' },
-              },
-            });
-          }}
-        >
-          Upgrade
-        </Button>
+          {!isOwner && (
+            <Text component="span" color="secondary" className="text-sm">
+              Ask an owner of this workspace to upgrade the project.
+            </Text>
+          )}
+        </Text>
+
+        {isOwner && (
+          <Button
+            variant="borderless"
+            onClick={() => {
+              openDialog({
+                component: <ChangePlanModal />,
+                props: {
+                  PaperProps: { className: 'p-0 max-w-xl w-full' },
+                },
+              });
+            }}
+          >
+            Upgrade
+          </Button>
+        )}
      </Alert>
    </div>
  );
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,8 +2,8 @@ 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 { useUpdateApplicationMutation } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
 import { discordAnnounce } from '@/utils/discordAnnounce';
--- a/dashboard/src/components/applications/graphql/UserSelect.tsx
+++ b/dashboard/src/components/applications/graphql/UserSelect.tsx
@@ -1,5 +1,5 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Option from '@/ui/v2/Option';
 import Select from '@/ui/v2/Select';
--- a/dashboard/src/components/common/Breadcrumbs/Breadcrumbs.tsx
+++ b/dashboard/src/components/common/Breadcrumbs/Breadcrumbs.tsx
@@ -1,6 +1,6 @@
 import NavLink from '@/components/common/NavLink';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { BoxProps } from '@/ui/v2/Box';
 import Box from '@/ui/v2/Box';
 import Text from '@/ui/v2/Text';
--- a/dashboard/src/components/common/DataGridPreviewCell/DataGridPreviewCell.tsx
+++ b/dashboard/src/components/common/DataGridPreviewCell/DataGridPreviewCell.tsx
@@ -2,8 +2,8 @@ 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 { useAppClient } from '@/hooks/useAppClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Modal } from '@/ui/Modal';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
--- a/dashboard/src/components/dataBrowser/DataBrowserGrid/DataBrowserGrid.tsx
+++ b/dashboard/src/components/dataBrowser/DataBrowserGrid/DataBrowserGrid.tsx
@@ -9,12 +9,12 @@ 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 useDeleteColumnWithToastMutation from '@/hooks/dataBrowser/useDeleteColumnMutation/useDeleteColumnWithToastMutation';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import type { UpdateRecordVariables } from '@/hooks/dataBrowser/useUpdateRecordMutation';
 import useUpdateRecordWithToastMutation from '@/hooks/dataBrowser/useUpdateRecordMutation/useUpdateRecordWithToastMutation';
 import useTablePath from '@/hooks/useTablePath';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type {
  DataBrowserGridColumn,
  NormalizedQueryDataRow,
--- a/dashboard/src/components/dataBrowser/DataBrowserGridControls/DataBrowserGridControls.tsx
+++ b/dashboard/src/components/dataBrowser/DataBrowserGridControls/DataBrowserGridControls.tsx
@@ -1,9 +1,9 @@
 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 useDeleteRecordMutation from '@/hooks/dataBrowser/useDeleteRecordMutation';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { DataBrowserGridColumn } from '@/types/dataBrowser';
 import type { BoxProps } from '@/ui/v2/Box';
 import Box from '@/ui/v2/Box';
--- a/dashboard/src/components/dataBrowser/DataBrowserSidebar/DataBrowserSidebar.tsx
+++ b/dashboard/src/components/dataBrowser/DataBrowserSidebar/DataBrowserSidebar.tsx
@@ -3,10 +3,10 @@ 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 useIsPlatform from '@/hooks/common/useIsPlatform';
 import useDatabaseQuery from '@/hooks/dataBrowser/useDatabaseQuery';
 import useDeleteTableWithToastMutation from '@/hooks/dataBrowser/useDeleteTableMutation/useDeleteTableWithToastMutation';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import FloatingActionButton from '@/ui/FloatingActionButton';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Backdrop from '@/ui/v2/Backdrop';
@@ -17,6 +17,12 @@ import Chip from '@/ui/v2/Chip';
 import Divider from '@/ui/v2/Divider';
 import { Dropdown } from '@/ui/v2/Dropdown';
 import IconButton from '@/ui/v2/IconButton';
+import Link from '@/ui/v2/Link';
+import List from '@/ui/v2/List';
+import { ListItem } from '@/ui/v2/ListItem';
+import Option from '@/ui/v2/Option';
+import Select from '@/ui/v2/Select';
+import Text from '@/ui/v2/Text';
 import ArrowRightIcon from '@/ui/v2/icons/ArrowRightIcon';
 import DotsHorizontalIcon from '@/ui/v2/icons/DotsHorizontalIcon';
 import LockIcon from '@/ui/v2/icons/LockIcon';
@@ -24,12 +30,6 @@ import PencilIcon from '@/ui/v2/icons/PencilIcon';
 import PlusIcon from '@/ui/v2/icons/PlusIcon';
 import TrashIcon from '@/ui/v2/icons/TrashIcon';
 import UsersIcon from '@/ui/v2/icons/UsersIcon';
-import Link from '@/ui/v2/Link';
-import List from '@/ui/v2/List';
-import { ListItem } from '@/ui/v2/ListItem';
-import Option from '@/ui/v2/Option';
-import Select from '@/ui/v2/Select';
-import Text from '@/ui/v2/Text';
 import { isSchemaLocked } from '@/utils/dataBrowser/schemaHelpers';
 import { useQueryClient } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
--- a/dashboard/src/components/dataBrowser/EditPermissionsForm/EditPermissionsForm.tsx
+++ b/dashboard/src/components/dataBrowser/EditPermissionsForm/EditPermissionsForm.tsx
@@ -1,8 +1,8 @@
 import { useDialog } from '@/components/common/DialogProvider';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import useMetadataQuery from '@/hooks/dataBrowser/useMetadataQuery';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { DialogFormProps } from '@/types/common';
 import type {
  DatabaseAccessLevel,
--- a/dashboard/src/components/dataBrowser/EditPermissionsForm/sections/ColumnPresetsSection.tsx
+++ b/dashboard/src/components/dataBrowser/EditPermissionsForm/sections/ColumnPresetsSection.tsx
@@ -1,7 +1,7 @@
 import ControlledSelect from '@/components/common/ControlledSelect';
 import type { RolePermissionEditorFormValues } from '@/components/dataBrowser/EditPermissionsForm/RolePermissionEditorForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import useTableQuery from '@/hooks/dataBrowser/useTableQuery';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Autocomplete from '@/ui/v2/Autocomplete';
 import Button from '@/ui/v2/Button';
--- a/dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.tsx
+++ b/dashboard/src/components/dataBrowser/RuleGroupEditor/RuleGroupEditor.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import type { Rule, RuleGroup } from '@/types/dataBrowser';
 import { Alert } from '@/ui/Alert';
 import type { BoxProps } from '@/ui/v2/Box';
@@ -194,7 +194,7 @@ export default function RuleGroupEditor({
                    <Link
                      href={`${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region?.awsName,
+                        currentProject.region,
                        'hasura',
                      )}/console/data/default/schema/${schema}/tables/${table}/permissions`}
                      underline="hover"
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,6 +1,6 @@
 import NavLink from '@/components/common/NavLink';
 import AppDeploymentDuration from '@/components/deployments/AppDeploymentDuration';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { Avatar } from '@/ui/Avatar';
 import type { DeploymentStatus } from '@/ui/StatusCircle';
 import { StatusCircle } from '@/ui/StatusCircle';
--- a/dashboard/src/components/files/FilesDataGrid/FilesDataGrid.tsx
+++ b/dashboard/src/components/files/FilesDataGrid/FilesDataGrid.tsx
@@ -7,11 +7,11 @@ 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 { useAppClient } from '@/hooks/useAppClient';
 import useBuckets from '@/hooks/useBuckets';
 import useFiles from '@/hooks/useFiles';
 import useFilesAggregate from '@/hooks/useFilesAggregate';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { Files } from '@/utils/__generated__/graphql';
 import { Order_By as OrderBy } from '@/utils/__generated__/graphql';
 import { getHasuraAdminSecret } from '@/utils/env';
--- a/dashboard/src/components/files/FilesDataGridControls/FilesDataGridControls.tsx
+++ b/dashboard/src/components/files/FilesDataGridControls/FilesDataGridControls.tsx
@@ -1,9 +1,9 @@
 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 { useAppClient } from '@/hooks/useAppClient';
 import useDataGridConfig from '@/hooks/useDataGridConfig';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { FileUploadButtonProps } from '@/ui/FileUploadButton';
 import FileUploadButton from '@/ui/FileUploadButton';
 import type { BoxProps } from '@/ui/v2/Box';
--- a/dashboard/src/components/home/SendFeedback.tsx
+++ b/dashboard/src/components/home/SendFeedback.tsx
@@ -1,5 +1,5 @@
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useInsertFeedbackOneMutation } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Avatar } from '@/ui/Avatar';
 import Button from '@/ui/v2/Button';
 import Input from '@/ui/v2/Input';
--- a/dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx
+++ b/dashboard/src/components/layout/ProjectLayout/ProjectLayout.tsx
@@ -2,11 +2,11 @@ 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 useIsPlatform from '@/hooks/common/useIsPlatform';
 import useProjectRoutes from '@/hooks/common/useProjectRoutes';
 import { useNavigationVisible } from '@/hooks/useNavigationVisible';
 import useNotFoundRedirect from '@/hooks/useNotFoundRedirect';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { BoxProps } from '@/ui/v2/Box';
 import Box from '@/ui/v2/Box';
 import { NextSeo } from 'next-seo';
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,12 +1,13 @@
 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 useIsPlatform from '@/hooks/common/useIsPlatform';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import Button from '@/ui/v2/Button';
 import Chip from '@/ui/v2/Chip';
-import CogIcon from '@/ui/v2/icons/CogIcon';
 import Text from '@/ui/v2/Text';
+import CogIcon from '@/ui/v2/icons/CogIcon';
 import { formatDistanceToNowStrict, parseISO } from 'date-fns';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -14,6 +15,7 @@ import Link from 'next/link';
 export default function OverviewTopBar() {
  const isPlatform = useIsPlatform();
  const { currentWorkspace, currentProject } = useCurrentWorkspaceAndProject();
+  const isOwner = useIsCurrentUserOwner();
  const isPro = !currentProject?.plan?.isFree;
  const { openDialog } = useDialog();
  const { maintenanceActive } = useUI();
@@ -87,7 +89,7 @@ export default function OverviewTopBar() {
                  color={isPro ? 'primary' : 'default'}
                />

-                {!isPro && (
+                {!isPro && isOwner && (
                  <Button
                    variant="borderless"
                    className="mr-2"
--- a/dashboard/src/components/overview/OverviewUsage/OverviewUsage.tsx
+++ b/dashboard/src/components/overview/OverviewUsage/OverviewUsage.tsx
@@ -1,4 +1,5 @@
 import RetryableErrorBoundary from '@/components/common/RetryableErrorBoundary';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  useGetAppFunctionsMetadataQuery,
  useGetProjectMetricsQuery,
@@ -6,7 +7,6 @@ import {
 } from '@/generated/graphql';
 import useIsPlatform from '@/hooks/common/useIsPlatform';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import LinearProgress from '@/ui/v2/LinearProgress';
 import Text from '@/ui/v2/Text';
 import { prettifySize } from '@/utils/common/prettifySize';
--- a/dashboard/src/components/settings/ResetDatabasePasswordSettings/ResetDatabasePasswordSettings.tsx
+++ b/dashboard/src/components/settings/ResetDatabasePasswordSettings/ResetDatabasePasswordSettings.tsx
@@ -1,15 +1,15 @@
 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 {
  useResetPostgresPasswordMutation,
  useUpdateApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import Button from '@/ui/v2/Button';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import { copy } from '@/utils/copy';
 import { discordAnnounce } from '@/utils/discordAnnounce';
 import generateRandomDatabasePassword from '@/utils/settings/generateRandomDatabasePassword';
@@ -56,7 +56,9 @@ export default function ResetDatabasePasswordSettings() {
  const handleGenerateRandomPassword = () => {
    const newRandomDatabasePassword = generateRandomDatabasePassword();
    triggerToast('New random database password generated.');
-    setValue('databasePassword', newRandomDatabasePassword);
+    setValue('databasePassword', newRandomDatabasePassword, {
+      shouldDirty: true,
+    });
  };

  const handleChangeDatabasePassword = async (
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import FloatingActionButton from '@/ui/FloatingActionButton';
 import Backdrop from '@/ui/v2/Backdrop';
 import type { BoxProps } from '@/ui/v2/Box';
--- a/dashboard/src/components/settings/authentication/AllowedEmailSettings/AllowedEmailSettings.tsx
+++ b/dashboard/src/components/settings/authentication/AllowedEmailSettings/AllowedEmailSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/authentication/AllowedRedirectURLsSettings/AllowedRedirectURLsSettings.tsx
+++ b/dashboard/src/components/settings/authentication/AllowedRedirectURLsSettings/AllowedRedirectURLsSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/authentication/BlockedEmailSettings/BlockedEmailSettings.tsx
+++ b/dashboard/src/components/settings/authentication/BlockedEmailSettings/BlockedEmailSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/authentication/ClientURLSettings/ClientURLSettings.tsx
+++ b/dashboard/src/components/settings/authentication/ClientURLSettings/ClientURLSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/authentication/DisableNewUsersSettings/DisableNewUsersSettings.tsx
+++ b/dashboard/src/components/settings/authentication/DisableNewUsersSettings/DisableNewUsersSettings.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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import {
  GetAuthenticationSettingsDocument,
--- a/dashboard/src/components/settings/authentication/GravatarSettings/GravatarSettings.tsx
+++ b/dashboard/src/components/settings/authentication/GravatarSettings/GravatarSettings.tsx
@@ -2,12 +2,12 @@ import ControlledSelect from '@/components/common/ControlledSelect';
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Option from '@/ui/v2/Option';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/authentication/MFASettings/MFASettings.tsx
+++ b/dashboard/src/components/settings/authentication/MFASettings/MFASettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetAuthenticationSettingsDocument,
  useGetAuthenticationSettingsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import getServerError from '@/utils/settings/getServerError';
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,9 +3,9 @@ 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 useIsPlatform from '@/hooks/common/useIsPlatform';
 import { useAppClient } from '@/hooks/useAppClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
@@ -107,7 +107,7 @@ export default function SystemEnvironmentVariableSettings() {
          ? `${getHasuraConsoleServiceUrl()}/console`
          : generateAppServiceUrl(
              currentProject?.subdomain,
-              currentProject?.region.awsName,
+              currentProject?.region,
              'hasura',
              defaultLocalBackendSlugs,
              { ...defaultRemoteBackendSlugs, hasura: '/console' },
--- a/dashboard/src/components/settings/git/BaseDirectorySettings/BaseDirectorySettings.tsx
+++ b/dashboard/src/components/settings/git/BaseDirectorySettings/BaseDirectorySettings.tsx
@@ -2,11 +2,11 @@ import Form from '@/components/common/Form';
 import InlineCode from '@/components/common/InlineCode';
 import SettingsContainer from '@/components/settings/SettingsContainer';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetAllWorkspacesAndProjectsDocument,
  useUpdateApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Alert } from '@/ui/Alert';
 import Input from '@/ui/v2/Input';
 import { discordAnnounce } from '@/utils/discordAnnounce';
--- a/dashboard/src/components/settings/git/DeploymentBranchSettings/DeploymentBranchSettings.tsx
+++ b/dashboard/src/components/settings/git/DeploymentBranchSettings/DeploymentBranchSettings.tsx
@@ -1,11 +1,11 @@
 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 {
  GetAllWorkspacesAndProjectsDocument,
  useUpdateApplicationMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Alert } from '@/ui/Alert';
 import Input from '@/ui/v2/Input';
 import { discordAnnounce } from '@/utils/discordAnnounce';
--- 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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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/settings/resources/utils/calculateBillableResources';
-import { prettifyMemory } from '@/features/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+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 { 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,11 +4,11 @@ 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 { calculateBillableResources } from '@/features/settings/resources/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
-import { resourceSettingsValidationSchema } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+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 { useProPlan } from '@/hooks/common/useProPlan';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import { Alert } from '@/ui/Alert';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
--- 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/settings/resources/utils/calculateBillableResources';
-import type { ResourceSettingsFormValues } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+import { calculateBillableResources } from '@/features/projects/settings/resources/utils/calculateBillableResources';
+import type { ResourceSettingsFormValues } from '@/features/projects/settings/resources/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/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+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 {
  MAX_SERVICE_MEMORY,
  MAX_SERVICE_REPLICAS,
@@ -8,7 +8,7 @@ import {
  MIN_SERVICE_MEMORY,
  MIN_SERVICE_REPLICAS,
  MIN_SERVICE_VCPU,
-} from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+} from '@/features/projects/settings/resources/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/settings/resources/utils/calculateBillableResources';
-import { getAllocatedResources } from '@/features/settings/resources/utils/getAllocatedResources';
-import { prettifyMemory } from '@/features/settings/resources/utils/prettifyMemory';
-import { prettifyVCPU } from '@/features/settings/resources/utils/prettifyVCPU';
-import type { ResourceSettingsFormValues } from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+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 {
  MAX_TOTAL_VCPU,
  MIN_TOTAL_VCPU,
-} from '@/features/settings/resources/utils/resourceSettingsValidationSchema';
+} from '@/features/projects/settings/resources/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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 '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/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,12 +1,12 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import getServerError from '@/utils/settings/getServerError';
 import { getToastStyleProps } from '@/utils/settings/settingsConstants';
--- a/dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx
@@ -1,17 +1,17 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -217,7 +217,7 @@ export default function AppleProviderSettings() {
            id="redirectUrl"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/apple/callback`}
            className="col-span-2"
@@ -236,7 +236,7 @@ export default function AppleProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/apple/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/AzureADProviderSettings/AzureADProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/AzureADProviderSettings/AzureADProviderSettings.tsx
@@ -2,17 +2,17 @@ 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -163,7 +163,7 @@ export default function AzureADProviderSettings() {
            id="redirectUrl"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/azuread/callback`}
            className="col-span-2"
@@ -182,7 +182,7 @@ export default function AzureADProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/azuread/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/DiscordProviderSettings/DiscordProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/DiscordProviderSettings/DiscordProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -139,7 +139,7 @@ export default function DiscordProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/discord/callback`}
            disabled
@@ -154,7 +154,7 @@ export default function DiscordProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/discord/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/EmailAndPasswordSettings/EmailAndPasswordSettings.tsx
@@ -2,12 +2,12 @@ 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Text from '@/ui/v2/Text';
 import getServerError from '@/utils/settings/getServerError';
--- a/dashboard/src/components/settings/signInMethods/FacebookProviderSettings/FacebookProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/FacebookProviderSettings/FacebookProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -139,7 +139,7 @@ export default function FacebookProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/facebook/callback`}
            disabled
@@ -154,7 +154,7 @@ export default function FacebookProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/facebook/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/GitHubProviderSettings/GitHubProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/GitHubProviderSettings/GitHubProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -145,7 +145,7 @@ export default function GitHubProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/github/callback`}
            disabled
@@ -160,7 +160,7 @@ export default function GitHubProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/github/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/GoogleProviderSettings/GoogleProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/GoogleProviderSettings/GoogleProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -139,7 +139,7 @@ export default function GoogleProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/google/callback`}
            disabled
@@ -154,7 +154,7 @@ export default function GoogleProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/google/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/LinkedInProviderSettings/LinkedInProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/LinkedInProviderSettings/LinkedInProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -139,7 +139,7 @@ export default function LinkedInProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/linkedin/callback`}
            disabled
@@ -154,7 +154,7 @@ export default function LinkedInProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/linkedin/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/MagicLinkSettings/MagicLinkSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/MagicLinkSettings/MagicLinkSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import getServerError from '@/utils/settings/getServerError';
 import { getToastStyleProps } from '@/utils/settings/settingsConstants';
--- a/dashboard/src/components/settings/signInMethods/SMSSettings/SMSSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/SMSSettings/SMSSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Input from '@/ui/v2/Input';
 import Option from '@/ui/v2/Option';
--- a/dashboard/src/components/settings/signInMethods/SpotifyProviderSettings/SpotifyProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/SpotifyProviderSettings/SpotifyProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -139,7 +139,7 @@ export default function SpotifyProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/spotify/callback`}
            disabled
@@ -154,7 +154,7 @@ export default function SpotifyProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/spotify/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/TwitchProviderSettings/TwitchProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/TwitchProviderSettings/TwitchProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -145,7 +145,7 @@ export default function TwitchProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/twitch/callback`}
            disabled
@@ -160,7 +160,7 @@ export default function TwitchProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/twitch/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/TwitterProviderSettings/TwitterProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/TwitterProviderSettings/TwitterProviderSettings.tsx
@@ -1,17 +1,17 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -167,7 +167,7 @@ export default function TwitterProviderSettings() {
            id="redirectUrl"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/twitter/callback`}
            className="col-span-2"
@@ -186,7 +186,7 @@ export default function TwitterProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/twitter/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/WebAuthnSettings/WebAuthnSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/WebAuthnSettings/WebAuthnSettings.tsx
@@ -1,12 +1,12 @@
 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import getServerError from '@/utils/settings/getServerError';
 import { getToastStyleProps } from '@/utils/settings/settingsConstants';
--- a/dashboard/src/components/settings/signInMethods/WindowsLiveProviderSettings/WindowsLiveProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/WindowsLiveProviderSettings/WindowsLiveProviderSettings.tsx
@@ -5,17 +5,17 @@ import BaseProviderSettings, {
  baseProviderValidationSchema,
 } from '@/components/settings/signInMethods/BaseProviderSettings';
 import { useUI } from '@/context/UIContext';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -138,7 +138,7 @@ export default function WindowsLiveProviderSettings() {
            label="Redirect URL"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/windowslive/callback`}
            disabled
@@ -153,7 +153,7 @@ export default function WindowsLiveProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/windowslive/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/settings/signInMethods/WorkOsProviderSettings/WorkOsProviderSettings.tsx
+++ b/dashboard/src/components/settings/signInMethods/WorkOsProviderSettings/WorkOsProviderSettings.tsx
@@ -2,17 +2,17 @@ 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 {
  GetSignInMethodsDocument,
  useGetSignInMethodsQuery,
  useUpdateConfigMutation,
 } from '@/generated/graphql';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import IconButton from '@/ui/v2/IconButton';
-import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import Input from '@/ui/v2/Input';
 import InputAdornment from '@/ui/v2/InputAdornment';
+import CopyIcon from '@/ui/v2/icons/CopyIcon';
 import generateAppServiceUrl from '@/utils/common/generateAppServiceUrl';
 import { copy } from '@/utils/copy';
 import getServerError from '@/utils/settings/getServerError';
@@ -184,7 +184,7 @@ export default function WorkOsProviderSettings() {
            id="redirectUrl"
            defaultValue={`${generateAppServiceUrl(
              currentProject.subdomain,
-              currentProject.region.awsName,
+              currentProject.region,
              'auth',
            )}/signin/provider/workos/callback`}
            className="col-span-2"
@@ -203,7 +203,7 @@ export default function WorkOsProviderSettings() {
                    copy(
                      `${generateAppServiceUrl(
                        currentProject.subdomain,
-                        currentProject.region.awsName,
+                        currentProject.region,
                        'auth',
                      )}/signin/provider/workos/callback`,
                      'Redirect URL',
--- a/dashboard/src/components/ui/v2/icons/GaugeIcon/GaugeIcon.tsx
+++ b/dashboard/src/components/ui/v2/icons/GaugeIcon/GaugeIcon.tsx
@@ -0,0 +1,26 @@
+import type { IconProps } from '@/ui/v2/icons';
+import SvgIcon from '@/ui/v2/icons/SvgIcon';
+
+function GaugeIcon(props: IconProps) {
+  return (
+    <SvgIcon
+      width="16"
+      height="16"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 16 16"
+      aria-label="A gauge"
+      {...props}
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M10.757 3.295A7.25 7.25 0 0 0 8 2.75h-.026c-3.286.011-6.032 2.231-6.92 5.227a.753.753 0 0 0-.081.293 7.359 7.359 0 0 0-.223 1.8v1.43A1.25 1.25 0 0 0 2 12.75h12a1.25 1.25 0 0 0 1.25-1.25V10a7.25 7.25 0 0 0-.246-1.872l-.001-.004V8.12a7.248 7.248 0 0 0-4.246-4.825Zm-2.77 7.955h5.763V10c0-.252-.017-.503-.05-.751l-1.16.31a.75.75 0 1 1-.387-1.448l1.16-.31-.003-.006a5.751 5.751 0 0 0-4.56-3.496V5.5a.75.75 0 0 1-1.5 0V4.3c-2.053.271-3.764 1.645-4.545 3.505l1.142.306A.75.75 0 1 1 3.46 9.56L2.307 9.25a5.895 5.895 0 0 0-.057.82v1.179h3.845l4.05-5.277a.75.75 0 0 1 1.19.913L7.985 11.25Z"
+        fill="currentColor"
+      />
+    </SvgIcon>
+  );
+}
+
+GaugeIcon.displayName = 'NhostGaugeIcon';
+
+export default GaugeIcon;
--- a/dashboard/src/components/ui/v2/icons/GaugeIcon/index.ts
+++ b/dashboard/src/components/ui/v2/icons/GaugeIcon/index.ts
@@ -0,0 +1 @@
+export { default as GaugeIcon } from './GaugeIcon';
--- a/dashboard/src/components/users/CreateUserForm/CreateUserForm.tsx
+++ b/dashboard/src/components/users/CreateUserForm/CreateUserForm.tsx
@@ -1,6 +1,6 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import type { DialogFormProps } from '@/types/common';
 import { Alert } from '@/ui/Alert';
 import Button from '@/ui/v2/Button';
@@ -68,7 +68,7 @@ export default function CreateUserForm({

  const baseAuthUrl = generateAppServiceUrl(
    currentProject?.subdomain,
-    currentProject?.region?.awsName,
+    currentProject?.region,
    'auth',
  );

--- a/dashboard/src/components/users/EditUserForm/EditUserForm.tsx
+++ b/dashboard/src/components/users/EditUserForm/EditUserForm.tsx
@@ -3,8 +3,8 @@ import ControlledSelect from '@/components/common/ControlledSelect';
 import { useDialog } from '@/components/common/DialogProvider';
 import Form from '@/components/common/Form';
 import EditUserPasswordForm from '@/components/users/EditUserPasswordForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import type { DialogFormProps } from '@/types/common';
 import Avatar from '@/ui/v2/Avatar';
 import Box from '@/ui/v2/Box';
--- a/dashboard/src/components/users/UsersBody/UsersBody.tsx
+++ b/dashboard/src/components/users/UsersBody/UsersBody.tsx
@@ -1,8 +1,8 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import FormActivityIndicator from '@/components/common/FormActivityIndicator';
 import type { EditUserFormValues } from '@/components/users/EditUserForm';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { useRemoteApplicationGQLClient } from '@/hooks/useRemoteApplicationGQLClient';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Avatar from '@/ui/v2/Avatar';
 import Chip from '@/ui/v2/Chip';
--- a/dashboard/src/components/workspace/RemoveWorkspaceMember.tsx
+++ b/dashboard/src/components/workspace/RemoveWorkspaceMember.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
--- a/dashboard/src/components/workspace/RemoveWorkspaceMemberInvite.tsx
+++ b/dashboard/src/components/workspace/RemoveWorkspaceMemberInvite.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
 import Text from '@/ui/v2/Text';
--- a/dashboard/src/components/workspace/RemoveWorkspaceModal.tsx
+++ b/dashboard/src/components/workspace/RemoveWorkspaceModal.tsx
@@ -1,4 +1,4 @@
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import { Alert } from '@/ui/Alert';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
--- a/dashboard/src/components/workspace/WorkspaceApps.tsx
+++ b/dashboard/src/components/workspace/WorkspaceApps.tsx
@@ -1,5 +1,5 @@
 import RetryableErrorBoundary from '@/components/common/RetryableErrorBoundary';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
 import ActivityIndicator from '@/ui/v2/ActivityIndicator';
 import Box from '@/ui/v2/Box';
 import Button from '@/ui/v2/Button';
--- a/dashboard/src/components/workspace/WorkspaceHeader.tsx
+++ b/dashboard/src/components/workspace/WorkspaceHeader.tsx
@@ -1,53 +1,34 @@
 import { useDialog } from '@/components/common/DialogProvider';
 import { EditWorkspaceNameForm } from '@/components/home/EditWorkspaceNameForm';
 import RemoveWorkspaceModal from '@/components/workspace/RemoveWorkspaceModal';
-import { useCurrentWorkspaceAndProject } from '@/hooks/v2/useCurrentWorkspaceAndProject';
-import { Avatar } from '@/ui/Avatar';
+import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
+import { useIsCurrentUserOwner } from '@/features/projects/common/hooks/useIsCurrentUserOwner';
 import Button from '@/ui/v2/Button';
 import Divider from '@/ui/v2/Divider';
 import { Dropdown } from '@/ui/v2/Dropdown';
 import Text from '@/ui/v2/Text';
 import { copy } from '@/utils/copy';
-import { nhost } from '@/utils/nhost';
 import Image from 'next/image';

 export default function WorkspaceHeader() {
  const { currentWorkspace } = useCurrentWorkspaceAndProject();
-
  const { openDialog } = useDialog();
-
-  const user = nhost.auth.getUser();
-
-  const isOwner = currentWorkspace?.workspaceMembers.some(
-    (member) => member.user.id === user?.id && member.type === 'owner',
-  );
+  const isOwner = useIsCurrentUserOwner();

  const noApplications = currentWorkspace?.projects.length === 0;

-  const IS_DEFAULT_WORKSPACE = currentWorkspace?.name === 'Default Workspace';
-
  return (
    <div className="mx-auto flex max-w-3xl flex-col">
      <div className="flex flex-row place-content-between">
        <div className="flex flex-row items-center">
-          {IS_DEFAULT_WORKSPACE &&
-          user.id === currentWorkspace?.creatorUserId ? (
-            <Avatar
-              className="h-14 w-14 self-center rounded-full"
-              name={user?.displayName}
-              avatarUrl={user?.avatarUrl}
+          <div className="inline-block h-14 w-14 overflow-hidden rounded-xl">
+            <Image
+              src="/logos/new.svg"
+              alt="Nhost Logo"
+              width={56}
+              height={56}
            />
-          ) : (
-            <div className="inline-block h-14 w-14 overflow-hidden rounded-xl">
-              <Image
-                src="/logos/new.svg"
-                alt="Nhost Logo"
-                width={56}
-                height={56}
-              />
-            </div>
-          )}
-
+          </div>
          <div className="flex flex-col items-start pl-3">
            <Text variant="h1" className="font-display text-3xl font-medium">
              {currentWorkspace?.name}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Szilárd Dóró	69caa34c43	Merge pull request #1934 from nhost/changeset-release/main chore: update versions	2023-05-16 08:34:38 +02:00
github-actions[bot]	1d898e2893	chore: update versions	2023-05-15 18:43:10 +00:00
Szilárd Dóró	e87621cbde	Merge pull request #1936 from nhost/fix/security-key-url fix(hasura-auth-js): make the call to the correct endpoint	2023-05-15 20:41:59 +02:00
Szilárd Dóró	0d6fc42158	fix: make the call to the correct endpoint	2023-05-15 19:46:26 +02:00
Szilárd Dóró	f6fbee6b13	Merge pull request #1933 from nhost/fix/project-rename-prevent-404 fix(dashboard): don't redirect to 404 on project rename	2023-05-15 16:59:00 +02:00
Szilárd Dóró	1230b72222	fix: don't redirect to 404 on project rename	2023-05-15 16:05:45 +02:00
Szilárd Dóró	6cc7704555	Merge pull request #1931 from nhost/changeset-release/main chore: update versions	2023-05-15 15:47:22 +02:00
github-actions[bot]	c0954dec09	chore: update versions	2023-05-15 13:30:42 +00:00
Szilárd Dóró	6c25480a7a	Merge pull request #1929 from nhost/fix/build-targets chore: change build target to ES2019	2023-05-15 15:29:32 +02:00
Szilárd Dóró	da03bf390c	chore: change build target to ES2019	2023-05-15 11:09:00 +02:00
Szilárd Dóró	3b513be9f2	Merge pull request #1926 from nhost/changeset-release/main chore: update versions	2023-05-12 16:55:46 +02:00
github-actions[bot]	e450e9d636	chore: update versions	2023-05-12 14:27:16 +00:00
Szilárd Dóró	ed1ee10879	Merge pull request #1925 from nhost/fix/postgres-connection-string fix(dashboard): show correct postgres connection string	2023-05-12 16:25:51 +02:00
Szilárd Dóró	349aac369e	chore: add changeset	2023-05-12 14:23:54 +02:00
Szilárd Dóró	5a84362c80	fix: construct postgres connection string	2023-05-12 14:23:05 +02:00
Szilárd Dóró	f59a77b1c8	Merge pull request #1923 from nhost/changeset-release/main chore: update versions	2023-05-12 10:25:12 +02:00
github-actions[bot]	30686bc4ce	chore: update versions	2023-05-12 08:03:41 +00:00
Szilárd Dóró	0c4ac8d368	Merge pull request #1919 from nhost/chore/update-staging-urls chore(dashboard): change URL construction	2023-05-12 10:02:32 +02:00
Szilárd Dóró	7da0e5e256	Merge pull request #1918 from nhost/changeset-release/main chore: update versions	2023-05-11 15:30:16 +02:00
github-actions[bot]	8229101efe	chore: update versions	2023-05-11 13:07:57 +00:00
Szilárd Dóró	afad1778f8	Merge pull request #1895 from nhost/renovate/react-monorepo chore(deps): update react monorepo	2023-05-11 15:06:23 +02:00
Szilárd Dóró	28fc7b84c7	chore: update changeset	2023-05-11 13:38:39 +02:00
Szilárd Dóró	3f478a4e3c	chore: include `vitest` in the bump, add changeset	2023-05-11 13:37:34 +02:00
Szilárd Dóró	aa54666941	fix: don't break builds	2023-05-11 12:53:45 +02:00
Szilárd Dóró	20fb69faba	chore: change URL construction	2023-05-11 12:46:49 +02:00
renovate[bot]	1caeb2a548	chore(deps): update react monorepo	2023-05-11 10:12:59 +00:00
Szilárd Dóró	6356c5a2c8	Merge pull request #1906 from nhost/chore/bump-pnpm chore: bump `pnpm` and `turbo` version	2023-05-11 12:10:10 +02:00
Szilárd Dóró	6ec1dd3248	chore: bump lock file again	2023-05-11 11:07:27 +02:00
Szilárd Dóró	8a4b5031dc	Merge branch 'main' into chore/bump-pnpm	2023-05-11 11:06:57 +02:00
Szilárd Dóró	4790fee41f	Merge pull request #1916 from nhost/changeset-release/main chore: update versions	2023-05-11 09:26:44 +02:00
github-actions[bot]	0a8033812d	chore: update versions	2023-05-11 06:56:16 +00:00
Szilárd Dóró	2b56ffc29e	Merge pull request #1915 from nhost/fix/project-redirects fix(dashboard): redirect an invalid project to the 404 page	2023-05-11 08:54:58 +02:00
Szilárd Dóró	aa9b926cd7	Merge branch 'main' into fix/project-redirects	2023-05-10 17:21:18 +02:00
Szilárd Dóró	575404ad62	Merge pull request #1917 from nhost/fix/imports fix(dashboard): don't break builds	2023-05-10 17:20:37 +02:00
Szilárd Dóró	3f6dfc7bcd	fix: don't break builds	2023-05-10 17:19:32 +02:00
Szilárd Dóró	682e64d7a3	fix: don't break build	2023-05-10 16:51:59 +02:00
Szilárd Dóró	30cee4f86c	Merge branch 'main' into fix/project-redirects	2023-05-10 16:51:06 +02:00
Szilárd Dóró	29dcc8c63e	Merge pull request #1911 from nhost/fix/non-owner-functionality fix(dashboard): restrict non-owner functionality	2023-05-10 16:47:06 +02:00
Szilárd Dóró	d926f15676	fix: redirect an invalid project to the 404 page	2023-05-10 16:46:16 +02:00
Szilárd Dóró	d4a0aad2dd	Merge pull request #1913 from nhost/changeset-release/main chore: update versions	2023-05-10 14:24:09 +02:00
github-actions[bot]	1030813279	chore: update versions	2023-05-10 11:50:46 +00:00
Nuno Pato	917a14aa40	Merge pull request #1912 from nhost/docs/add-metrics Add section on Metrics to the documentation	2023-05-10 11:49:27 +00:00
Szilárd Dóró	6381d1b095	Merge pull request #1893 from nhost/feat/metrics-page	2023-05-10 13:43:34 +02:00
Nuno Pato	8dbdc0bf50	asd	2023-05-10 11:32:34 +00:00
Nuno Pato	8c072a4c6e	asd	2023-05-10 10:10:38 +00:00
Nuno Pato	fe341519f7	Add section on Metrics to the documentation	2023-05-10 10:09:12 +00:00
Szilárd Dóró	ea09384064	fix: update import paths	2023-05-10 10:45:20 +02:00
Szilárd Dóró	49b9972885	chore: add changeset	2023-05-10 10:42:35 +02:00
Szilárd Dóró	98c541ee52	feat: introduce useIsCurrentUserOwner hook - chore: improve file structure	2023-05-10 10:41:35 +02:00
Szilárd Dóró	757c888656	Merge pull request #1910 from nhost/changeset-release/main chore: update versions	2023-05-09 11:40:16 +02:00
github-actions[bot]	7c13eb5f9b	chore: update versions	2023-05-09 09:17:43 +00:00
Szilárd Dóró	a84608e086	Merge pull request #1907 from nhost/fix/upgrade fix(dashboard): unpause after upgrading a paused project to pro	2023-05-09 11:13:44 +02:00
Szilárd Dóró	e43c079b9c	feat: poll project state after unpausing with upgrade	2023-05-09 10:50:34 +02:00
Szilárd Dóró	3f396a9ebb	chore: add changesets	2023-05-08 19:28:42 +02:00
Szilárd Dóró	6ed605beb8	fix: update `desiredState` on plan change	2023-05-08 17:58:06 +02:00
Szilárd Dóró	edd223d29c	fix: don't go to 404 page unnecessarily	2023-05-08 17:47:04 +02:00
Szilárd Dóró	15a985e079	fix: don't break dashboard build	2023-05-08 15:29:29 +02:00
Szilárd Dóró	8ff00a4258	chore(ci): bump pnpm version to v8.4.0	2023-05-08 15:19:53 +02:00
Szilárd Dóró	7e27d7c0a1	chore: update changeset, bump turbo version	2023-05-08 15:17:42 +02:00
Szilárd Dóró	49f9b8372a	chore: bump pnpm version to v8.4.0	2023-05-08 15:09:29 +02:00
Szilárd Dóró	b17e8d6f3c	fix: don't break e2e tests	2023-05-03 10:00:29 +02:00
Szilárd Dóró	12e2855f01	chore: update description and prevent free access - bump `jsdom` to v22 - increase test timeout	2023-05-03 09:57:11 +02:00
Szilárd Dóró	c1080d9e63	fix: don't break the UI	2023-05-03 09:38:48 +02:00
Szilárd Dóró	e4972b8307	feat: add Grafana page	2023-05-03 09:35:06 +02:00
				`@@ -0,0 +1 @@`
				`export { default as GaugeIcon } from './GaugeIcon';`