studio/people
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️(features) rename "TEAMS" flag

Browse Source 
To match recent changes we rename the "TEAMS" feature flag
to "TEAMS_DISPLAY".
This commit is contained in:
Quentin BEY
2024-11-14 14:20:10 +01:00
committed by BEY Quentin
parent 59f3499799
commit 90a3e26c7f
12 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/core/models.py
View File

@@ -487,7 +487,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
),
},
"teams": {
"can_view": teams_can_view and settings.FEATURES["TEAMS"],
"can_view": teams_can_view and settings.FEATURES["TEAMS_DISPLAY"],
"can_create": teams_can_view and settings.FEATURES["TEAMS_CREATE"],
},
"mailboxes": {

4
src/backend/core/tests/test_api_config.py
View File

@@ -24,7 +24,7 @@ def test_api_config_anonymous():
"CONTACTS_DISPLAY": True,
"CONTACTS_CREATE": True,
"MAILBOXES_CREATE": True,
"TEAMS": True,
"TEAMS_DISPLAY": True,
"TEAMS_CREATE": True,
},
"RELEASE": "NA",
@@ -46,7 +46,7 @@ def test_api_config_authenticated():
"CONTACTS_DISPLAY": True,
"CONTACTS_CREATE": True,
"MAILBOXES_CREATE": True,
"TEAMS": True,
"TEAMS_DISPLAY": True,
"TEAMS_CREATE": True,
},
"RELEASE": "NA",

2
src/backend/people/settings.py
View File

@@ -465,7 +465,7 @@ class Base(Configuration):
"CONTACTS_CREATE", # Used in the users/me/ endpoint
"CONTACTS_DISPLAY", # Used in the users/me/ endpoint
"MAILBOXES_CREATE", # Used in the users/me/ endpoint
"TEAMS",
"TEAMS_DISPLAY",
"TEAMS_CREATE", # Used in the users/me/ endpoint
}

12
src/frontend/apps/desk/src/__tests__/pages.test.tsx
View File

@@ -21,7 +21,11 @@ describe('Page', () => {
it('checks Page rendering with team feature', () => {
useConfigStore.setState({
config: { RELEASE: '1.0.0', FEATURES: { TEAMS: true }, LANGUAGES: [] },
config: {
RELEASE: '1.0.0',
FEATURES: { TEAMS_DISPLAY: true },
LANGUAGES: [],
},
});
render(<Page />, { wrapper: AppWrapper });
@@ -31,7 +35,11 @@ describe('Page', () => {
it('checks Page rendering without team feature', () => {
useConfigStore.setState({
config: { RELEASE: '1.0.0', FEATURES: { TEAMS: false }, LANGUAGES: [] },
config: {
RELEASE: '1.0.0',
FEATURES: { TEAMS_DISPLAY: false },
LANGUAGES: [],
},
});
render(<Page />, { wrapper: AppWrapper });

2
src/frontend/apps/desk/src/core/MainLayout.tsx
View File

@@ -15,7 +15,7 @@ export function MainLayout({ children }: PropsWithChildren) {
<Box $height="100vh">
<Header />
<Box $css="flex: 1;" $direction="row">
{config?.FEATURES.TEAMS && <Menu />}
{config?.FEATURES.TEAMS_DISPLAY && <Menu />}
<Box
as="main"
$height={`calc(100vh - ${HEADER_HEIGHT})`}

18
src/frontend/apps/desk/src/core/__tests__/MainLayout.test.tsx
View File

@@ -18,7 +18,11 @@ jest.mock('next/navigation', () => ({
describe('MainLayout', () => {
it('checks menu rendering with team feature', () => {
useConfigStore.setState({
config: { RELEASE: '1.0.0', FEATURES: { TEAMS: true }, LANGUAGES: [] },
config: {
RELEASE: '1.0.0',
FEATURES: { TEAMS_DISPLAY: true },
LANGUAGES: [],
},
});
useAuthStore.setState({
authenticated: true,
@@ -51,7 +55,11 @@ describe('MainLayout', () => {
it('checks menu rendering with no abilities', () => {
useConfigStore.setState({
config: { RELEASE: '1.0.0', FEATURES: { TEAMS: true }, LANGUAGES: [] },
config: {
RELEASE: '1.0.0',
FEATURES: { TEAMS_DISPLAY: true },
LANGUAGES: [],
},
});
useAuthStore.setState({
authenticated: true,
@@ -85,7 +93,11 @@ describe('MainLayout', () => {
it('checks menu rendering without team feature', () => {
useConfigStore.setState({
config: { RELEASE: '1.0.0', FEATURES: { TEAMS: false }, LANGUAGES: [] },
config: {
RELEASE: '1.0.0',
FEATURES: { TEAMS_DISPLAY: false },
LANGUAGES: [],
},
});
useAuthStore.setState({
authenticated: true,

2
src/frontend/apps/desk/src/core/config/types.ts
View File

@@ -2,6 +2,6 @@ export interface Config {
LANGUAGES: [string, string][];
RELEASE: string;
FEATURES: {
TEAMS: boolean;
TEAMS_DISPLAY: boolean;
};
}

2
src/frontend/apps/desk/src/features/mail-domains/domains/components/panel/Panel.tsx
View File

@@ -22,7 +22,7 @@ export const Panel = () => {
$minWidth: '0',
};
const styleNoTeam = !config?.FEATURES.TEAMS && {
const styleNoTeam = !config?.FEATURES.TEAMS_DISPLAY && {
$display: 'none',
tabIndex: -1,
};

4
src/frontend/apps/desk/src/pages/index.tsx
View File

@@ -9,8 +9,8 @@ const Page: NextPageWithLayout = () => {
const router = useNavigate();
useEffect(() => {
router.push(config?.FEATURES.TEAMS ? '/teams/' : '/mail-domains/');
}, [config?.FEATURES.TEAMS, router]);
router.push(config?.FEATURES.TEAMS_DISPLAY ? '/teams/' : '/mail-domains/');
}, [config?.FEATURES.TEAMS_DISPLAY, router]);
return null;
};

4
src/frontend/apps/e2e/__tests__/app-desk/config.spec.ts
View File

@@ -25,7 +25,7 @@ test.describe('Config', () => {
CONTACTS_DISPLAY: true,
MAILBOXES_CREATE: true,
TEAMS_CREATE: true,
TEAMS: true,
TEAMS_DISPLAY: true,
},
RELEASE: 'NA',
});
@@ -48,7 +48,7 @@ test.describe('Config', () => {
['en-us', 'English'],
['fr-fr', 'French'],
],
FEATURES: { TEAMS: false },
FEATURES: { TEAMS_DISPLAY: false },
},
});
} else {

2
src/helm/env.d/preprod/values.desk.yaml.gotmpl
View File

@@ -100,7 +100,7 @@ backend:
secretKeyRef:
name: backend
key: MAIL_PROVISIONING_API_CREDENTIALS
FEATURE_TEAMS: False
FEATURE_TEAMS_DISPLAY: False
FEATURE_CONTACTS_DISPLAY: False
FEATURE_CONTACTS_CREATE: False
FEATURE_TEAMS_CREATE: False

2
src/helm/env.d/production/values.desk.yaml.gotmpl
View File

@@ -100,7 +100,7 @@ backend:
secretKeyRef:
name: backend
key: MAIL_PROVISIONING_API_CREDENTIALS
FEATURE_TEAMS: False
FEATURE_TEAMS_DISPLAY: False
FEATURE_CONTACTS_DISPLAY: False
FEATURE_CONTACTS_CREATE: False
FEATURE_TEAMS_CREATE: False