Merge pull request #1924 from crazyserver/MOBILE-3035

Mobile 3035

scripts/langindex.json

@@ -1710,6 +1710,7 @@
   "core.settings.privacypolicy": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
   "core.settings.reportinbackground": "local_moodlemobileapp",
+  "core.settings.entriesincache": "local_moodlemobileapp",
   "core.settings.settings": "moodle",
   "core.settings.showdownloadoptions": "local_moodlemobileapp",
   "core.settings.sites": "moodle",

src/assets/lang/en.json

@@ -1680,7 +1680,7 @@
     "core.settings.currentlanguage": "Current language",
     "core.settings.debugdisplay": "Display debug messages",
     "core.settings.debugdisplaydescription": "If enabled, error modals will display more data about the error if possible.",
-    "core.settings.deletesitefiles": "Are you sure that you want to delete the downloaded files from the site '{{sitename}}'?",
+    "core.settings.deletesitefiles": "Are you sure that you want to delete the downloaded files and cached data from the site '{{sitename}}'? You won't be able to use the app in offline mode.",
     "core.settings.deletesitefilestitle": "Delete site files",
     "core.settings.deviceinfo": "Device info",
     "core.settings.deviceos": "Device OS",
@@ -1692,6 +1692,7 @@
     "core.settings.enablerichtexteditor": "Enable text editor",
     "core.settings.enablerichtexteditordescription": "If enabled, a text editor will be available when entering content.",
     "core.settings.enablesyncwifi": "Allow sync only when on Wi-Fi",
+    "core.settings.entriesincache": "{{$a}} entries in cache",
     "core.settings.errordeletesitefiles": "Error deleting site files.",
     "core.settings.errorsyncsite": "Error synchronising site data. Please check your Internet connection and try again.",
     "core.settings.estimatedfreespace": "Estimated free space",

src/components/ion-tabs/ion-tabs.scss

@@ -5,14 +5,13 @@ ion-app.app-root core-ion-tabs {
         z-index: 101; // For some reason, the regular z-index isn't enough with our tabs, use a higher one.
 
         .core-ion-tabs-loading {
+            height: 100%;
             width: 100%;
-            display: table;
+            display: flex;
+            align-items: center;
+            justify-content: center;
 
             .core-ion-tabs-loading-spinner {
-                display: table-cell;
-                text-align: center;
-                vertical-align: middle;
-
                 .spinner circle, .spinner line {
                     stroke: $white;
                 }

src/core/mainmenu/pages/menu/menu.scss

@@ -1,4 +1,10 @@
 ion-app.app-root page-core-mainmenu {
+    ion-icon {
+        text-overflow: unset;
+        overflow: visible;
+        text-align: center;
+    }
+
     .ion-md-fa-graduation-cap,
     .ion-ios-fa-graduation-cap,
     .ion-ios-fa-graduation-cap-outline,
@@ -8,6 +14,7 @@ ion-app.app-root page-core-mainmenu {
         @extend .fa;
         font-size: 21px;
         height: 21px;
+
     }
 
     .ion-ios-fa-graduation-cap-outline {

src/core/settings/lang/en.json

@@ -12,7 +12,7 @@
     "currentlanguage": "Current language",
     "debugdisplay": "Display debug messages",
     "debugdisplaydescription": "If enabled, error modals will display more data about the error if possible.",
-    "deletesitefiles": "Are you sure that you want to delete the downloaded files from the site '{{sitename}}'?",
+    "deletesitefiles": "Are you sure that you want to delete the downloaded files and cached data from the site '{{sitename}}'? You won't be able to use the app in offline mode.",
     "deletesitefilestitle": "Delete site files",
     "deviceinfo": "Device info",
     "deviceos": "Device OS",
@@ -42,6 +42,7 @@
     "privacypolicy": "Privacy policy",
     "pushid": "Push notifications ID",
     "reportinbackground": "Report errors automatically",
+    "entriesincache": "{{$a}} entries in cache",
     "settings": "Settings",
     "showdownloadoptions": "Show download options",
     "sites": "Sites",

src/core/settings/pages/space-usage/space-usage.html

@@ -9,16 +9,22 @@
     </ion-refresher>
     <core-loading [hideUntil]="usageLoaded">
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId">
-            <h2><core-format-text [text]="site.siteName"></core-format-text></h2>
+            <h2 text-wrap><core-format-text [text]="site.siteName"></core-format-text></h2>
-            <p>{{ site.fullName }}</p>
+            <p text-wrap>{{ site.fullName }}</p>
-            <p item-end>{{ site.spaceUsage | coreBytesToSize }}</p>
+            <div item-end>
-            <button ion-button icon-only clear color="danger" item-end (click)="deleteSiteFiles(site)" [hidden]="!site.spaceUsage > '0'" [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
+                <p>{{ site.spaceUsage | coreBytesToSize }}</p>
+                <p>{{ 'core.settings.entriesincache' | translate: { $a: site.cacheEntries } }}</p>
+            </div>
+            <button ion-button icon-only clear color="danger" item-end (click)="deleteSiteStorage(site)" [hidden]="!site.spaceUsage > '0' && !site.cacheEntries > '0'" [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
                 <ion-icon name="trash"></ion-icon>
             </button>
         </ion-item>
         <ion-item-divider>
             <p>{{ 'core.settings.total' | translate }}</p>
-            <p item-end>{{ totalUsage | coreBytesToSize }}</p>
+            <div item-end>
+                <p>{{ totalUsage | coreBytesToSize }}</p>
+                <p>{{ 'core.settings.entriesincache' | translate: { $a: totalEntries } }}</p>
+            </div>
         </ion-item-divider>
     </core-loading>
 </ion-content>

src/core/settings/pages/space-usage/space-usage.ts

@@ -35,6 +35,7 @@ export class CoreSettingsSpaceUsagePage {
     sites = [];
     currentSiteId = '';
     totalUsage = 0;
+    totalEntries = 0;
 
     constructor(private filePoolProvider: CoreFilepoolProvider,
             private sitesProvider: CoreSitesProvider, private textUtils: CoreTextUtilsProvider,
@@ -63,9 +64,17 @@ export class CoreSettingsSpaceUsagePage {
             // Get space usage.
             const promises = this.sites.map((siteEntry) => {
                 return this.sitesProvider.getSite(siteEntry.id).then((site) => {
-                    return site.getSpaceUsage().then((size) => {
+                    const proms2 = [];
+
+                    proms2.push(this.calcSiteClearRows(site).then((rows) => {
+                        siteEntry.cacheEntries = rows;
+                    }));
+
+                    proms2.push(site.getSpaceUsage().then((size) => {
                         siteEntry.spaceUsage = size;
-                    });
+                    }));
+
+                    return Promise.all(proms2);
                 });
             });
 
@@ -77,13 +86,14 @@ export class CoreSettingsSpaceUsagePage {
      * Convenience function to calculate total usage.
      */
     protected calculateTotalUsage(): void {
-        let total = 0;
+        let totalSize = 0,
+            totalEntries = 0;
         this.sites.forEach((site) => {
-            if (site.spaceUsage) {
+            totalSize += (site.spaceUsage ? parseInt(site.spaceUsage, 10) : 0);
-                total += parseInt(site.spaceUsage, 10);
+            totalEntries += (site.cacheEntries ? parseInt(site.cacheEntries, 10) : 0);
-            }
         });
-        this.totalUsage = total;
+        this.totalUsage = totalSize;
+        this.totalEntries = totalEntries;
     }
 
     /**
@@ -123,11 +133,33 @@ export class CoreSettingsSpaceUsagePage {
     }
 
     /**
-     * Deletes files of a site.
+     * Calculate the number of rows to be deleted on a site.
+     *
+     * @param  {any}             site Site object.
+     * @return {Promise<number>}      If there are rows to delete or not.
+     */
+    protected calcSiteClearRows(site: any): Promise<number> {
+        const clearTables = this.sitesProvider.getSiteTableSchemasToClear();
+
+        let totalEntries = 0;
+
+        const promises = clearTables.map((name) => {
+            return site.getDb().countRecords(name).then((rows) => {
+                totalEntries += rows;
+            });
+        });
+
+        return Promise.all(promises).then(() => {
+            return totalEntries;
+        });
+    }
+
+    /**
+     * Deletes files of a site and the tables that can be cleared.
      *
      * @param {any} siteData Site object with space usage.
      */
-    deleteSiteFiles(siteData: any): void {
+    deleteSiteStorage(siteData: any): void {
         this.textUtils.formatText(siteData.siteName).then((siteName) => {
             const title = this.translate.instant('core.settings.deletesitefilestitle');
             const message = this.translate.instant('core.settings.deletesitefiles', {sitename: siteName});
@@ -135,7 +167,14 @@ export class CoreSettingsSpaceUsagePage {
             this.domUtils.showConfirm(message, title).then(() => {
                 return this.sitesProvider.getSite(siteData.id);
             }).then((site) => {
-                site.deleteFolder().then(() => {
+
+                // Clear cache tables.
+                const cleanSchemas = this.sitesProvider.getSiteTableSchemasToClear();
+                const promises = cleanSchemas.map((name) => {
+                    return site.getDb().deleteRecords(name);
+                });
+
+                promises.push(site.deleteFolder().then(() => {
                     this.filePoolProvider.clearAllPackagesStatus(site.id);
                     this.filePoolProvider.clearFilepool(site.id);
                     this.updateSiteUsage(siteData, 0);
@@ -151,7 +190,13 @@ export class CoreSettingsSpaceUsagePage {
                             this.updateSiteUsage(siteData, size);
                         });
                     }
+                }).finally(() => {
+                    this.calcSiteClearRows(site).then((rows) => {
+                        siteData.cacheEntries = rows;
                     });
+                }));
+
+                return Promise.all(promises);
             }).catch(() => {
                 // Ignore cancelled confirmation modal.
             });

src/core/user/providers/user.ts

@@ -36,6 +36,7 @@ export class CoreUserProvider {
     protected siteSchema: CoreSiteSchema = {
         name: 'CoreUserProvider',
         version: 1,
+        canBeCleared: [ this.USERS_TABLE ],
         tables: [
             {
                 name: this.USERS_TABLE,
@@ -53,7 +54,7 @@ export class CoreUserProvider {
                         name: 'profileimageurl',
                         type: 'TEXT'
                     }
-                ]
+                ],
             }
         ]
     };

src/providers/filepool.ts

@@ -306,7 +306,7 @@ export class CoreFilepoolProvider {
             primaryKeys: ['siteId', 'fileId']
         }
     ];
-    protected siteSchma: CoreSiteSchema = {
+    protected siteSchema: CoreSiteSchema = {
         name: 'CoreFilepoolProvider',
         version: 1,
         tables: [
@@ -447,7 +447,7 @@ export class CoreFilepoolProvider {
         this.appDB = this.appProvider.getDB();
         this.appDB.createTablesFromSchema(this.appTablesSchema);
 
-        this.sitesProvider.registerSiteSchema(this.siteSchma);
+        this.sitesProvider.registerSiteSchema(this.siteSchema);
 
         initDelegate.ready().then(() => {
             // Waiting for the app to be ready to start processing the queue.
@@ -857,7 +857,10 @@ export class CoreFilepoolProvider {
      */
     clearFilepool(siteId: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
-            return db.deleteRecords(this.FILES_TABLE);
+            return Promise.all([
+                db.deleteRecords(this.FILES_TABLE),
+                db.deleteRecords(this.LINKS_TABLE)
+            ]);
         });
     }
 

src/providers/sites.ts

@@ -145,6 +145,13 @@ export interface CoreSiteSchema {
      */
     version: number;
 
+    /**
+     * Names of the tables of the site schema that can be cleared.
+     *
+     * @type {string[]}
+     */
+    canBeCleared?: string[];
+
     /**
      * Tables to create when installing or upgrading the schema.
      */
@@ -270,6 +277,7 @@ export class CoreSitesProvider {
     protected siteSchema: CoreSiteSchema = {
         name: 'CoreSitesProvider',
         version: 1,
+        canBeCleared: [ CoreSite.WS_CACHE_TABLE ],
         tables: [
             {
                 name: CoreSite.WS_CACHE_TABLE,
@@ -1521,4 +1529,20 @@ export class CoreSitesProvider {
             return result;
         });
     }
+
+    /**
+     * Returns the Site Schema names that can be cleared on space storage.
+     *
+     * @return {string[]} Name of the site schemas.
+     */
+    getSiteTableSchemasToClear(): string[] {
+        let reset = [];
+        for (const name in this.siteSchemas) {
+            if (this.siteSchemas[name].canBeCleared) {
+                reset = reset.concat(this.siteSchemas[name].canBeCleared);
+            }
+        }
+
+        return reset;
+    }
 }