diff --git a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsLayout.tsx b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsLayout.tsx index 2c9787db4e6..422b1d34784 100644 --- a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsLayout.tsx +++ b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsLayout.tsx @@ -1,5 +1,4 @@ import { useIsFeatureEnabled, useSelectedOrganization, useSelectedProject, withAuth } from 'hooks' -import { observer } from 'mobx-react-lite' import { useRouter } from 'next/router' import { PropsWithChildren } from 'react' import { generateSettingsMenu } from './SettingsMenu.utils' @@ -57,4 +56,4 @@ const SettingsLayout = ({ title, children }: PropsWithChildren { +const SideBarContent = () => { const { ref, id: activeId } = useParams() const router = useRouter() const { profile } = useProfile() @@ -381,6 +380,6 @@ const SideBarContent = observer(() => { ) -}) +} export default SideBarContent diff --git a/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx b/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx index e16d6be6636..259c9b5f380 100644 --- a/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx +++ b/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx @@ -1,6 +1,5 @@ -import { useTheme } from 'next-themes' import { BASE_PATH } from 'lib/constants' -import { observer } from 'mobx-react-lite' +import { useTheme } from 'next-themes' import Image from 'next/legacy/image' import Link from 'next/link' import { PropsWithChildren } from 'react' @@ -60,4 +59,4 @@ const ForgotPasswordLayout = ({ ) } -export default observer(ForgotPasswordLayout) +export default ForgotPasswordLayout diff --git a/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx b/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx index 594e943b816..ed15ec96fa5 100644 --- a/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx +++ b/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx @@ -1,19 +1,10 @@ import * as Tooltip from '@radix-ui/react-tooltip' import { PermissionAction } from '@supabase/shared-types/out/constants' -import { useParams } from 'common' -import { observer } from 'mobx-react-lite' import Link from 'next/link' import { useRouter } from 'next/router' import { useState } from 'react' -import { - AlertDescription_Shadcn_, - AlertTitle_Shadcn_, - Alert_Shadcn_, - Button, - IconEdit, - Menu, -} from 'ui' +import { useParams } from 'common' import CreateBucketModal from 'components/interfaces/Storage/CreateBucketModal' import EditBucketModal from 'components/interfaces/Storage/EditBucketModal' import type { StorageBucket } from 'components/interfaces/Storage/Storage.types' @@ -22,6 +13,14 @@ import { EmptyBucketModal } from 'components/to-be-cleaned/Storage/EmptyBucketMo import ShimmeringLoader from 'components/ui/ShimmeringLoader' import { useBucketsQuery } from 'data/storage/buckets-query' import { useCheckPermissions, useSelectedProject } from 'hooks' +import { + AlertDescription_Shadcn_, + AlertTitle_Shadcn_, + Alert_Shadcn_, + Button, + IconEdit, + Menu, +} from 'ui' import BucketRow from './BucketRow' const StorageMenu = () => { @@ -183,4 +182,4 @@ const StorageMenu = () => { ) } -export default observer(StorageMenu) +export default StorageMenu diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx index f4a4c585965..622bebd8df9 100644 --- a/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx +++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx @@ -1,5 +1,4 @@ import { PermissionAction } from '@supabase/shared-types/out/constants' -import { observer } from 'mobx-react-lite' import { PropsWithChildren, useMemo } from 'react' import NoPermission from 'components/ui/NoPermission' @@ -34,4 +33,4 @@ const TableEditorLayout = ({ children }: PropsWithChildren<{}>) => { ) } -export default observer(TableEditorLayout) +export default TableEditorLayout diff --git a/apps/studio/components/to-be-cleaned/Reports/EditReportModal.tsx b/apps/studio/components/to-be-cleaned/Reports/EditReportModal.tsx index 8119942098f..f94eb710f4c 100644 --- a/apps/studio/components/to-be-cleaned/Reports/EditReportModal.tsx +++ b/apps/studio/components/to-be-cleaned/Reports/EditReportModal.tsx @@ -3,9 +3,9 @@ import { observer } from 'mobx-react-lite' import { useRouter } from 'next/router' import { useEffect, useState } from 'react' import toast from 'react-hot-toast' -import { Input, Modal } from 'ui' import { useProjectContentStore } from 'stores/projectContentStore' +import { Input, Modal } from 'ui' const EditModal = () => { const router = useRouter() diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx b/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx index beede269ab7..07971cd72e4 100644 --- a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx +++ b/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx @@ -1,13 +1,13 @@ -import { observer } from 'mobx-react-lite' -import { Menu, Item, Separator, Submenu } from 'react-contexify' -import 'react-contexify/dist/ReactContexify.css' import { PermissionAction } from '@supabase/shared-types/out/constants' -import { IconClipboard, IconEdit, IconMove, IconDownload, IconTrash2, IconChevronRight } from 'ui' +import { noop } from 'lodash' +import { observer } from 'mobx-react-lite' +import { Item, Menu, Separator, Submenu } from 'react-contexify' +import 'react-contexify/dist/ReactContexify.css' import { useCheckPermissions } from 'hooks' -import { URL_EXPIRY_DURATION } from '../Storage.constants' import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore' -import { noop } from 'lodash' +import { IconChevronRight, IconClipboard, IconDownload, IconEdit, IconMove, IconTrash2 } from 'ui' +import { URL_EXPIRY_DURATION } from '../Storage.constants' interface ItemContextMenuProps { id: string diff --git a/apps/studio/components/ui/PageTelemetry.tsx b/apps/studio/components/ui/PageTelemetry.tsx index 6b5b011ff45..ccfdeafea15 100644 --- a/apps/studio/components/ui/PageTelemetry.tsx +++ b/apps/studio/components/ui/PageTelemetry.tsx @@ -1,5 +1,4 @@ import { useIsLoggedIn, useParams, useTelemetryProps } from 'common' -import { observer } from 'mobx-react-lite' import { useRouter } from 'next/router' import { PropsWithChildren, useEffect } from 'react' @@ -87,4 +86,4 @@ const PageTelemetry = ({ children }: PropsWithChildren<{}>) => { return <>{children} } -export default observer(PageTelemetry) +export default PageTelemetry diff --git a/apps/studio/pages/500.tsx b/apps/studio/pages/500.tsx index 7c4c5b8310f..d7e53a7aca5 100644 --- a/apps/studio/pages/500.tsx +++ b/apps/studio/pages/500.tsx @@ -1,12 +1,11 @@ import { NextPage } from 'next' -import { useRouter } from 'next/router' -import Link from 'next/link' +import { useTheme } from 'next-themes' import Image from 'next/legacy/image' -import { Button } from 'ui' -import { observer } from 'mobx-react-lite' +import Link from 'next/link' +import { useRouter } from 'next/router' import { useSignOut } from 'lib/auth' -import { useTheme } from 'next-themes' +import { Button } from 'ui' const Error500: NextPage = () => { const router = useRouter() @@ -64,4 +63,4 @@ const Error500: NextPage = () => { ) } -export default observer(Error500) +export default Error500 diff --git a/apps/studio/pages/account/me.tsx b/apps/studio/pages/account/me.tsx index e109f0b743f..d301d240215 100644 --- a/apps/studio/pages/account/me.tsx +++ b/apps/studio/pages/account/me.tsx @@ -1,10 +1,8 @@ -import { observer } from 'mobx-react-lite' - import { AccountInformation, AnalyticsSettings, - ThemeSettingsOld, ThemeSettings, + ThemeSettingsOld, } from 'components/interfaces/Account/Preferences' import { ProfileInformation } from 'components/interfaces/Account/Preferences/ProfileInformation' import { AccountLayout } from 'components/layouts' @@ -39,7 +37,7 @@ User.getLayout = (page) => ( export default User -const ProfileCard = observer(() => { +const ProfileCard = () => { const profileUpdateEnabled = useIsFeatureEnabled('profile:update') const { profile, error, isLoading, isError, isSuccess } = useProfile() @@ -78,4 +76,4 @@ const ProfileCard = observer(() => { ) -}) +} diff --git a/apps/studio/pages/new/index.tsx b/apps/studio/pages/new/index.tsx index 95fbc992686..821314e6837 100644 --- a/apps/studio/pages/new/index.tsx +++ b/apps/studio/pages/new/index.tsx @@ -2,7 +2,6 @@ import HCaptcha from '@hcaptcha/react-hcaptcha' import { Elements } from '@stripe/react-stripe-js' import { loadStripe } from '@stripe/stripe-js' import { useTheme } from 'next-themes' -import { observer } from 'mobx-react-lite' import { useCallback, useEffect, useState } from 'react' import { NewOrgForm } from 'components/interfaces/Organization' @@ -110,4 +109,4 @@ Wizard.getLayout = (page) => ( ) -export default observer(Wizard) +export default Wizard diff --git a/apps/studio/pages/project/[ref]/api/graphiql.tsx b/apps/studio/pages/project/[ref]/api/graphiql.tsx index e8e8598cd2b..a39f8ae5781 100644 --- a/apps/studio/pages/project/[ref]/api/graphiql.tsx +++ b/apps/studio/pages/project/[ref]/api/graphiql.tsx @@ -1,11 +1,10 @@ import '@graphiql/react/dist/style.css' import { createGraphiQLFetcher, Fetcher } from '@graphiql/toolkit' -import { useParams } from 'common' -import { observer } from 'mobx-react-lite' import { useTheme } from 'next-themes' import { useMemo } from 'react' import toast from 'react-hot-toast' +import { useParams } from 'common' import ExtensionCard from 'components/interfaces/Database/Extensions/ExtensionCard' import GraphiQL from 'components/interfaces/GraphQL/GraphiQL' import { DocsLayout } from 'components/layouts' @@ -111,4 +110,5 @@ const GraphiQLPage: NextPageWithLayout = () => { } GraphiQLPage.getLayout = (page) => {page} -export default observer(GraphiQLPage) + +export default GraphiQLPage diff --git a/apps/studio/pages/project/[ref]/auth/index.tsx b/apps/studio/pages/project/[ref]/auth/index.tsx index b6252441731..280af12948f 100644 --- a/apps/studio/pages/project/[ref]/auth/index.tsx +++ b/apps/studio/pages/project/[ref]/auth/index.tsx @@ -1,5 +1,3 @@ -import { observer } from 'mobx-react-lite' - import { AuthLayout } from 'components/layouts' import type { NextPageWithLayout } from 'types' @@ -9,4 +7,4 @@ const Authentication: NextPageWithLayout = () => { Authentication.getLayout = (page) => {page} -export default observer(Authentication) +export default Authentication diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/logs.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/logs.tsx index 429241aeda1..cb20fc4d122 100644 --- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/logs.tsx +++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/logs.tsx @@ -1,9 +1,8 @@ -import { observer } from 'mobx-react-lite' -import type { NextPageWithLayout } from 'types' import { useParams } from 'common/hooks' import LogsPreviewer from 'components/interfaces/Settings/Logs/LogsPreviewer' import FunctionsLayout from 'components/layouts/FunctionsLayout' import { useEdgeFunctionQuery } from 'data/edge-functions/edge-function-query' +import type { NextPageWithLayout } from 'types' export const LogPage: NextPageWithLayout = () => { const { ref, functionSlug } = useParams() @@ -26,4 +25,4 @@ export const LogPage: NextPageWithLayout = () => { LogPage.getLayout = (page) => {page} -export default observer(LogPage) +export default LogPage diff --git a/apps/studio/pages/project/[ref]/reports/storage.tsx b/apps/studio/pages/project/[ref]/reports/storage.tsx index 80a147f492e..330f41e045f 100644 --- a/apps/studio/pages/project/[ref]/reports/storage.tsx +++ b/apps/studio/pages/project/[ref]/reports/storage.tsx @@ -1,30 +1,28 @@ -import { observer } from 'mobx-react-lite' -import type { NextPageWithLayout } from 'types' -import { ReportsLayout } from 'components/layouts' +import { useParams } from 'common' +import ReportHeader from 'components/interfaces/Reports/ReportHeader' +import ReportPadding from 'components/interfaces/Reports/ReportPadding' +import ReportWidget from 'components/interfaces/Reports/ReportWidget' import { PRESET_CONFIG, REPORTS_DATEPICKER_HELPERS, } from 'components/interfaces/Reports/Reports.constants' -import ReportWidget from 'components/interfaces/Reports/ReportWidget' import { queriesFactory } from 'components/interfaces/Reports/Reports.utils' import { CacheHitRateChartRenderer, TopCacheMissesRenderer, } from 'components/interfaces/Reports/renderers/StorageRenderers' -import { useEffect, useMemo } from 'react' -import ReportHeader from 'components/interfaces/Reports/ReportHeader' import { DatePickerToFrom, LogsEndpointParams } from 'components/interfaces/Settings/Logs' -import { useParams } from 'common' -import ShimmerLine from 'components/ui/ShimmerLine' -import ReportPadding from 'components/interfaces/Reports/ReportPadding' import DatePickers from 'components/interfaces/Settings/Logs/Logs.DatePickers' +import { ReportsLayout } from 'components/layouts' +import ShimmerLine from 'components/ui/ShimmerLine' import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query' import { useSelectedOrganization } from 'hooks' +import { useEffect, useMemo } from 'react' +import type { NextPageWithLayout } from 'types' export const StorageReport: NextPageWithLayout = () => { - const { ref: projectRef } = useParams() - const organization = useSelectedOrganization() const report = useStorageReport() + const organization = useSelectedOrganization() const { data: subscription } = useOrgSubscriptionQuery({ orgSlug: organization?.slug }) const plan = subscription?.plan @@ -123,4 +121,4 @@ const useStorageReport = () => { StorageReport.getLayout = (page) => {page} -export default observer(StorageReport) +export default StorageReport diff --git a/apps/studio/pages/project/[ref]/settings/database.tsx b/apps/studio/pages/project/[ref]/settings/database.tsx index f4ceecc5eea..16f184b2033 100644 --- a/apps/studio/pages/project/[ref]/settings/database.tsx +++ b/apps/studio/pages/project/[ref]/settings/database.tsx @@ -4,7 +4,6 @@ import { NetworkRestrictions, } from 'components/interfaces/Settings/Database' import { SettingsLayout } from 'components/layouts' -import { observer } from 'mobx-react-lite' import type { NextPageWithLayout } from 'types' import BannedIPs from 'components/interfaces/Settings/Database/BannedIPs' @@ -40,4 +39,4 @@ const ProjectSettings: NextPageWithLayout = () => { ProjectSettings.getLayout = (page) => {page} -export default observer(ProjectSettings) +export default ProjectSettings diff --git a/apps/studio/pages/project/[ref]/settings/index.tsx b/apps/studio/pages/project/[ref]/settings/index.tsx index 80acf1c70ca..3d28e36ac1d 100644 --- a/apps/studio/pages/project/[ref]/settings/index.tsx +++ b/apps/studio/pages/project/[ref]/settings/index.tsx @@ -1,5 +1,3 @@ -import { observer } from 'mobx-react-lite' - import { SettingsLayout } from 'components/layouts' import type { NextPageWithLayout } from 'types' @@ -9,4 +7,4 @@ const Settings: NextPageWithLayout = () => { Settings.getLayout = (page) => {page} -export default observer(Settings) +export default Settings diff --git a/apps/studio/pages/project/[ref]/sql/quickstarts.tsx b/apps/studio/pages/project/[ref]/sql/quickstarts.tsx index fe8ae458afe..6093c3ea117 100644 --- a/apps/studio/pages/project/[ref]/sql/quickstarts.tsx +++ b/apps/studio/pages/project/[ref]/sql/quickstarts.tsx @@ -1,7 +1,6 @@ -import { observer } from 'mobx-react-lite' -import type { NextPageWithLayout } from 'types' -import { SQLEditorLayout } from 'components/layouts' import SQLQuickstarts from 'components/interfaces/SQLEditor/SQLTemplates/SQLQuickstarts' +import { SQLEditorLayout } from 'components/layouts' +import type { NextPageWithLayout } from 'types' const SqlEditorWelcome: NextPageWithLayout = () => { return @@ -9,4 +8,4 @@ const SqlEditorWelcome: NextPageWithLayout = () => { SqlEditorWelcome.getLayout = (page) => {page} -export default observer(SqlEditorWelcome) +export default SqlEditorWelcome diff --git a/apps/studio/pages/project/[ref]/sql/templates.tsx b/apps/studio/pages/project/[ref]/sql/templates.tsx index 9a12c0a78bf..6e47c021f97 100644 --- a/apps/studio/pages/project/[ref]/sql/templates.tsx +++ b/apps/studio/pages/project/[ref]/sql/templates.tsx @@ -1,7 +1,6 @@ -import { observer } from 'mobx-react-lite' -import type { NextPageWithLayout } from 'types' -import { SQLEditorLayout } from 'components/layouts' import SQLTemplates from 'components/interfaces/SQLEditor/SQLTemplates/SQLTemplates' +import { SQLEditorLayout } from 'components/layouts' +import type { NextPageWithLayout } from 'types' const SqlEditorWelcome: NextPageWithLayout = () => { return @@ -9,4 +8,4 @@ const SqlEditorWelcome: NextPageWithLayout = () => { SqlEditorWelcome.getLayout = (page) => {page} -export default observer(SqlEditorWelcome) +export default SqlEditorWelcome diff --git a/apps/studio/pages/project/_/[[...routeSlug]].tsx b/apps/studio/pages/project/_/[[...routeSlug]].tsx index a7f6164d91a..1358ed8faaa 100644 --- a/apps/studio/pages/project/_/[[...routeSlug]].tsx +++ b/apps/studio/pages/project/_/[[...routeSlug]].tsx @@ -1,4 +1,3 @@ -import { observer } from 'mobx-react-lite' import { NextPage } from 'next' import Link from 'next/link' import { useRouter } from 'next/router' @@ -65,4 +64,4 @@ const GenericProjectPage: NextPage = () => { ) } -export default withAuth(observer(GenericProjectPage)) +export default withAuth(GenericProjectPage) diff --git a/apps/studio/pages/support/new.tsx b/apps/studio/pages/support/new.tsx index 90ef4691592..6d512b0099f 100644 --- a/apps/studio/pages/support/new.tsx +++ b/apps/studio/pages/support/new.tsx @@ -1,15 +1,14 @@ import * as Tooltip from '@radix-ui/react-tooltip' -import { observer } from 'mobx-react-lite' import Link from 'next/link' import { useState } from 'react' import SVG from 'react-inlinesvg' -import { Button, IconLoader, IconTool } from 'ui' import Success from 'components/interfaces/Support/Success' import SupportForm from 'components/interfaces/Support/SupportForm' import { usePlatformStatusQuery } from 'data/platform/platform-status-query' import { withAuth } from 'hooks' import { BASE_PATH } from 'lib/constants' +import { Button, IconLoader, IconTool } from 'ui' const SupportPage = () => { const [sentCategory, setSentCategory] = useState() @@ -94,4 +93,4 @@ const SupportPage = () => { ) } -export default withAuth(observer(SupportPage), { useHighestAAL: false }) +export default withAuth(SupportPage, { useHighestAAL: false })