mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-52915 - Remove boards product config setting and system console (#23526)

Просмотр исходного кода 
* Remove boards product config setting and system console

* create config setting to enable/disable playbooks product

* fix to config name

* fix typo

* remove lingering ProductSettings references

* remove lingering ProductSettings references

* revert changes to package-lock.json

* Revert "revert changes to package-lock.json"

This reverts commit 1a7d98ace33a2f639f41ba7a7697689641684fca.

* revert changes to package-lock.json

* fix build issues

* another fix

* update webap test

* i18n-extract

* Revert "i18n-extract"

This reverts commit c0a98c74ea1800341b273301d3cdb990bc629bc5.

* fix bad i18n-extract

* fix bad i18n-extract

* fix tests from bad merge

* more translation fixes

* more translation fixes

* updates from self-review

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Scott Bishel
2023-06-12 10:52:19 -06:00
коммит произвёл GitHub
родитель 1215584665
Коммит d0ad46b496
11 изменённых файлов: 33 добавлений и 296 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

38
webapp/channels/src/components/admin_console/admin_definition.jsx
Просмотреть файл

@@ -6,7 +6,7 @@
import React from 'react';
import {FormattedMessage} from 'react-intl';
import {AccountMultipleOutlineIcon, ChartBarIcon, CogOutlineIcon, CreditCardOutlineIcon, FlaskOutlineIcon, FormatListBulletedIcon, InformationOutlineIcon, PowerPlugOutlineIcon, ServerVariantIcon, ShieldOutlineIcon, SitemapIcon, ProductsIcon} from '@mattermost/compass-icons/components';
import {AccountMultipleOutlineIcon, ChartBarIcon, CogOutlineIcon, CreditCardOutlineIcon, FlaskOutlineIcon, FormatListBulletedIcon, InformationOutlineIcon, PowerPlugOutlineIcon, ServerVariantIcon, ShieldOutlineIcon, SitemapIcon} from '@mattermost/compass-icons/components';
import {RESOURCE_KEYS} from 'mattermost-redux/constants/permissions_sysconsole';
@@ -5862,42 +5862,6 @@ const AdminDefinition = {
},
},
},
products: {
icon: (
<ProductsIcon
size={16}
className={'category-icon fa'}
color={'currentColor'}
/>
),
sectionTitle: t('admin.sidebar.products'),
sectionTitleDefault: 'Products',
isHidden: it.any(
it.not(it.userHasReadPermissionOnSomeResources(RESOURCE_KEYS.PRODUCTS)),
),
boards: {
url: 'products/boards',
title: t('admin.sidebar.boards'),
title_default: 'Boards',
isHidden: it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.PRODUCTS.BOARDS)),
schema: {
id: 'BoardsSettings',
name: t('admin.site.boards'),
name_default: 'Boards',
settings: [
{
type: Constants.SettingsTypes.TYPE_BOOL,
key: 'ProductSettings.EnablePublicSharedBoards',
label: t('admin.customization.enablePublicSharedBoardsTitle'),
label_default: 'Enable Public Shared Boards:',
help_text: t('admin.customization.enablePublicSharedBoardsDesc'),
help_text_default: 'This allows board editors to share boards that can be accessed by anyone with the link.',
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.PRODUCTS.BOARDS)),
},
],
},
},
},
integrations: {
icon: (
<SitemapIcon

186
webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap
Просмотреть файл

@@ -1072,37 +1072,6 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={
@@ -1806,37 +1775,6 @@ exports[`components/AdminSidebar should match snapshot with workspace optimizati
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={
@@ -2595,37 +2533,6 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={
@@ -3329,37 +3236,6 @@ exports[`components/AdminSidebar should match snapshot, render plugins without a
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={
@@ -4162,37 +4038,6 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={
@@ -5128,37 +4973,6 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
title="Plugin 0"
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="products"
icon={
<ProductsIcon
className="category-icon fa"
color="currentColor"
size={16}
/>
}
key="products"
parentLink="/admin_console"
sectionClass=""
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Products"
id="admin.sidebar.products"
/>
}
>
<AdminSidebarSection
definitionKey="products.boards"
key="products.boards"
name="products/boards"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Boards"
id="admin.sidebar.boards"
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
definitionKey="integrations"
icon={

5
webapp/channels/src/i18n/en.json
Просмотреть файл

@@ -670,8 +670,6 @@
"admin.customization.enableLinkPreviewsTitle": "Enable website link previews:",
"admin.customization.enablePermalinkPreviewsDesc": "When enabled, links to Mattermost messages will generate a preview for any users that have access to the original message. Please review our <link>documentation</link> for details.",
"admin.customization.enablePermalinkPreviewsTitle": "Enable message link previews:",
"admin.customization.enablePublicSharedBoardsDesc": "This allows board editors to share boards that can be accessed by anyone with the link.",
"admin.customization.enablePublicSharedBoardsTitle": "Enable Publicly-Shared Boards:",
"admin.customization.enableSVGsDesc": "Enable previews for SVG file attachments and allow them to appear in messages.\n\nEnabling SVGs is not recommended in environments where not all users are trusted.",
"admin.customization.enableSVGsTitle": "Enable SVGs:",
"admin.customization.gfycatApiKey": "Gfycat API Key:",
@@ -2250,7 +2248,6 @@
"admin.sidebar.billing": "Billing & Account",
"admin.sidebar.billing_history": "Billing History",
"admin.sidebar.blevesearch": "Bleve",
"admin.sidebar.boards": "Boards",
"admin.sidebar.channels": "Channels",
"admin.sidebar.company_info": "Company Information",
"admin.sidebar.compliance": "Compliance",
@@ -2295,7 +2292,6 @@
"admin.sidebar.permissions": "Permissions",
"admin.sidebar.plugins": "Plugins",
"admin.sidebar.posts": "Posts",
"admin.sidebar.products": "Products",
"admin.sidebar.publicLinks": "Public Links",
"admin.sidebar.pushNotificationServer": "Push Notification Server",
"admin.sidebar.rateLimiting": "Rate Limiting",
@@ -2318,7 +2314,6 @@
"admin.sidebar.workspaceOptimization": "Workspace Optimization",
"admin.sidebarHeader.systemConsole": "System Console",
"admin.site.announcementBanner": "Announcement Banner",
"admin.site.boards": "Boards",
"admin.site.customization": "Customization",
"admin.site.emoji": "Emoji",
"admin.site.fileSharingDownloads": "File Sharing and Downloads",

1
webapp/channels/src/utils/admin_console_index.tsx
Просмотреть файл

@@ -93,7 +93,6 @@ export function adminDefinitionsToUrlsAndTexts(adminDefinition: typeof AdminDefi
adminDefinition.integrations,
adminDefinition.compliance,
adminDefinition.experimental,
adminDefinition.products,
adminDefinition.billing,
];
for (const section of sections) {

1
webapp/platform/types/src/config.ts
Просмотреть файл

@@ -820,7 +820,6 @@ export type JobSettings = {
};
export type ProductSettings = {
EnablePublicSharedBoards: boolean;
EnablePlaybooks: boolean;
};