Merge pull request #4607 from crazyserver/MOBILE-4912

MOBILE-4912 menu: Allow to indicate the order preference for the different elements in the main bottom tabs menu

Author: dpalou

local_moodleappbehat/tests/behat/behat_app.php

@@ -1373,4 +1373,28 @@ public function i_wait_toast_to_dismiss_in_the_app() {
         $this->runtime_js('waitToastDismiss()');
     }
 
+
+    /**
+     * Override app environment variables.
+     *
+     * @Given /^the environment config is patched with:$/
+     * @param TableNode $data Table data
+     */
+    public function the_environment_config_is_patched_with(TableNode $data) {
+        $overrides = [];
+        foreach ($data->getRows() as $row) {
+            $name = $row[0];
+            $value = json_decode($this->replace_wwwroot($row[1]));
+            $overrides[$name] = $value;
+        }
+
+        $json = json_encode($overrides);
+
+        $result = $this->zone_js("patchEnvironment($json)");
+
+        if ($result !== 'OK') {
+            throw new DriverException('Error patching environment - ' . $result);
+        }
+    }
+
 }

src/addons/badges/constants.ts

@@ -0,0 +1,20 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { CORE_USER_FEATURE_PREFIX } from '@features/user/constants';
+
+export const ADDONS_BADGES_COMPONENT_NAME = 'AddonBadges';
+
+export const ADDONS_BADGES_USER_PROFILE_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_BADGES_COMPONENT_NAME}`;
+export const ADDONS_BADGES_USER_MENU_FEATURE_NAME = `${ADDONS_BADGES_USER_PROFILE_FEATURE_NAME}:account`;

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

@@ -18,6 +18,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonBadges } from '../badges';
+import { ADDONS_BADGES_USER_PROFILE_FEATURE_NAME } from '@addons/badges/constants';
 
 /**
  * Handler to treat links to user badges page.
@@ -26,7 +27,7 @@ import { AddonBadges } from '../badges';
 export class AddonBadgesMyBadgesLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonBadgesMyBadgesLinkHandler';
-    featureName = 'CoreUserDelegate_AddonBadges';
+    featureName = ADDONS_BADGES_USER_PROFILE_FEATURE_NAME;
     pattern = /\/badges\/mybadges\.php/;
 
     /**

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

@@ -22,6 +22,7 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
 import { CoreNavigator } from '@services/navigator';
 import { AddonBadgesHelper } from '../badges-helper';
 import { CorePromiseUtils } from '@singletons/promise-utils';
+import { ADDONS_BADGES_USER_PROFILE_FEATURE_NAME } from '@addons/badges/constants';
 
 /**
  * Handler for badges push notifications clicks.
@@ -31,7 +32,7 @@ export class AddonBadgesPushClickHandlerService implements CorePushNotifications
 
     name = 'AddonBadgesPushClickHandler';
     priority = 200;
-    featureName = 'CoreUserDelegate_AddonBadges';
+    featureName = ADDONS_BADGES_USER_PROFILE_FEATURE_NAME;
 
     /**
      * @inheritdoc

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

@@ -24,6 +24,11 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
 import { AddonBadges } from '../badges';
+import {
+    ADDONS_BADGES_USER_MENU_FEATURE_NAME,
+    ADDONS_BADGES_COMPONENT_NAME,
+    ADDONS_BADGES_USER_PROFILE_FEATURE_NAME,
+} from '@addons/badges/constants';
 
 /**
  * Profile badges handler.
@@ -32,7 +37,8 @@ import { AddonBadges } from '../badges';
 export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
 
     readonly type = CoreUserProfileHandlerType.LIST_ITEM;
-    name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
+    // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
+    name = `${ADDONS_BADGES_COMPONENT_NAME}:fakename`;
     priority = 300;
 
     /**
@@ -57,10 +63,10 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
         }
 
         if (context === CoreUserDelegateContext.USER_MENU) {
-            if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges:account')) {
+            if (currentSite.isFeatureDisabled(ADDONS_BADGES_USER_MENU_FEATURE_NAME)) {
                 return false;
             }
-        } else if (currentSite.isFeatureDisabled('CoreUserDelegate_AddonBadges')) {
+        } else if (currentSite.isFeatureDisabled(ADDONS_BADGES_USER_PROFILE_FEATURE_NAME)) {
             return false;
         }
 

src/addons/block/globalsearch/services/block-handler.ts

@@ -17,7 +17,7 @@ import { CoreBlockHandlerData } from '@features/block/services/block-delegate';
 import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler';
 import { makeSingleton } from '@singletons';
 import { CoreCourseBlock } from '@features/course/services/course';
-import { CORE_SEARCH_PAGE_NAME } from '@features/search/services/handlers/mainmenu';
+import { CORE_SEARCH_PAGE_NAME } from '@features/search/constants';
 import { CoreSearchGlobalSearch } from '@features/search/services/global-search';
 import { ContextLevel } from '@/core/constants';
 

src/addons/blog/constants.ts

@@ -12,12 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CORE_USER_FEATURE_PREFIX } from '@features/user/constants';
+
 export const ADDON_BLOG_MAINMENU_PAGE_NAME = 'blog';
 export const ADDON_BLOG_ENTRY_UPDATED = 'blog_entry_updated';
 export const ADDON_BLOG_AUTO_SYNCED = 'addon_blog_autom_synced';
 export const ADDON_BLOG_MANUAL_SYNCED = 'addon_blog_manual_synced';
 export const ADDON_BLOG_SYNC_ID = 'blog';
 
+export const ADDONS_BLOG_COMPONENT_NAME = 'AddonBlog';
+
+const ADDONS_BLOG_GLOBAL_FEATURE_NAME = `${CORE_USER_FEATURE_PREFIX}${ADDONS_BLOG_COMPONENT_NAME}`;
+export const ADDONS_BLOG_USER_MENU_FEATURE_NAME = `${ADDONS_BLOG_GLOBAL_FEATURE_NAME}:account`;
+export const ADDONS_BLOG_USER_PROFILE_FEATURE_NAME = `${ADDONS_BLOG_GLOBAL_FEATURE_NAME}:blogs`;
+
 /**
  * Restriction level of user blog visualization.
  */

src/addons/blog/services/handlers/course-option.ts

@@ -26,15 +26,15 @@ import { CoreSites } from '@services/sites';
 import { CoreWSFile } from '@services/ws';
 import { makeSingleton } from '@singletons';
 import { AddonBlog } from '../blog';
-import { ADDON_BLOG_MAINMENU_PAGE_NAME } from '@addons/blog/constants';
+import { ADDON_BLOG_MAINMENU_PAGE_NAME, ADDONS_BLOG_COMPONENT_NAME } from '@addons/blog/constants';
 
 /**
  * Course nav handler.
  */
 @Injectable({ providedIn: 'root' })
 export class AddonBlogCourseOptionHandlerService implements CoreCourseOptionsHandler {
 
-    name = 'AddonBlog';
+    name = ADDONS_BLOG_COMPONENT_NAME;
     priority = 100;
 
     /**

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

@@ -19,6 +19,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonBlog } from '../blog';
+import { ADDONS_BLOG_USER_PROFILE_FEATURE_NAME } from '@addons/blog/constants';
 
 /**
  * Handler to treat links to edit blog entry page.
@@ -27,7 +28,7 @@ import { AddonBlog } from '../blog';
 export class AddonBlogEditEntryLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonBlogEditEntryLinkHandler';
-    featureName = 'CoreUserDelegate_AddonBlog:blogs';
+    featureName = ADDONS_BLOG_USER_PROFILE_FEATURE_NAME;
     pattern = /\/blog\/(add|edit)\.php/;
 
     /**

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

@@ -19,6 +19,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { AddonBlog } from '../blog';
+import { ADDONS_BLOG_USER_PROFILE_FEATURE_NAME } from '@addons/blog/constants';
 
 /**
  * Handler to treat links to blog page.
@@ -27,7 +28,7 @@ import { AddonBlog } from '../blog';
 export class AddonBlogIndexLinkHandlerService extends CoreContentLinksHandlerBase {
 
     name = 'AddonBlogIndexLinkHandler';
-    featureName = 'CoreUserDelegate_AddonBlog:blogs';
+    featureName = ADDONS_BLOG_USER_PROFILE_FEATURE_NAME;
     pattern = /\/blog\/index\.php/;
 
     /**