The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move settings detail tabs below headers (#25255)
Thomas des Francs4e9a4df4bd87
diff --git a/packages/twenty-front/src/modules/settings/components/layout/SettingsTabBar.tsx b/packages/twenty-front/src/modules/settings/components/layout/SettingsTabBar.tsxindex 3e84a3d4b4b..953759ed891 100644--- a/packages/twenty-front/src/modules/settings/components/layout/SettingsTabBar.tsx+++ b/packages/twenty-front/src/modules/settings/components/layout/SettingsTabBar.tsx@@ -1,16 +1,22 @@import { TabList } from '@/ui/layout/tab-list/components/TabList';-import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';+import { type TabListProps } from '@/ui/layout/tab-list/types/TabListProps';-type SettingsTabBarProps = {- tabs: SingleTabProps[];- componentInstanceId: string;-};+type SettingsTabBarProps = Pick<+ TabListProps,+ 'behaveAsLinks' | 'componentInstanceId' | 'tabs'+>;export const SettingsTabBar = ({+ behaveAsLinks,tabs,componentInstanceId,}: SettingsTabBarProps) => {return (- <TabList tabs={tabs} componentInstanceId={componentInstanceId} centerTabs />+ <TabList+ behaveAsLinks={behaveAsLinks}+ tabs={tabs}+ componentInstanceId={componentInstanceId}+ centerTabs+ />);};diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsxindex 70a058ed7d2..6ae2f430b48 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx@@ -5,6 +5,7 @@ import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { SettingsPath } from 'twenty-shared/types';import { useLingui } from '@lingui/react/macro';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';import { APPLICATION_REGISTRATION_ADMIN_PATH } from '@/settings/admin-panel/apps/constants/ApplicationRegistrationAdminPath';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';@@ -20,7 +21,6 @@ import { SettingsApplicationRegistrationConfigTab } from '~/pages/settings/appliimport { SettingsApplicationRegistrationOAuthTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab';import { SettingsApplicationRegistrationDistributionTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab';import { SettingsApplicationRegistrationGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab';-import { TabList } from '@/ui/layout/tab-list/components/TabList';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';@@ -118,14 +118,14 @@ export const SettingsAdminApplicationRegistrationDetail = () => {},{ children: registration.name },]}- >- <SettingsPageContainer>- <TabList+ secondaryBar={+ <SettingsTabBartabs={tabs}componentInstanceId={REGISTRATION_DETAIL_TAB_LIST_ID}/>- {renderActiveTabContent()}- </SettingsPageContainer>+ }+ >+ <SettingsPageContainer>{renderActiveTabContent()}</SettingsPageContainer></SettingsPageLayout>);};diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsxindex 0616971a4ee..b10b668a3e0 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx@@ -21,7 +21,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';import { SettingsTableCard } from '@/settings/components/SettingsTableCard';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -163,6 +163,15 @@ export const SettingsAdminUserDetail = () => {children: displayName,},]}+ secondaryBar={+ tabs.length > 0 ? (+ <SettingsTabBar+ tabs={tabs}+ behaveAsLinks={false}+ componentInstanceId={SETTINGS_ADMIN_USER_LOOKUP_WORKSPACE_TABS_ID}+ />+ ) : undefined+ }><SettingsPageContainer>{userLookupResult && (@@ -180,13 +189,6 @@ export const SettingsAdminUserDetail = () => {title={t`Workspaces`}description={t`All workspaces this user is a member of`}/>- <TabList- tabs={tabs}- behaveAsLinks={false}- componentInstanceId={- SETTINGS_ADMIN_USER_LOOKUP_WORKSPACE_TABS_ID- }- /><SettingsAdminWorkspaceContentactiveWorkspace={activeWorkspace}/>diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsxindex 57021a64a69..4db73a07ae2 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx@@ -23,7 +23,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { Table } from '@/ui/layout/table/components/Table';import { TableBody } from '@/ui/layout/table/components/TableBody';@@ -230,14 +230,15 @@ export const SettingsAdminWorkspaceDetail = () => {children: workspaceName,},]}- >- <SettingsPageContainer>- <TabList+ secondaryBar={+ <SettingsTabBartabs={tabs}behaveAsLinks={false}componentInstanceId={WORKSPACE_DETAIL_TABS_ID}/>-+ }+ >+ <SettingsPageContainer>{effectiveTabId === WORKSPACE_DETAIL_TAB_IDS.INFO && workspace && (<SettingsAdminWorkspaceContentactiveWorkspace={workspace}diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsxindex a41fb445380..c48038b3e99 100644--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx@@ -5,13 +5,13 @@ import { useDebouncedCallback } from 'use-debounce';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { SettingsRolesQueryEffect } from '@/settings/roles/components/SettingsRolesQueryEffect';import { useSaveDraftRoleToDB } from '@/settings/roles/role/hooks/useSaveDraftRoleToDB';import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';@@ -56,10 +56,6 @@ const StyledContentContainer = styled.div`width: 100%;`;-const StyledTabListContainer = styled.div`- margin-bottom: ${themeCssVariables.spacing[8]};-`;-export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {const { theme } = useContext(ThemeContext);const { getIcon } = useIcons();@@ -429,51 +425,50 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {{ children: t`AI`, href: getSettingsPath(SettingsPath.AI) },{ children: breadcrumbText },]}+ secondaryBar={+ isEditMode && loading ? undefined : (+ <SettingsTabBar+ tabs={tabs}+ componentInstanceId={tabListComponentId}+ />+ )+ }><SettingsPageContainer><Section>{isEditMode && loading ? (<SettingsAgentDetailSkeletonLoader />) : (- <>- <StyledTabListContainer>- <TabList- tabs={tabs}- className="tab-list"- componentInstanceId={tabListComponentId}+ <StyledContentContainer>+ {isRoleTab && (+ <SettingsAgentRoleTab+ formValues={formValues}+ onFieldChange={handleFieldChange}+ disabled={isFormDisabled}+ agentId={agentId}+ agentLabel={formValues.label}+ />+ )}+ {isSettingsTab && (+ <SettingsAgentSettingsTab+ formValues={formValues}+ onFieldChange={handleFieldChange}+ disabled={isFormDisabled}+ agent={agent}+ />+ )}+ {isEvalsTab && (+ <SettingsAgentEvalsTab+ agentId={agentId}+ evaluationInputs={formValues.evaluationInputs}+ onEvaluationInputsChange={(inputs) =>+ handleFieldChange('evaluationInputs', inputs)+ }+ disabled={isEvalsDisabled}/>- </StyledTabListContainer>- <StyledContentContainer>- {isRoleTab && (- <SettingsAgentRoleTab- formValues={formValues}- onFieldChange={handleFieldChange}- disabled={isFormDisabled}- agentId={agentId}- agentLabel={formValues.label}- />- )}- {isSettingsTab && (- <SettingsAgentSettingsTab- formValues={formValues}- onFieldChange={handleFieldChange}- disabled={isFormDisabled}- agent={agent}- />- )}- {isEvalsTab && (- <SettingsAgentEvalsTab- agentId={agentId}- evaluationInputs={formValues.evaluationInputs}- onEvaluationInputsChange={(inputs) =>- handleFieldChange('evaluationInputs', inputs)- }- disabled={isEvalsDisabled}- />- )}- {isLogsTab && <SettingsAgentLogsTab agentId={agentId} />}- </StyledContentContainer>- </>+ )}+ {isLogsTab && <SettingsAgentLogsTab agentId={agentId} />}+ </StyledContentContainer>)}</Section></SettingsPageContainer>diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsxindex 57d55990543..4519386e3ef 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx@@ -11,7 +11,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import type { SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -378,6 +378,12 @@ export const SettingsApplicationDetails = () => {},{ children: displayName },]}+ secondaryBar={+ <SettingsTabBar+ tabs={tabs}+ componentInstanceId={APPLICATION_DETAIL_ID}+ />+ }><SettingsPageContainer>{isApplicationStopped && (@@ -387,7 +393,6 @@ export const SettingsApplicationDetails = () => {message={t`We are currently encountering issues with this app, its behavior may be degraded while we work on a fix.`}/>)}- <TabList tabs={tabs} componentInstanceId={APPLICATION_DETAIL_ID} />{renderActiveTabContent()}</SettingsPageContainer></SettingsPageLayout>diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsxindex d95275d1d6e..436264ec719 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationFrontComponentDetail.tsx@@ -1,7 +1,7 @@import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useQuery } from '@apollo/client/react';@@ -100,9 +100,11 @@ export const SettingsApplicationFrontComponentDetail = () => {<SettingsPageLayouttitle={frontComponent?.name ?? t`Front component`}links={breadcrumbLinks}+ secondaryBar={+ <SettingsTabBar tabs={tabs} componentInstanceId={instanceId} />+ }><SettingsPageContainer>- <TabList tabs={tabs} componentInstanceId={instanceId} />{loading ? <SettingsSectionSkeletonLoader /> : renderActiveTabContent()}</SettingsPageContainer></SettingsPageLayout>diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsxindex a1b6ff7ec7b..7689b665960 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx@@ -1,5 +1,6 @@import { useRefetchOnApplicationRegistrationChange } from '@/applications/hooks/useRefetchOnApplicationRegistrationChange';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { useQuery } from '@apollo/client/react';import { useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';@@ -7,7 +8,6 @@ import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { FindOneApplicationRegistrationDocument } from '~/generated-metadata/graphql';import { useLingui } from '@lingui/react/macro';import { Avatar, Tag } from 'twenty-ui/data-display';-import { TabList } from '@/ui/layout/tab-list/components/TabList';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import {IconInfoCircle,@@ -123,14 +123,14 @@ export const SettingsApplicationRegistrationDetails = () => {},{ children: registration.name },]}- >- <SettingsPageContainer>- <TabList+ secondaryBar={+ <SettingsTabBartabs={tabs}componentInstanceId={REGISTRATION_DETAIL_TAB_LIST_ID}/>- {renderActiveTabContent()}- </SettingsPageContainer>+ }+ >+ <SettingsPageContainer>{renderActiveTabContent()}</SettingsPageContainer></SettingsPageLayout>);};diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsxindex c7cc0837fd4..c7c1476f595 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx@@ -7,7 +7,7 @@ import { getMarketplaceAppDefaultRoleManifest } from '@/marketplace/utils/getMarimport { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useQuery } from '@apollo/client/react';@@ -305,6 +305,12 @@ export const SettingsAvailableApplicationDetails = () => {chipOnly/>}+ secondaryBar={+ <SettingsTabBar+ tabs={tabs}+ componentInstanceId={AVAILABLE_APPLICATION_DETAIL_ID}+ />+ }><SettingsPageContainer>{isUnlisted && (@@ -313,10 +319,6 @@ export const SettingsAvailableApplicationDetails = () => {message={t`Application not listed on the marketplace. It was shared via a direct link`}/>)}- <TabList- tabs={tabs}- componentInstanceId={AVAILABLE_APPLICATION_DETAIL_ID}- />{renderActiveTabContent()}</SettingsPageContainer></SettingsPageLayout>diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsxindex 5e686021703..f45e1d2b50c 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx@@ -2,12 +2,12 @@ import { useLingui } from '@lingui/react/macro';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';import { SettingsWorkspaceUnsubscribeTopicSection } from '@/settings/unsubscribe-topics/components/SettingsWorkspaceUnsubscribeTopicSection';import { SettingsUnsubscribePreview } from '@/settings/unsubscribers/components/SettingsUnsubscribePreview';import { SettingsUnsubscribersList } from '@/settings/unsubscribers/components/SettingsUnsubscribersList';import { SETTINGS_UNSUBSCRIBE_TAB_IDS } from '@/settings/unsubscribers/constants/SettingsUnsubscribeTabIds';-import { TabList } from '@/ui/layout/tab-list/components/TabList';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';@@ -63,12 +63,14 @@ export const SettingsWorkspaceUnsubscribe = () => {},{ children: t`Unsubscribe` },]}- >- <SettingsPageContainer>- <TabList+ secondaryBar={+ <SettingsTabBartabs={tabs}componentInstanceId={UNSUBSCRIBE_TABS_INSTANCE_ID}/>+ }+ >+ <SettingsPageContainer>{activeTabId === SETTINGS_UNSUBSCRIBE_TAB_IDS.UNSUBSCRIBERS && (<SettingsUnsubscribersList />)}diff --git a/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx b/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsxindex c5315222616..2571573af37 100644--- a/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx+++ b/packages/twenty-front/src/pages/settings/logic-functions/SettingsLogicFunctionDetail.tsx@@ -7,7 +7,7 @@ import { SettingsLogicFunctionSettingsTab } from '@/settings/logic-functions/comimport { SettingsLogicFunctionTestTab } from '@/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab';import { SettingsLogicFunctionTriggersTab } from '@/settings/logic-functions/components/tabs/SettingsLogicFunctionTriggersTab';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';@@ -153,9 +153,11 @@ export const SettingsLogicFunctionDetail = () => {/>}links={breadcrumbLinks}+ secondaryBar={+ <SettingsTabBar tabs={tabs} componentInstanceId={instanceId} />+ }><SettingsPageContainer>- <TabList tabs={tabs} componentInstanceId={instanceId} />{isEditorTab && (<SettingsLogicFunctionCodeEditorTabfiles={files}diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsxindex 00f3d33e127..98e68806377 100644--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMember.tsx@@ -10,7 +10,7 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';import { useModal } from '@/ui/layout/modal/hooks/useModal';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { TabList } from '@/ui/layout/tab-list/components/TabList';+import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';@@ -194,9 +194,8 @@ export const SettingsWorkspaceMember = () => {children: `${member.name.firstName} ${member.name.lastName}`,},]}- >- <SettingsPageContainer>- <TabList+ secondaryBar={+ <SettingsTabBartabs={[{id: SETTINGS_WORKSPACE_MEMBER_TABS.TABS_IDS.INFOS,@@ -211,7 +210,9 @@ export const SettingsWorkspaceMember = () => {]}componentInstanceId={tabListComponentId}/>-+ }+ >+ <SettingsPageContainer>{activeTabId === SETTINGS_WORKSPACE_MEMBER_TABS.TABS_IDS.INFOS && (<MemberInfosTabmember={member}