From b4617580d0e8d3960ad48595fd74979dabd252d4 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Mon, 1 Mar 2021 22:10:16 -0800
Subject: [PATCH] Add decorator for client

---
 .../webapp/src/classes/app-config/index.ts    |   5 +-
 .../client/cache-decorator-client/index.ts    | 113 ++++++++++++++++++
 packages/webapp/src/classes/client/index.ts   |   2 +-
 .../src/classes/client/rest-client/index.ts   |   3 +-
 4 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 packages/webapp/src/classes/client/cache-decorator-client/index.ts

diff --git a/packages/webapp/src/classes/app-config/index.ts b/packages/webapp/src/classes/app-config/index.ts
index 32b2a18b..7524aed4 100644
--- a/packages/webapp/src/classes/app-config/index.ts
+++ b/packages/webapp/src/classes/app-config/index.ts
@@ -1,5 +1,6 @@
 import { sessionExpired } from "../../redux/clientSlice";
 import Client from "../client";
+import CacheDecoratorClient from "../client/cache-decorator-client";
 import MockClient from "../client/mock-client";
 import RestClient from "../client/rest-client";
 
@@ -60,7 +61,9 @@ class _AppConfig {
             console.log('Warning:Service using mockservice client');
             result = new MockClient();
         }
-        return result;
+
+        // Wrap with a cache decorator ...
+        return new CacheDecoratorClient(result);
     }
 }
 const AppConfig = new _AppConfig();
diff --git a/packages/webapp/src/classes/client/cache-decorator-client/index.ts b/packages/webapp/src/classes/client/cache-decorator-client/index.ts
new file mode 100644
index 00000000..5a584dcd
--- /dev/null
+++ b/packages/webapp/src/classes/client/cache-decorator-client/index.ts
@@ -0,0 +1,113 @@
+import Client, {
+    AccountInfo,
+    BasicMapInfo,
+    ChangeHistory,
+    ImportMapInfo,
+    Label,
+    MapInfo,
+    NewUser,
+    Permission,
+} from '..';
+import { LocaleCode } from '../../app-i18n';
+
+class CacheDecoratorClient implements Client {
+    private client: Client;
+
+    constructor(client: Client) {
+        this.client = client;
+    }
+
+    deleteAccount(): Promise<void> {
+        return this.client.deleteAccount();
+    }
+
+    importMap(model: ImportMapInfo): Promise<number> {
+        return this.client.importMap(model);
+    }
+
+    createMap(map: BasicMapInfo): Promise<number> {
+        return this.client.createMap(map);
+    }
+
+    deleteMaps(ids: number[]): Promise<void> {
+        return this.client.deleteMaps(ids);
+    }
+
+    deleteMap(id: number): Promise<void> {
+        return this.client.deleteMap(id);
+    }
+
+    renameMap(id: number, basicInfo: BasicMapInfo): Promise<void> {
+        return this.client.renameMap(id, basicInfo);
+    }
+
+    fetchAllMaps(): Promise<MapInfo[]> {
+        return this.client.fetchAllMaps();
+    }
+
+    fetchMapPermissions(id: number): Promise<Permission[]> {
+        return this.client.fetchMapPermissions(id);
+    }
+
+    addMapPermissions(id: number, message: string, permissions: Permission[]): Promise<void> {
+        return this.client.addMapPermissions(id, message, permissions);
+    }
+
+    deleteMapPermission(id: number, email: string): Promise<void> {
+        return this.client.deleteMapPermission(id, email);
+    }
+
+    duplicateMap(id: number, basicInfo: BasicMapInfo): Promise<number> {
+        return this.client.duplicateMap(id, basicInfo);
+    }
+
+    updateAccountLanguage(locale: LocaleCode): Promise<void> {
+        return this.client.updateAccountLanguage(locale);
+    }
+
+    updateAccountPassword(pasword: string): Promise<void> {
+        return this.client.updateAccountPassword(pasword);
+    }
+
+    updateAccountInfo(firstname: string, lastname: string): Promise<void> {
+        return this.client.updateAccountInfo(firstname, lastname);
+    }
+
+    updateStarred(id: number, starred: boolean): Promise<void> {
+        return this.client.updateStarred(id, starred);
+    }
+
+    updateMapToPublic(id: number, isPublic: boolean): Promise<void> {
+        return this.client.updateMapToPublic(id, isPublic);
+    }
+
+    fetchLabels(): Promise<Label[]> {
+        return this.client.fetchLabels();
+    }
+
+    deleteLabel(id: number): Promise<void> {
+        return this.client.deleteLabel(id);
+    }
+
+    fetchAccountInfo(): Promise<AccountInfo> {
+        return this.client.fetchAccountInfo();
+    }
+
+    registerNewUser(user: NewUser): Promise<void> {
+        return this.client.registerNewUser(user);
+    }
+
+    resetPassword(email: string): Promise<void> {
+        return this.client.resetPassword(email);
+    }
+
+    fetchHistory(id: number): Promise<ChangeHistory[]> {
+        return this.client.fetchHistory(id);
+    }
+
+    revertHistory(id: number, cid: number): Promise<void> {
+        return this.client.revertHistory(id,cid);
+    }
+}
+
+export default CacheDecoratorClient;
\ No newline at end of file
diff --git a/packages/webapp/src/classes/client/index.ts b/packages/webapp/src/classes/client/index.ts
index a683fbd4..ae653ede 100644
--- a/packages/webapp/src/classes/client/index.ts
+++ b/packages/webapp/src/classes/client/index.ts
@@ -92,7 +92,7 @@ interface Client {
     updateAccountInfo(firstname: string, lastname: string): Promise<void>;
 
     updateStarred(id: number, starred: boolean): Promise<void>;
-    updateMapToPublic(id: number, starred: boolean): Promise<void>;
+    updateMapToPublic(id: number, isPublic: boolean): Promise<void>;
 
     fetchLabels(): Promise<Label[]>;
     deleteLabel(id: number): Promise<void>;
diff --git a/packages/webapp/src/classes/client/rest-client/index.ts b/packages/webapp/src/classes/client/rest-client/index.ts
index 0127e4d1..7632ebe6 100644
--- a/packages/webapp/src/classes/client/rest-client/index.ts
+++ b/packages/webapp/src/classes/client/rest-client/index.ts
@@ -235,11 +235,10 @@ export default class RestClient implements Client {
     updateMapToPublic(id: number, isPublic: boolean): Promise<void> {
         const handler = (success: () => void, reject: (error: ErrorInfo) => void) => {
             axios
-                .put(`${this.baseUrl}/c/restful/maps/${id}/publish`, isPublic, {
+                .put(`${this.baseUrl}/c/restful/maps/${id}/publish`, isPublic.toString(), {
                     headers: { 'Content-Type': 'text/plain' },
                 })
                 .then(() => {
-                    // All was ok, let's sent to success page ...;
                     success();
                 })
                 .catch((error) => {