Skip to content

Commit feca34b

Browse files
committed
MOBILE-4912 user: Sort user handler names
Some User handlers were named as main menu handlers and has been renamed Also feature constants have been added.
1 parent 0a16f76 commit feca34b

File tree

24 files changed

+106
-34
lines changed

24 files changed

+106
-34
lines changed

src/addons/badges/constants.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// (C) Copyright 2015 Moodle Pty Ltd.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
import { CORE_USER_FEATURE_PREFIX } from '@features/user/constants';
16+
17+
export const ADDONS_BADGES_COMPONENT_NAME = 'AddonBadges';
18+
19+
export const ADDONS_BADGES_USER_MENU_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_BADGES_COMPONENT_NAME}`;
20+
export const ADDONS_BADGES_ACCOUNT_FEATURE_NAME = `${ADDONS_BADGES_USER_MENU_FEATURE_NAME}:account`;

src/addons/badges/services/handlers/mybadges-link.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
1818
import { CoreNavigator } from '@services/navigator';
1919
import { makeSingleton } from '@singletons';
2020
import { AddonBadges } from '../badges';
21+
import { ADDONS_BADGES_USER_MENU_FEATURE_NAME } from '@addons/badges/constants';
2122

2223
/**
2324
* Handler to treat links to user badges page.
@@ -26,7 +27,7 @@ import { AddonBadges } from '../badges';
2627
export class AddonBadgesMyBadgesLinkHandlerService extends CoreContentLinksHandlerBase {
2728

2829
name = 'AddonBadgesMyBadgesLinkHandler';
29-
featureName = 'CoreUserDelegate_AddonBadges';
30+
featureName = ADDONS_BADGES_USER_MENU_FEATURE_NAME;
3031
pattern = /\/badges\/mybadges\.php/;
3132

3233
/**

src/addons/badges/services/handlers/push-click.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
2222
import { CoreNavigator } from '@services/navigator';
2323
import { AddonBadgesHelper } from '../badges-helper';
2424
import { CorePromiseUtils } from '@singletons/promise-utils';
25+
import { ADDONS_BADGES_USER_MENU_FEATURE_NAME } from '@addons/badges/constants';
2526

2627
/**
2728
* Handler for badges push notifications clicks.
@@ -31,7 +32,7 @@ export class AddonBadgesPushClickHandlerService implements CorePushNotifications
3132

3233
name = 'AddonBadgesPushClickHandler';
3334
priority = 200;
34-
featureName = 'CoreUserDelegate_AddonBadges';
35+
featureName = ADDONS_BADGES_USER_MENU_FEATURE_NAME;
3536

3637
/**
3738
* @inheritdoc

src/addons/badges/services/handlers/user.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,20 @@ import { CoreNavigator } from '@services/navigator';
2424
import { CoreSites } from '@services/sites';
2525
import { makeSingleton } from '@singletons';
2626
import { AddonBadges } from '../badges';
27+
import {
28+
ADDONS_BADGES_ACCOUNT_FEATURE_NAME,
29+
ADDONS_BADGES_COMPONENT_NAME,
30+
ADDONS_BADGES_USER_MENU_FEATURE_NAME,
31+
} from '@addons/badges/constants';
2732

2833
/**
2934
* Profile badges handler.
3035
*/
3136
@Injectable({ providedIn: 'root' })
3237
export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
3338

34-
name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
39+
// This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
40+
name = `${ADDONS_BADGES_COMPONENT_NAME}:fakename`;
3541
priority = 300;
3642
type = CoreUserProfileHandlerType.LIST_ITEM;
3743

@@ -57,10 +63,10 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
5763
}
5864

5965
if (context === CoreUserDelegateContext.USER_MENU) {
60-
if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges:account')) {
66+
if (currentSite.isFeatureDisabled(ADDONS_BADGES_ACCOUNT_FEATURE_NAME)) {
6167
return false;
6268
}
63-
} else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges')) {
69+
} else if (currentSite.isFeatureDisabled(ADDONS_BADGES_USER_MENU_FEATURE_NAME)) {
6470
return false;
6571
}
6672

src/addons/blog/constants.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
import { CORE_USER_FEATURE_PREFIX } from '@features/user/constants';
16+
1517
export const ADDON_BLOG_MAINMENU_PAGE_NAME = 'blog';
1618
export const ADDON_BLOG_ENTRY_UPDATED = 'blog_entry_updated';
1719
export const ADDON_BLOG_AUTO_SYNCED = 'addon_blog_autom_synced';
@@ -20,6 +22,10 @@ export const ADDON_BLOG_SYNC_ID = 'blog';
2022

2123
export const ADDONS_BLOG_COMPONENT_NAME = 'AddonBlog';
2224

25+
const ADDONS_BLOG_GLOBAL_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_BLOG_COMPONENT_NAME}`;
26+
export const ADDONS_BLOG_ACCOUNT_FEATURE_NAME = `${ADDONS_BLOG_GLOBAL_FEATURE_NAME}:account`;
27+
export const ADDONS_BLOG_USER_MENU_FEATURE_NAME = `${ADDONS_BLOG_GLOBAL_FEATURE_NAME}:blogs`;
28+
2329
/**
2430
* Restriction level of user blog visualization.
2531
*/

src/addons/blog/services/handlers/edit-entry-link.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
1919
import { CoreNavigator } from '@services/navigator';
2020
import { makeSingleton } from '@singletons';
2121
import { AddonBlog } from '../blog';
22+
import { ADDONS_BLOG_USER_MENU_FEATURE_NAME } from '@addons/blog/constants';
2223

2324
/**
2425
* Handler to treat links to edit blog entry page.
@@ -27,7 +28,7 @@ import { AddonBlog } from '../blog';
2728
export class AddonBlogEditEntryLinkHandlerService extends CoreContentLinksHandlerBase {
2829

2930
name = 'AddonBlogEditEntryLinkHandler';
30-
featureName = 'CoreUserDelegate_AddonBlog:blogs';
31+
featureName = ADDONS_BLOG_USER_MENU_FEATURE_NAME;
3132
pattern = /\/blog\/(add|edit)\.php/;
3233

3334
/**

src/addons/blog/services/handlers/index-link.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
1919
import { CoreNavigator } from '@services/navigator';
2020
import { makeSingleton } from '@singletons';
2121
import { AddonBlog } from '../blog';
22+
import { ADDONS_BLOG_USER_MENU_FEATURE_NAME } from '@addons/blog/constants';
2223

2324
/**
2425
* Handler to treat links to blog page.
@@ -27,7 +28,7 @@ import { AddonBlog } from '../blog';
2728
export class AddonBlogIndexLinkHandlerService extends CoreContentLinksHandlerBase {
2829

2930
name = 'AddonBlogIndexLinkHandler';
30-
featureName = 'CoreUserDelegate_AddonBlog:blogs';
31+
featureName = ADDONS_BLOG_USER_MENU_FEATURE_NAME;
3132
pattern = /\/blog\/index\.php/;
3233

3334
/**

src/addons/blog/services/handlers/user.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ import { CoreNavigator } from '@services/navigator';
2323
import { CoreSites } from '@services/sites';
2424
import { makeSingleton } from '@singletons';
2525
import { AddonBlog } from '../blog';
26-
import { ADDONS_BLOG_COMPONENT_NAME } from '@addons/blog/constants';
26+
import {
27+
ADDONS_BLOG_ACCOUNT_FEATURE_NAME,
28+
ADDONS_BLOG_USER_MENU_FEATURE_NAME,
29+
ADDONS_BLOG_COMPONENT_NAME,
30+
} from '@addons/blog/constants';
2731

2832
/**
2933
* Profile item handler.
@@ -53,10 +57,10 @@ export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
5357
}
5458

5559
if (context === CoreUserDelegateContext.USER_MENU) {
56-
if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBlog:account')) {
60+
if (currentSite.isFeatureDisabled(ADDONS_BLOG_ACCOUNT_FEATURE_NAME)) {
5761
return false;
5862
}
59-
} else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBlog:blogs')) {
63+
} else if (currentSite.isFeatureDisabled(ADDONS_BLOG_USER_MENU_FEATURE_NAME)) {
6064
return false;
6165
}
6266

src/addons/competency/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export const ADDON_COMPETENCY_COMPETENCIES_PAGE = 'competencies';
1919
export const ADDON_COMPETENCY_SUMMARY_PAGE = 'summary';
2020

2121
export const ADDONS_COMPETENCY_COMPONENT_NAME = 'AddonCompetency';
22-
export const ADDONS_COMPETENCY_USER_MENU_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_COMPETENCY_COMPONENT_NAME}`;
22+
export const ADDONS_COMPETENCY_ACCOUNT_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_COMPETENCY_COMPONENT_NAME}`;
23+
export const ADDONS_COMPETENCY_USER_MENU_FEATURE_NAME = `${ADDONS_COMPETENCY_ACCOUNT_FEATURE_NAME}:learningPlan`;
2324

2425
/**
2526
* Learning plan status.

src/addons/competency/services/competency.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { CoreTextFormat } from '@singletons/text';
2525
import {
2626
AddonCompetencyLearningPlanStatus,
2727
AddonCompetencyReviewStatus,
28-
ADDONS_COMPETENCY_USER_MENU_FEATURE_NAME,
28+
ADDONS_COMPETENCY_ACCOUNT_FEATURE_NAME,
2929
} from '../constants';
3030
import { CoreCourseSummaryExporterData } from '@features/courses/services/courses';
3131

@@ -51,7 +51,7 @@ export class AddonCompetencyProvider {
5151
}
5252

5353
return site.canUseAdvancedFeature('enablecompetencies') &&
54-
!(site.isFeatureDisabled(ADDONS_COMPETENCY_USER_MENU_FEATURE_NAME) &&
54+
!(site.isFeatureDisabled(ADDONS_COMPETENCY_ACCOUNT_FEATURE_NAME) &&
5555
site.isFeatureDisabled('CoreCourseOptionsDelegate_AddonCompetency'));
5656
}
5757

0 commit comments

Comments
 (0)