diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html index 0e1371d15..0a58d8fee 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html @@ -10,12 +10,31 @@ + + + + {{ 'addon.storagemanager.info' | translate }} + + + +

{{ 'core.settings.spaceusage' | translate }}

+ {{ spaceUsage.spaceUsage | coreBytesToSize }} +

+ {{ 'core.settings.spaceusagehelp' | translate }} +

+
+ + + +
+
+ -

{{ 'addon.storagemanager.info' | translate }}

{{ 'core.courses.courses' | translate }} -

{{ 'addon.storagemanager.storageused' | translate }}

{{ totalSize | coreBytesToSize }} @@ -28,10 +47,11 @@
+ - +

{{ course.title }}

diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts index cd46c3c1e..300e9f16c 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts @@ -18,6 +18,7 @@ import { CoreCourse, CoreCourseProvider } from '@features/course/services/course import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate'; import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses'; +import { CoreSettingsHelper, CoreSiteSpaceUsage } from '@features/settings/services/settings-helper'; import { CoreSiteHome } from '@features/sitehome/services/sitehome'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; @@ -41,8 +42,17 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy completelyDownloadedCourses: DownloadedCourse[] = []; totalSize = 0; loaded = false; + spaceUsage: CoreSiteSpaceUsage = { + cacheEntries: 0, + spaceUsage: 0, + }; courseStatusObserver?: CoreEventObserver; + siteId: string; + + constructor() { + this.siteId = CoreSites.getCurrentSiteId(); + } /** * @inheritdoc @@ -77,6 +87,8 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy } } + this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId); + this.setDownloadedCourses(downloadedCourses); this.loaded = true; @@ -227,6 +239,21 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy CoreNavigator.navigateToSitePath('/storage/' + courseId, { params: { title } }); } + /** + * Deletes files of a site and the tables that can be cleared. + * + * @param siteData Site object with space usage. + */ + async deleteSiteStorage(): Promise { + try { + const siteName = CoreSites.getRequiredCurrentSite().getSiteName(); + + this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId); + } catch { + // Ignore cancelled confirmation modal. + } + } + } /** diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html index 24043ef35..0470d5026 100644 --- a/src/core/features/settings/pages/site/site.html +++ b/src/core/features/settings/pages/site/site.html @@ -27,28 +27,15 @@ + - - -

{{ 'core.settings.spaceusage' | translate }}

-

{{ spaceUsage.spaceUsage | coreBytesToSize }}

-
- - - - - - -

{{ 'core.settings.synchronizenow' | translate }}

+

+ {{ 'core.settings.synchronizenowhelp' | translate }} +

- - - diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts index 4fc275b2e..c2659848f 100644 --- a/src/core/features/settings/pages/site/site.ts +++ b/src/core/features/settings/pages/site/site.ts @@ -18,15 +18,13 @@ import { IonRefresher } from '@ionic/angular'; import { CoreSettingsHandlerToDisplay } from '../../services/settings-delegate'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreSites } from '@services/sites'; -import { CoreDomUtils } from '@services/utils/dom'; -import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper'; -import { CoreApp } from '@services/app'; -import { Translate } from '@singletons'; import { CoreNavigator } from '@services/navigator'; import { CoreSplitViewComponent } from '@components/split-view/split-view'; import { CoreListItemsManager } from '@classes/items-management/list-items-manager'; import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker'; import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source'; +import { CoreSettingsHelper } from '@features/settings/services/settings-helper'; +import { CoreDomUtils } from '@services/utils/dom'; /** * Page that displays the list of site settings pages. @@ -41,18 +39,11 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { handlers: CoreListItemsManager; - isIOS: boolean; - siteId: string; - spaceUsage: CoreSiteSpaceUsage = { - cacheEntries: 0, - spaceUsage: 0, - }; - + protected siteId: string; protected sitesObserver: CoreEventObserver; protected isDestroyed = false; constructor() { - this.isIOS = CoreApp.isIOS(); this.siteId = CoreSites.getCurrentSiteId(); const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreSettingsHandlersSource, []); @@ -90,8 +81,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { */ protected async fetchData(): Promise { await this.handlers.load(); - - this.spaceUsage = await CoreSettingsHelper.getSiteSpaceUsage(this.siteId); } /** @@ -131,41 +120,6 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { }); } - /** - * Deletes files of a site and the tables that can be cleared. - * - * @param siteData Site object with space usage. - */ - async deleteSiteStorage(): Promise { - try { - const siteName = CoreSites.getRequiredCurrentSite().getSiteName(); - - this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId); - } catch { - // Ignore cancelled confirmation modal. - } - } - - /** - * Show information about space usage actions. - */ - showSpaceInfo(): void { - CoreDomUtils.showAlert( - Translate.instant('core.help'), - Translate.instant('core.settings.spaceusagehelp'), - ); - } - - /** - * Show information about sync actions. - */ - showSyncInfo(): void { - CoreDomUtils.showAlert( - Translate.instant('core.help'), - Translate.instant('core.settings.synchronizenowhelp'), - ); - } - /** * Page destroyed. */