diff --git a/packages/ui/src/components/Tabs/Tabs.tsx b/packages/ui/src/components/Tabs/Tabs.tsx index f78842e9551..4296259fa94 100644 --- a/packages/ui/src/components/Tabs/Tabs.tsx +++ b/packages/ui/src/components/Tabs/Tabs.tsx @@ -19,7 +19,6 @@ interface TabsProps { addOnBefore?: React.ReactNode addOnAfter?: React.ReactNode listClassNames?: string - children: PanelPropsProps[] } interface TabsSubComponents { diff --git a/studio/components/interfaces/Home/ProjectList/ProjectCardStatus.tsx b/studio/components/interfaces/Home/ProjectList/ProjectCardStatus.tsx index 7da095e0693..0786f4a6163 100644 --- a/studio/components/interfaces/Home/ProjectList/ProjectCardStatus.tsx +++ b/studio/components/interfaces/Home/ProjectList/ProjectCardStatus.tsx @@ -15,7 +15,6 @@ export const ProjectCardStatus = ({ resourceWarnings, projectStatus, }: ProjectCardWarningsProps) => { - //const showResourceExhaustionWarnings = useFlag('resourceExhaustionWarnings') const showResourceExhaustionWarnings = false // [Joshen] Read only takes higher precedence over multiple resource warnings diff --git a/studio/components/layouts/AccountLayout/AccountLayout.tsx b/studio/components/layouts/AccountLayout/AccountLayout.tsx index e0905387544..8cd7f21487e 100644 --- a/studio/components/layouts/AccountLayout/AccountLayout.tsx +++ b/studio/components/layouts/AccountLayout/AccountLayout.tsx @@ -3,7 +3,6 @@ import { useRouter } from 'next/router' import { PropsWithChildren } from 'react' import { useOrganizationsQuery } from 'data/organizations/organizations-query' -import { useMfaListFactorsQuery } from 'data/profile/mfa-list-factors-query' import { useFlag, useSelectedOrganization, withAuth } from 'hooks' import { useSignOut } from 'lib/auth' import { IS_PLATFORM } from 'lib/constants' @@ -23,12 +22,9 @@ const AccountLayout = ({ children, title, breadcrumbs }: PropsWithChildren 0 - ? [ - { - isActive: router.pathname === `/account/security`, - icon: `${router.basePath}/img/user.svg`, - label: 'Security', - href: `/account/security`, - key: `/account/security`, - }, - ] - : []), - ...(showAuditLogs - ? [ - { - isActive: router.pathname === `/account/audit`, - icon: `${router.basePath}/img/user.svg`, - label: 'Audit Logs', - href: `/account/audit`, - key: `/account/audit`, - }, - ] - : []), + + { + isActive: router.pathname === `/account/security`, + icon: `${router.basePath}/img/user.svg`, + label: 'Security', + href: `/account/security`, + key: `/account/security`, + }, + { + isActive: router.pathname === `/account/audit`, + icon: `${router.basePath}/img/user.svg`, + label: 'Audit Logs', + href: `/account/audit`, + key: `/account/audit`, + }, ], }, ] diff --git a/studio/components/layouts/AppLayout/UserSettingsDropdown.tsx b/studio/components/layouts/AppLayout/UserSettingsDropdown.tsx index 6e24085177f..276f7b1fe57 100644 --- a/studio/components/layouts/AppLayout/UserSettingsDropdown.tsx +++ b/studio/components/layouts/AppLayout/UserSettingsDropdown.tsx @@ -2,7 +2,6 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { useState } from 'react' -import { useFlag } from 'hooks' import { useSignOut } from 'lib/auth' import { useProfile } from 'lib/profile' import { useTheme } from 'next-themes' @@ -26,7 +25,6 @@ const UserSettingsDropdown = () => { const router = useRouter() const [open, setOpen] = useState(false) const { profile } = useProfile() - const showAuditLogs = useFlag('auditLogs') const { setIsOpen: setCommandMenuOpen } = useCommandMenu() const { theme, setTheme } = useTheme() @@ -61,11 +59,11 @@ const UserSettingsDropdown = () => { setOpen(false)} asChild> Access tokens - {showAuditLogs ? ( - setOpen(false)} asChild> - Audit logs - - ) : null} + + setOpen(false)} asChild> + Audit logs + + ) => { const invoicesEnabled = useIsFeatureEnabled('billing:invoices') const navLayoutV2 = useFlag('navigationLayoutV2') - const showOAuthApps = useFlag('oauthApps') - const showAuditLogs = useFlag('auditLogs') - const showIntegrationsV2 = useFlag('integrationsV2') if (navLayoutV2) { return {children} @@ -47,14 +44,14 @@ const OrganizationLayout = ({ children }: PropsWithChildren<{}>) => { > - {showIntegrationsV2 && ( - - )} + + + {invoicesEnabled && } - {showOAuthApps && } - {showAuditLogs && } + + diff --git a/studio/components/layouts/ProjectLayout/ProjectLayout.tsx b/studio/components/layouts/ProjectLayout/ProjectLayout.tsx index 83a17a081de..5fbb858ae10 100644 --- a/studio/components/layouts/ProjectLayout/ProjectLayout.tsx +++ b/studio/components/layouts/ProjectLayout/ProjectLayout.tsx @@ -67,7 +67,6 @@ const ProjectLayout = ({ const organizationName = selectedOrganization?.name const navLayoutV2 = useFlag('navigationLayoutV2') - const showResourceExhaustionWarnings = useFlag('resourceExhaustionWarnings') const isPaused = selectedProject?.status === PROJECT_STATUS.INACTIVE const ignorePausedState = @@ -110,7 +109,7 @@ const ProjectLayout = ({ ) : ( - {showResourceExhaustionWarnings && } + {children} )} @@ -230,7 +229,6 @@ export const ProjectLayoutNonBlocking = ({ const showPausedState = isPaused && !ignorePausedState const navLayoutV2 = useFlag('navigationLayoutV2') - const showResourceExhaustionWarnings = useFlag('resourceExhaustionWarnings') return ( @@ -259,7 +257,7 @@ export const ProjectLayoutNonBlocking = ({ ) : ( <> - {showResourceExhaustionWarnings && } + {children} )} diff --git a/studio/components/layouts/ReportsLayout/ReportsLayout.tsx b/studio/components/layouts/ReportsLayout/ReportsLayout.tsx index aa510fe462e..1616d182812 100644 --- a/studio/components/layouts/ReportsLayout/ReportsLayout.tsx +++ b/studio/components/layouts/ReportsLayout/ReportsLayout.tsx @@ -4,7 +4,6 @@ import { PropsWithChildren } from 'react' import ProductMenu from 'components/ui/ProductMenu' import { useIsFeatureEnabled, useSelectedProject, withAuth } from 'hooks' import ProjectLayout from '../' -import { useFlag } from 'hooks' interface ReportsLayoutProps { title?: string @@ -17,8 +16,6 @@ const ReportsLayout = ({ title, children }: PropsWithChildren('sharedSnippets') const { mutate: deleteContent, isLoading: isDeleting } = useContentDeleteMutation({ onSuccess(data) { @@ -220,13 +219,13 @@ const QueryItemActions = observer(({ tabInfo, activeId }: QueryItemActionsProps)

Rename query

- {sharedSnippetsFeature && visibility === 'user' && canCreateSQLSnippet && ( + {visibility === 'user' && canCreateSQLSnippet && (

Share query

)} - {sharedSnippetsFeature && visibility === 'project' && canCreateSQLSnippet && ( + {visibility === 'project' && canCreateSQLSnippet && (

Duplicate personal copy

@@ -266,7 +265,7 @@ const QueryItemActions = observer(({ tabInfo, activeId }: QueryItemActionsProps)
- {sharedSnippetsFeature && visibility === 'project' && ( + {visibility === 'project' && ( This SQL snippet will be lost forever diff --git a/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx b/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx index faeebf99541..18ce87eecfa 100644 --- a/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx +++ b/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx @@ -10,7 +10,7 @@ import { createSqlSnippetSkeleton } from 'components/interfaces/SQLEditor/SQLEdi import ProductMenuItem from 'components/ui/ProductMenu/ProductMenuItem' import ShimmeringLoader from 'components/ui/ShimmeringLoader' import { SqlSnippet, useSqlSnippetsQuery } from 'data/content/sql-snippets-query' -import { useCheckPermissions, useFlag, useSelectedProject, useStore } from 'hooks' +import { useCheckPermissions, useSelectedProject, useStore } from 'hooks' import { uuidv4 } from 'lib/helpers' import { useProfile } from 'lib/profile' import { useSnippets, useSqlEditorStateSnapshot } from 'state/sql-editor' @@ -22,7 +22,6 @@ const SideBarContent = observer(() => { const router = useRouter() const { profile } = useProfile() const project = useSelectedProject() - const sharedSnippetsFeature = useFlag('sharedSnippets') const [personalSnippetsFilterString, setPersonalSnippetsFilterString] = useState('') const [projectSnippetsFilterString, setProjectSnippetsFilterString] = useState('') @@ -225,7 +224,7 @@ const SideBarContent = observer(() => {
)} - {sharedSnippetsFeature && projectSnippets.length >= 1 && ( + {projectSnippets.length >= 1 && (
diff --git a/studio/components/layouts/SettingsLayout/AccountSettingsMenu.tsx b/studio/components/layouts/SettingsLayout/AccountSettingsMenu.tsx index 148ae102bda..7cdccd89f38 100644 --- a/studio/components/layouts/SettingsLayout/AccountSettingsMenu.tsx +++ b/studio/components/layouts/SettingsLayout/AccountSettingsMenu.tsx @@ -1,17 +1,14 @@ -import { useFlag } from 'hooks' import { compact } from 'lodash' import { useRouter } from 'next/router' import SettingsMenuItem from './SettingsMenuItem' const AccountSettingsMenu = () => { const router = useRouter() - const mfaSetup = useFlag('mfaSetup') - const showAuditLogs = useFlag('auditLogs') const accountSettings = compact([ { label: 'Preferences', pathname: `/account/me` }, { label: 'Access Tokens', pathname: `/account/tokens` }, - mfaSetup ? { label: 'Security', pathname: `/account/security` } : null, - showAuditLogs ? { label: 'Audit logs', pathname: `/account/audit` } : null, + { label: 'Security', pathname: `/account/security` }, + { label: 'Audit logs', pathname: `/account/audit` }, ]) return ( diff --git a/studio/pages/project/[ref]/settings/general.tsx b/studio/pages/project/[ref]/settings/general.tsx index f95a7f0d272..25f4ebb5d2c 100644 --- a/studio/pages/project/[ref]/settings/general.tsx +++ b/studio/pages/project/[ref]/settings/general.tsx @@ -6,13 +6,12 @@ import { } from 'components/interfaces/Settings/General' import { SettingsLayout } from 'components/layouts' import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext' -import { useFlag, useIsFeatureEnabled } from 'hooks' +import { useIsFeatureEnabled } from 'hooks' import { NextPageWithLayout } from 'types' const ProjectSettings: NextPageWithLayout = () => { const { project } = useProjectContext() const isBranch = !!project?.parent_project_ref - const transferProjectEnabledFlag = useFlag('transferProject') const { projectsTransfer: projectTransferEnabled } = useIsFeatureEnabled(['projects:transfer']) // [Joshen] Opting for larger gap instead of gap-8 as compared to other pages for better grouping of content @@ -22,7 +21,7 @@ const ProjectSettings: NextPageWithLayout = () => { {!isBranch ? ( <> - {projectTransferEnabled && transferProjectEnabledFlag && } + {projectTransferEnabled && } ) : null}