Merge pull request #4674 from crazyserver/MOBILE-4974

Mobile 4974

Author: dpalou

.github/workflows/acceptance.yml

@@ -222,18 +222,13 @@ jobs:
 
     complete:
         runs-on: ubuntu-latest
-        needs: [behat]
+        needs: behat
 
         steps:
-            - uses: actions/download-artifact@v4
-              with:
-                  path: artifacts
-
-            - name: Check failure artifacts
+            - uses: technote-space/workflow-conclusion-action@v3
+            - name: Check job status and fail if they are red
+              if: env.WORKFLOW_CONCLUSION == 'failure'
               run: |
-                  rm ./artifacts/build -rf
-                  if [ -n "$(ls -A ./artifacts)" ]; then
-                    echo "There were some failures in the previous jobs"
-                    echo "### ❌ There were some failures in the previous jobs" >> $GITHUB_STEP_SUMMARY
-                    exit 1
-                  fi
+                  echo "There were some failures in the previous jobs"
+                  echo "### ❌ There were some failures in the previous jobs" >> $GITHUB_STEP_SUMMARY
+                  exit 1

.github/workflows/docker.yml

@@ -2,8 +2,8 @@ name: Docker Build and Test
 
 on:
   push:
-    branches: [main, freemium-*, workplace-main]
-    tags: ["v*.x", "freemium-*", "workplace-*"]
+    branches: [main, latest]
+    tags: ["v*.x"]
   workflow_dispatch:
 
 concurrency:
@@ -13,13 +13,14 @@ concurrency:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    if: github.repository == 'moodlehq/moodleapp'
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Build and push
+      - name: Test build
         uses: docker/build-push-action@v6
         with:
           path: app

.github/workflows/testing.yml

@@ -87,3 +87,14 @@ jobs:
             echo "❌ Static initialization blocks are not supported in Chrome 93 and iOS 15." >> $GITHUB_STEP_SUMMARY
             exit 1
           fi
+
+      - name: Check .feature files all have @app_parallel_run_ prefixed tag
+        run: |
+          missing_tags=$(grep -L -E '^@app_parallel_run_' **/*.feature || true)
+          if [ -n "$missing_tags" ]; then
+            echo "::error::The following .feature files are missing the @app_parallel_run_ prefixed tag:"
+            echo "$missing_tags"
+            echo "❌ The following .feature files are missing the @app_parallel_run_ prefixed tag:" >> $GITHUB_STEP_SUMMARY
+            echo "$missing_tags" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi

src/addons/block/myoverview/components/myoverview/myoverview.ts

@@ -44,6 +44,7 @@ import {
 } from '@features/courses/constants';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { Translate } from '@singletons';
+import { CoreCourseDownloadStatusIcon } from '@features/course/constants';
 
 const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] =
     ['all', 'inprogress', 'future', 'past', 'favourite', 'allincludinghidden', 'hidden', 'custom'];
@@ -65,7 +66,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     filteredCourses: CoreEnrolledCourseDataWithExtraInfoAndOptions[] = [];
 
     prefetchCoursesData: CorePrefetchStatusInfo = {
-        icon: '',
+        icon: CoreCourseDownloadStatusIcon.NOT_DOWNLOADABLE,
         statusTranslatable: 'core.loading',
         status: DownloadStatus.DOWNLOADABLE_NOT_DOWNLOADED,
         loading: true,

src/addons/blog/pages/index/index.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ContextLevel, CoreConstants } from '@/core/constants';
+import { ContextLevel, CoreSyncIcon } from '@/core/constants';
 import {
     ADDON_BLOG_AUTO_SYNCED,
     ADDON_BLOG_ENTRY_UPDATED,
@@ -92,7 +92,7 @@ export default class AddonBlogIndexPage implements OnInit, OnDestroy {
     readonly hasOfflineDataToSync = signal(false);
     readonly isOnline = CoreNetwork.onlineSignal;
     siteId: string;
-    syncIcon = CoreConstants.ICON_SYNC;
+    syncIcon = CoreSyncIcon.SYNC;
     readonly syncHidden = computed(() => !this.loaded() || !this.isOnline() || !this.hasOfflineDataToSync());
 
     constructor() {

src/addons/calendar/components/upcoming-events/upcoming-events.ts

@@ -33,7 +33,7 @@ import {
 import { AddonCalendarHelper, AddonCalendarFilter } from '../../services/calendar-helper';
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { CoreCategoryData, CoreCourses } from '@features/courses/services/courses';
-import { CoreConstants } from '@/core/constants';
+import { CoreTimeConstants } from '@/core/constants';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreUrl } from '@singletons/url';
 import { CoreTime } from '@singletons/time';
@@ -290,7 +290,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
         }
 
         const start = CoreTime.timestamp();
-        const end = start + (CoreConstants.SECONDS_DAY * this.lookAhead);
+        const end = start + (CoreTimeConstants.SECONDS_DAY * this.lookAhead);
         let result: AddonCalendarEventToDisplay[] = this.onlineEvents;
 
         if (this.deletedEvents.length) {

src/addons/calendar/pages/day/day.ts

@@ -32,7 +32,7 @@ import { Translate } from '@singletons';
 import { CoreNavigator } from '@services/navigator';
 import { Params } from '@angular/router';
 import { CoreArray } from '@singletons/array';
-import { CoreConstants } from '@/core/constants';
+import { CoreSyncIcon } from '@/core/constants';
 import { CoreSwipeSlidesDynamicItemsManager } from '@classes/items-management/swipe-slides-dynamic-items-manager';
 import { CoreSwipeSlidesComponent } from '@components/swipe-slides/swipe-slides';
 import {
@@ -88,7 +88,7 @@ export default class AddonCalendarDayPage implements OnInit, OnDestroy {
     manager?: CoreSwipeSlidesDynamicItemsManager<PreloadedDay, AddonCalendarDaySlidesItemsManagerSource>;
     loaded = false;
     readonly isOnline = CoreNetwork.onlineSignal;
-    syncIcon = CoreConstants.ICON_LOADING;
+    syncIcon = CoreSyncIcon.LOADING;
     filter: AddonCalendarFilter = {
         filtered: false,
         courseId: undefined,
@@ -259,7 +259,7 @@ export default class AddonCalendarDayPage implements OnInit, OnDestroy {
      * @returns Promise resolved when done.
      */
     async fetchData(sync?: boolean): Promise<void> {
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         if (sync) {
             await this.sync();
@@ -276,7 +276,7 @@ export default class AddonCalendarDayPage implements OnInit, OnDestroy {
         }
 
         this.loaded = true;
-        this.syncIcon = CoreConstants.ICON_SYNC;
+        this.syncIcon = CoreSyncIcon.SYNC;
     }
 
     /**
@@ -317,7 +317,7 @@ export default class AddonCalendarDayPage implements OnInit, OnDestroy {
      * @returns Promise resolved when done.
      */
     async refreshData(sync?: boolean, afterChange?: boolean): Promise<void> {
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         const selectedDay = this.manager?.getSelectedItem() || null;
 

src/addons/calendar/pages/event/event.ts

@@ -31,7 +31,7 @@ import { Subscription } from 'rxjs';
 import { CoreNavigator } from '@services/navigator';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { CoreConstants } from '@/core/constants';
+import { CoreConfigSettingKey, CoreSyncIcon } from '@/core/constants';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { AddonCalendarEventsSource } from '@addons/calendar/classes/events-source';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
@@ -97,7 +97,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
     canEdit = false;
     hasOffline = false;
     readonly isOnline = CoreNetwork.onlineSignal;
-    syncIcon = CoreConstants.ICON_LOADING; // Sync icon.
+    syncIcon = CoreSyncIcon.LOADING; // Sync icon.
     canScheduleExactAlarms = true;
     scheduleExactWarningHidden = false;
 
@@ -174,7 +174,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
      * Check if the app can schedule exact alarms.
      */
     protected async checkExactAlarms(): Promise<void> {
-        this.scheduleExactWarningHidden = !!(await CoreConfig.get(CoreConstants.DONT_SHOW_EXACT_ALARMS_WARNING, 0));
+        this.scheduleExactWarningHidden = !!(await CoreConfig.get(CoreConfigSettingKey.DONT_SHOW_EXACT_ALARMS_WARNING, 0));
         this.canScheduleExactAlarms = await CoreLocalNotifications.canScheduleExactAlarms();
     }
 
@@ -192,7 +192,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
             return;
         }
 
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         await this.initializeSwipeManager();
         await this.fetchEvent();
@@ -317,7 +317,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
         }
 
         this.eventLoaded = true;
-        this.syncIcon = CoreConstants.ICON_SYNC;
+        this.syncIcon = CoreSyncIcon.SYNC;
     }
 
     /**
@@ -466,7 +466,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
      * @returns Promise resolved when done.
      */
     async refreshEvent(sync = false, showErrors = false): Promise<void> {
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         const promises: Promise<void>[] = [];
 
@@ -664,7 +664,7 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
      * Hide alarm warning.
      */
     hideAlarmWarning(): void {
-        CoreConfig.set(CoreConstants.DONT_SHOW_EXACT_ALARMS_WARNING, 1);
+        CoreConfig.set(CoreConfigSettingKey.DONT_SHOW_EXACT_ALARMS_WARNING, 1);
         this.scheduleExactWarningHidden = true;
     }
 

src/addons/calendar/pages/index/index.ts

@@ -27,7 +27,7 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { AddonCalendarCalendarComponent } from '../../components/calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events';
 import { CoreNavigator } from '@services/navigator';
-import { CoreConstants } from '@/core/constants';
+import { CoreSyncIcon } from '@/core/constants';
 import { CoreModals } from '@services/overlays/modals';
 import {
     ADDON_CALENDAR_AUTO_SYNCED,
@@ -82,7 +82,7 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
     loaded = false;
     hasOffline = false;
     readonly isOnline = CoreNetwork.onlineSignal;
-    syncIcon = CoreConstants.ICON_LOADING;
+    syncIcon = CoreSyncIcon.LOADING;
     showCalendar = true;
     loadUpcoming = false;
     filter: AddonCalendarFilter = {
@@ -198,7 +198,7 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
      */
     async fetchData(sync?: boolean, showErrors?: boolean): Promise<void> {
 
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         let refreshComponent = false;
 
@@ -265,7 +265,7 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
 
         this.loaded = true;
         this.initialized = true;
-        this.syncIcon = CoreConstants.ICON_SYNC;
+        this.syncIcon = CoreSyncIcon.SYNC;
     }
 
     /**
@@ -296,7 +296,7 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * @returns Promise resolved when done.
      */
     async refreshData(sync = false, showErrors = false, afterChange = false): Promise<void> {
-        this.syncIcon = CoreConstants.ICON_LOADING;
+        this.syncIcon = CoreSyncIcon.LOADING;
 
         const promises: Promise<void>[] = [];
 

src/addons/calendar/services/calendar-helper.ts

@@ -27,7 +27,7 @@ import {
 import { CoreConfig } from '@services/config';
 import { CoreObject } from '@singletons/object';
 import { CoreCourseModuleHelper } from '@features/course/services/course-module-helper';
-import { ContextLevel, CoreConstants } from '@/core/constants';
+import { ContextLevel, CoreTimeConstants } from '@/core/constants';
 import { dayjs, Dayjs } from '@/core/utils/dayjs';
 import { makeSingleton } from '@singletons';
 import { AddonCalendarOfflineEventDBRecord } from './database/calendar-offline';
@@ -261,7 +261,7 @@ export class AddonCalendarHelperProvider {
         if (eventFormatted.duration == 1) {
             eventFormatted.timeduration = (event.timedurationuntil || 0) - event.timestart;
         } else if (eventFormatted.duration == 2) {
-            eventFormatted.timeduration = (event.timedurationminutes || 0) * CoreConstants.SECONDS_MINUTE;
+            eventFormatted.timeduration = (event.timedurationminutes || 0) * CoreTimeConstants.SECONDS_MINUTE;
         } else {
             eventFormatted.timeduration = 0;
         }
@@ -632,8 +632,8 @@ export class AddonCalendarHelperProvider {
                 fetchTimestarts.push(eventData.timestart);
 
                 for (let i = 1; i < eventData.repeated; i++) {
-                    invalidateTimestarts.push(eventData.timestart + CoreConstants.SECONDS_DAY * 7 * i);
-                    invalidateTimestarts.push(eventData.timestart - CoreConstants.SECONDS_DAY * 7 * i);
+                    invalidateTimestarts.push(eventData.timestart + CoreTimeConstants.SECONDS_DAY * 7 * i);
+                    invalidateTimestarts.push(eventData.timestart - CoreTimeConstants.SECONDS_DAY * 7 * i);
                 }
 
                 // Get the repeated events to invalidate them.
@@ -651,7 +651,7 @@ export class AddonCalendarHelperProvider {
             fetchTimestarts.push(time);
 
             while (eventData.repeated > 1) {
-                time += CoreConstants.SECONDS_DAY * 7;
+                time += CoreTimeConstants.SECONDS_DAY * 7;
                 eventData.repeated--;
                 invalidateTimestarts.push(time);
             }