Remove warehouse settings from settings menu (#31038)

apps/studio/components/layouts/ProjectSettingsLayout/SettingsLayout.tsx

@@ -46,7 +46,6 @@ const SettingsLayout = ({ title, children }: PropsWithChildren<SettingsLayoutPro
     'billing:invoices',
   ])
 
-  const warehouseEnabled = useFlag('warehouse')
   const diskAndComputeEnabled = useFlag('diskAndComputeForm')
 
   const menuRoutes = generateSettingsMenu(ref, project, organization, {
@@ -54,7 +53,6 @@ const SettingsLayout = ({ title, children }: PropsWithChildren<SettingsLayoutPro
     edgeFunctions: edgeFunctionsEnabled,
     storage: storageEnabled,
     invoices: invoicesEnabled,
-    warehouse: warehouseEnabled,
     diskAndCompute: diskAndComputeEnabled,
   })
 

apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx

@@ -14,7 +14,6 @@ export const generateSettingsMenu = (
     edgeFunctions?: boolean
     storage?: boolean
     invoices?: boolean
-    warehouse?: boolean
     diskAndCompute?: boolean
   }
 ): ProductMenuGroup[] => {
@@ -24,7 +23,6 @@ export const generateSettingsMenu = (
   const authEnabled = features?.auth ?? true
   const edgeFunctionsEnabled = features?.edgeFunctions ?? true
   const storageEnabled = features?.storage ?? true
-  const warehouseEnabled = features?.warehouse ?? false
   const newDiskComputeEnabled = features?.diskAndCompute ?? false
 
   return [
@@ -124,16 +122,6 @@ export const generateSettingsMenu = (
               },
             ]
           : []),
-        ...(IS_PLATFORM && warehouseEnabled
-          ? [
-              {
-                name: 'Warehouse',
-                key: 'warehouse',
-                url: `/project/${ref}/settings/warehouse`,
-                items: [],
-              },
-            ]
-          : []),
         ...(IS_PLATFORM
           ? [
               {

apps/studio/next.config.js

@@ -434,6 +434,11 @@ const nextConfig = {
         source: '/project/:ref/integrations/cron-jobs',
         destination: '/project/:ref/integrations/cron',
       },
+      {
+        permanent: true,
+        source: '/project/:ref/settings/warehouse',
+        destination: '/project/:ref/settings/general',
+      },
       ...(process.env.NEXT_PUBLIC_BASE_PATH?.length
         ? [
             {