eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ "Shared Drive" can be disabled in configuration (#335)

Browse Source
This commit is contained in:
Anton Shepilov
2024-01-19 21:30:38 +03:00
committed by GitHub
parent 4769a23480
commit e887d820e5
7 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/backend/node/config/custom-environment-variables.json
+1
View File
@@ -133,6 +133,7 @@
"server": "PLUGINS_SERVER"
},
"drive": {
"featureSharedDrive": "ENABLE_FEATURE_SHARED_DRIVE",
"rootAdmins": "DRIVE_ROOT_ADMINS",
"defaultLanguage": "DRIVE_DEFAULT_LANGUAGE",
"featureSearchUsers": "ENABLE_FEATURE_SEARCH_USERS"
tdrive/backend/node/config/default.json
+1
View File
@@ -135,6 +135,7 @@
"debug": true
},
"drive": {
"featureSharedDrive": true,
"featureSearchUsers": true
},
"applications": {
tdrive/backend/node/src/services/user/utils.ts
+3
View File
@@ -58,6 +58,9 @@ export function formatCompany(
[CompanyFeaturesEnum.COMPANY_SEARCH_USERS]: JSON.parse(
config.get("drive.featureSearchUsers") || "true",
),
[CompanyFeaturesEnum.COMPANY_SHARED_DRIVE]: JSON.parse(
config.get("drive.featureSharedDrive") || "true",
),
},
{
...(res.plan?.features || {}),
tdrive/backend/node/src/services/user/web/schemas.ts
+1
View File
@@ -93,6 +93,7 @@ export const companyObjectSchema = {
[CompanyFeaturesEnum.CHAT_UNLIMITED_STORAGE]: { type: "boolean" },
[CompanyFeaturesEnum.COMPANY_INVITE_MEMBER]: { type: "boolean" },
[CompanyFeaturesEnum.COMPANY_SEARCH_USERS]: { type: "boolean" },
[CompanyFeaturesEnum.COMPANY_SHARED_DRIVE]: { type: "boolean" },
guests: { type: "number" }, // to rename or delete
members: { type: "number" }, // to rename or delete
storage: { type: "number" }, // to rename or delete
tdrive/backend/node/src/services/user/web/types.ts
+2
View File
@@ -84,6 +84,7 @@ export enum CompanyFeaturesEnum {
CHAT_UNLIMITED_STORAGE = "chat:unlimited_storage",
COMPANY_INVITE_MEMBER = "company:invite_member",
COMPANY_SEARCH_USERS = "company:search_users",
COMPANY_SHARED_DRIVE = "company:shared_drive",
}
export type CompanyFeaturesObject = {
@@ -94,6 +95,7 @@ export type CompanyFeaturesObject = {
[CompanyFeaturesEnum.CHAT_UNLIMITED_STORAGE]?: boolean;
[CompanyFeaturesEnum.COMPANY_INVITE_MEMBER]?: boolean;
[CompanyFeaturesEnum.COMPANY_SEARCH_USERS]?: boolean;
[CompanyFeaturesEnum.COMPANY_SHARED_DRIVE]?: boolean;
};
export type CompanyLimitsObject = {
tdrive/frontend/src/app/features/global/services/feature-toggles-service.ts
+3
View File
@@ -9,6 +9,7 @@ export enum FeatureNames {
UNLIMITED_STORAGE = 'chat:unlimited_storage', //Currently inactive
COMPANY_INVITE_MEMBER = 'company:invite_member',
COMPANY_SEARCH_USERS = 'company:search_users',
COMPANY_SHARED_DRIVE = 'company:shared_drive',
}
export type FeatureValueType = boolean | number;
@@ -23,7 +24,9 @@ availableFeaturesWithDefaults.set(FeatureNames.MULTIPLE_WORKSPACES, true);
availableFeaturesWithDefaults.set(FeatureNames.EDIT_FILES, true);
availableFeaturesWithDefaults.set(FeatureNames.UNLIMITED_STORAGE, true);
availableFeaturesWithDefaults.set(FeatureNames.COMPANY_INVITE_MEMBER, true);
availableFeaturesWithDefaults.set(FeatureNames.COMPANY_INVITE_MEMBER, true);
availableFeaturesWithDefaults.set(FeatureNames.COMPANY_SEARCH_USERS, true);
availableFeaturesWithDefaults.set(FeatureNames.COMPANY_SHARED_DRIVE, true);
/**
* ChannelServiceImpl that allow you to manage feature flipping in Tdrive using react feature toggles
tdrive/frontend/src/app/views/client/side-bar/index.tsx
+23 -20
View File
@@ -89,26 +89,29 @@ export default () => {
>
<UserIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.my_drive')}
</Button>
<Button
onClick={() => {
history.push(
RouterServices.generateRouteFromState({
companyId: company,
viewId: 'root',
itemId: '',
dirId: '',
}),
);
setParentId('root');
}}
size="lg"
theme="white"
className={
'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '')
}
>
<CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
</Button>
{FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SHARED_DRIVE) && (
<Button
onClick={() => {
history.push(
RouterServices.generateRouteFromState({
companyId: company,
viewId: 'root',
itemId: '',
dirId: '',
}),
);
setParentId('root');
}}
size="lg"
theme="white"
className={
'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '')
}
>
<CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
</Button>
)}
{FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SEARCH_USERS) && (
<Button
onClick={() => {