Skip to content

Commit

Permalink
Chore: Move admin sidebarItems registration to the main file (#25442)
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris authored May 10, 2022
1 parent 7bd248d commit c068743
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 75 deletions.
10 changes: 0 additions & 10 deletions apps/meteor/app/authorization/client/startup.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { hasAtLeastOnePermission } from './hasPermission';
import { CachedCollectionManager } from '../../ui-cached-collection';
import { APIClient } from '../../utils/client';
import { Roles } from '../../models/client';
import { rolesStreamer } from './lib/streamer';
import { registerAdminSidebarItem } from '../../../client/views/admin';

Meteor.startup(() => {
CachedCollectionManager.onLogin(async () => {
Expand All @@ -18,14 +16,6 @@ Meteor.startup(() => {
Roles.ready.set(true);
});

registerAdminSidebarItem({
href: 'admin-permissions',
i18nLabel: 'Permissions',
icon: 'lock',
permissionGranted() {
return hasAtLeastOnePermission(['access-permissions', 'access-setting-permissions']);
},
});
const events = {
changed: (role) => {
delete role.type;
Expand Down
11 changes: 0 additions & 11 deletions apps/meteor/app/emoji-custom/client/admin/startup.js

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/emoji-custom/client/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import './lib/emojiCustom';
import './notifications/deleteEmojiCustom';
import './notifications/updateEmojiCustom';
import './admin/startup';
15 changes: 0 additions & 15 deletions apps/meteor/app/integrations/client/startup.js

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/mail-messages/client/index.ts

This file was deleted.

9 changes: 0 additions & 9 deletions apps/meteor/app/mail-messages/client/startup.js

This file was deleted.

11 changes: 0 additions & 11 deletions apps/meteor/app/oauth2-server-config/client/admin/startup.js

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/oauth2-server-config/client/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import './oauth/oauth2-client.html';
import './oauth/oauth2-client';
import './admin/startup';
import './oauth/stylesheets/oauth2.css';
11 changes: 0 additions & 11 deletions apps/meteor/app/user-status/client/admin/startup.js

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/app/user-status/client/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import './admin/startup';

import './notifications/deleteCustomUserStatus';
import './notifications/updateCustomUserStatus';

Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/client/importPackages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import '../app/importer-csv/client';
import '../app/importer-hipchat-enterprise/client';
import '../app/importer-slack/client';
import '../app/importer-slack-users/client';
import '../app/integrations/client/startup';
import '../app/lib/client';
import '../app/livestream/client';
import '../app/logger/client';
Expand Down Expand Up @@ -77,7 +76,6 @@ import '../app/chatpal-search/client';
import '../app/lazy-load/client';
import '../app/discussion/client';
import '../app/threads/client';
import '../app/mail-messages/client';
import '../app/user-status/client';
import '../app/utils/client';
import '../app/settings/client';
Expand Down
44 changes: 43 additions & 1 deletion apps/meteor/client/views/admin/sidebarItems.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { hasPermission } from '../../../app/authorization/client';
import { hasPermission, hasAtLeastOnePermission, hasAllPermission } from '../../../app/authorization/client';
import { createSidebarItems } from '../../lib/createSidebarItems';

export const {
Expand Down Expand Up @@ -73,4 +73,46 @@ export const {
tag: 'Alpha',
permissionGranted: (): boolean => hasPermission('manage-email-inbox'),
},
{
icon: 'emoji',
href: 'emoji-custom',
i18nLabel: 'Custom_Emoji',
permissionGranted: (): boolean => hasPermission('manage-emoji'),
},
{
icon: 'code',
href: 'admin-integrations',
i18nLabel: 'Integrations',
permissionGranted: (): boolean =>
hasAtLeastOnePermission([
'manage-outgoing-integrations',
'manage-own-outgoing-integrations',
'manage-incoming-integrations',
'manage-own-incoming-integrations',
]),
},
{
icon: 'discover',
href: 'admin-oauth-apps',
i18nLabel: 'OAuth Apps',
permissionGranted: (): boolean => hasAllPermission('manage-oauth-apps'),
},
{
icon: 'mail',
href: 'admin-mailer',
i18nLabel: 'Mailer',
permissionGranted: (): boolean => hasAllPermission('access-mailer'),
},
{
icon: 'user',
href: 'custom-user-status',
i18nLabel: 'Custom_User_Status',
permissionGranted: (): boolean => hasAtLeastOnePermission(['manage-user-status']),
},
{
icon: 'lock',
href: 'admin-permissions',
i18nLabel: 'Permissions',
permissionGranted: (): boolean => hasAtLeastOnePermission(['access-permissions', 'access-setting-permissions']),
},
]);

0 comments on commit c068743

Please sign in to comment.