[MM-34663] System Console > Guest Access (Beta) - System User Manager…

… role now sees Integrations > CORS (mattermost#7890) * all to any * update snpashot (cherry picked from commit 8e8285d)
mattermost-build · Apr 13, 2021 · e3aa25b · e3aa25b
1 parent f94df05
commit e3aa25b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 147 deletions.
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -5143,7 +5143,7 @@ const AdminDefinition = {
  url: 'integrations/cors',
  title: t('admin.sidebar.cors'),
  title_default: 'CORS',
- isHidden: it.all(
+ isHidden: it.any(
  it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'),
  it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.INTEGRATIONS.CORS)),
  ),

diff --git a/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap b/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap
@@ -207,34 +207,6 @@ exports[`components/AdminSidebar Plugins should match snapshot 1`] = `
  title="Autolink"
  />
  </AdminSidebarCategory>
- <AdminSidebarCategory
- definitionKey="integrations"
- icon="fa-sitemap"
- key="integrations"
- parentLink="/admin_console"
- sectionClass=""
- title={
- <FormattedMessage
- defaultMessage="Integrations"
- id="admin.sidebar.integrations"
- />
- }
- >
- <AdminSidebarSection
- definitionKey="integrations.cors"
- key="integrations.cors"
- name="integrations/cors"
- parentLink=""
- subsection={false}
- tag=""
- title={
- <FormattedMessage
- defaultMessage="CORS"
- id="admin.sidebar.cors"
- />
- }
- />
- </AdminSidebarCategory>
  </ul>
  </Highlight>
  </div>
@@ -1015,36 +987,7 @@ exports[`components/AdminSidebar should match snapshot, no access 1`] = `
  >
  <ul
  className="nav nav-pills nav-stacked"
- >
- <AdminSidebarCategory
- definitionKey="integrations"
- icon="fa-sitemap"
- key="integrations"
- parentLink="/admin_console"
- sectionClass=""
- title={
- <FormattedMessage
- defaultMessage="Integrations"
- id="admin.sidebar.integrations"
- />
- }
- >
- <AdminSidebarSection
- definitionKey="integrations.cors"
- key="integrations.cors"
- name="integrations/cors"
- parentLink=""
- subsection={false}
- tag=""
- title={
- <FormattedMessage
- defaultMessage="CORS"
- id="admin.sidebar.cors"
- />
- }
- />
- </AdminSidebarCategory>
- </ul>
+ />
  </Highlight>
  </div>
  </Scrollbars>
@@ -1101,36 +1044,7 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
  >
  <ul
  className="nav nav-pills nav-stacked"
- >
- <AdminSidebarCategory
- definitionKey="integrations"
- icon="fa-sitemap"
- key="integrations"
- parentLink="/admin_console"
- sectionClass=""
- title={
- <FormattedMessage
- defaultMessage="Integrations"
- id="admin.sidebar.integrations"
- />
- }
- >
- <AdminSidebarSection
- definitionKey="integrations.cors"
- key="integrations.cors"
- name="integrations/cors"
- parentLink=""
- subsection={false}
- tag=""
- title={
- <FormattedMessage
- defaultMessage="CORS"
- id="admin.sidebar.cors"
- />
- }
- />
- </AdminSidebarCategory>
- </ul>
+ />
  </Highlight>
  </div>
  </Scrollbars>
@@ -1187,36 +1101,7 @@ exports[`components/AdminSidebar should match snapshot, render plugins without a
  >
  <ul
  className="nav nav-pills nav-stacked"
- >
- <AdminSidebarCategory
- definitionKey="integrations"
- icon="fa-sitemap"
- key="integrations"
- parentLink="/admin_console"
- sectionClass=""
- title={
- <FormattedMessage
- defaultMessage="Integrations"
- id="admin.sidebar.integrations"
- />
- }
- >
- <AdminSidebarSection
- definitionKey="integrations.cors"
- key="integrations.cors"
- name="integrations/cors"
- parentLink=""
- subsection={false}
- tag=""
- title={
- <FormattedMessage
- defaultMessage="CORS"
- id="admin.sidebar.cors"
- />
- }
- />
- </AdminSidebarCategory>
- </ul>
+ />
  </Highlight>
  </div>
  </Scrollbars>
@@ -2282,34 +2167,6 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
  }
  />
  </AdminSidebarCategory>
- <AdminSidebarCategory
- definitionKey="integrations"
- icon="fa-sitemap"
- key="integrations"
- parentLink="/admin_console"
- sectionClass=""
- title={
- <FormattedMessage
- defaultMessage="Integrations"
- id="admin.sidebar.integrations"
- />
- }
- >
- <AdminSidebarSection
- definitionKey="integrations.cors"
- key="integrations.cors"
- name="integrations/cors"
- parentLink=""
- subsection={false}
- tag=""
- title={
- <FormattedMessage
- defaultMessage="CORS"
- id="admin.sidebar.cors"
- />
- }
- />
- </AdminSidebarCategory>
  </ul>
  </Highlight>
  </div>