Migrate Instances to routes

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2025-10-20T15:52:19.670Z\n"
-"PO-Revision-Date: 2025-10-20T15:52:19.670Z\n"
+"POT-Creation-Date: 2025-11-05T08:45:47.581Z\n"
+"PO-Revision-Date: 2025-11-05T08:45:47.581Z\n"
 
 msgid ""
 "THIS NEW RELEASE INCLUDES SHARING SETTINGS PER INSTANCES. FOR THIS VERSION "
@@ -159,6 +159,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Error fetching instance version"
+msgstr ""
+
 msgid "An exported dhis2 file is necessary"
 msgstr ""
 
@@ -1259,6 +1262,9 @@ msgstr ""
 msgid "with stored user"
 msgstr ""
 
+msgid "Error fetching local instance"
+msgstr ""
+
 msgid "Destination"
 msgstr ""
 
@@ -1737,6 +1743,12 @@ msgstr ""
 msgid "Admin Dashboard"
 msgstr ""
 
+msgid "Basic"
+msgstr ""
+
+msgid "API Token"
+msgstr ""
+
 msgid "Please fix the issues before testing the connection"
 msgstr ""
 
@@ -1749,6 +1761,12 @@ msgstr ""
 msgid "URL endpoint (*)"
 msgstr ""
 
+msgid "Authentication Scheme (*)"
+msgstr ""
+
+msgid "Token (*)"
+msgstr ""
+
 msgid "Username (*)"
 msgstr ""
 
@@ -1791,6 +1809,9 @@ msgstr ""
 msgid "URL endpoint"
 msgstr ""
 
+msgid "Authentication Scheme"
+msgstr ""
+
 msgid "Username"
 msgstr ""
 

i18n/es.po

@@ -159,6 +159,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Error fetching instance version"
+msgstr ""
+
 msgid "An exported dhis2 file is necessary"
 msgstr ""
 
@@ -1262,6 +1265,9 @@ msgstr ""
 msgid "with stored user"
 msgstr ""
 
+msgid "Error fetching local instance"
+msgstr ""
+
 msgid "Destination"
 msgstr ""
 
@@ -1739,6 +1745,12 @@ msgstr ""
 msgid "Admin Dashboard"
 msgstr ""
 
+msgid "Basic"
+msgstr ""
+
+msgid "API Token"
+msgstr ""
+
 msgid "Please fix the issues before testing the connection"
 msgstr ""
 
@@ -1751,6 +1763,12 @@ msgstr ""
 msgid "URL endpoint (*)"
 msgstr ""
 
+msgid "Authentication Scheme (*)"
+msgstr ""
+
+msgid "Token (*)"
+msgstr ""
+
 msgid "Username (*)"
 msgstr ""
 
@@ -1793,6 +1811,9 @@ msgstr ""
 msgid "URL endpoint"
 msgstr ""
 
+msgid "Authentication Scheme"
+msgstr ""
+
 msgid "Username"
 msgstr ""
 

i18n/fr.po

@@ -159,6 +159,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Error fetching instance version"
+msgstr ""
+
 msgid "An exported dhis2 file is necessary"
 msgstr ""
 
@@ -1262,6 +1265,9 @@ msgstr ""
 msgid "with stored user"
 msgstr ""
 
+msgid "Error fetching local instance"
+msgstr ""
+
 msgid "Destination"
 msgstr ""
 
@@ -1739,6 +1745,12 @@ msgstr ""
 msgid "Admin Dashboard"
 msgstr ""
 
+msgid "Basic"
+msgstr ""
+
+msgid "API Token"
+msgstr ""
+
 msgid "Please fix the issues before testing the connection"
 msgstr ""
 
@@ -1751,6 +1763,12 @@ msgstr ""
 msgid "URL endpoint (*)"
 msgstr ""
 
+msgid "Authentication Scheme (*)"
+msgstr ""
+
+msgid "Token (*)"
+msgstr ""
+
 msgid "Username (*)"
 msgstr ""
 
@@ -1793,6 +1811,9 @@ msgstr ""
 msgid "URL endpoint"
 msgstr ""
 
+msgid "Authentication Scheme"
+msgstr ""
+
 msgid "Username"
 msgstr ""
 

i18n/pt.po

@@ -159,6 +159,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Error fetching instance version"
+msgstr ""
+
 msgid "An exported dhis2 file is necessary"
 msgstr ""
 
@@ -1262,6 +1265,9 @@ msgstr ""
 msgid "with stored user"
 msgstr ""
 
+msgid "Error fetching local instance"
+msgstr ""
+
 msgid "Destination"
 msgstr ""
 
@@ -1739,6 +1745,12 @@ msgstr ""
 msgid "Admin Dashboard"
 msgstr ""
 
+msgid "Basic"
+msgstr ""
+
+msgid "API Token"
+msgstr ""
+
 msgid "Please fix the issues before testing the connection"
 msgstr ""
 
@@ -1751,6 +1763,12 @@ msgstr ""
 msgid "URL endpoint (*)"
 msgstr ""
 
+msgid "Authentication Scheme (*)"
+msgstr ""
+
+msgid "Token (*)"
+msgstr ""
+
 msgid "Username (*)"
 msgstr ""
 
@@ -1793,6 +1811,9 @@ msgstr ""
 msgid "URL endpoint"
 msgstr ""
 
+msgid "Authentication Scheme"
+msgstr ""
+
 msgid "Username"
 msgstr ""
 

src/data/aggregated/AggregatedD2ApiRepository.ts

@@ -24,8 +24,8 @@ import mime from "mime-types";
 export class AggregatedD2ApiRepository implements AggregatedRepository {
     private api: D2Api;
 
-    constructor(private instance: Instance) {
-        this.api = getD2APiFromInstance(instance);
+    constructor(localInstance: Instance, private targetInstance: Instance) {
+        this.api = getD2APiFromInstance(localInstance, targetInstance);
     }
 
     public async getAggregated(
@@ -310,7 +310,7 @@ export class AggregatedD2ApiRepository implements AggregatedRepository {
             if (!result) {
                 return {
                     status: "ERROR",
-                    instance: this.instance.toPublicObject(),
+                    instance: this.targetInstance.toPublicObject(),
                     date: new Date(),
                     type: "aggregated",
                 };
@@ -324,7 +324,7 @@ export class AggregatedD2ApiRepository implements AggregatedRepository {
 
             return {
                 status: "NETWORK ERROR",
-                instance: this.instance.toPublicObject(),
+                instance: this.targetInstance.toPublicObject(),
                 date: new Date(),
                 type: "aggregated",
             };
@@ -377,7 +377,7 @@ export class AggregatedD2ApiRepository implements AggregatedRepository {
             status,
             message: description,
             stats: importCount,
-            instance: this.instance.toPublicObject(),
+            instance: this.targetInstance.toPublicObject(),
             errors,
             date: new Date(),
             type: "aggregated",

src/data/common/InmemoryCache.ts

@@ -1,26 +1,26 @@
 export class InmemoryCache {
-    private cache: Record<string, unknown> = {};
+    private cache: Map<string, unknown> = new Map();
 
     getKeys(): string[] {
-        return Object.keys(this.cache);
+        return Array.from(this.cache.keys());
     }
 
     get<T>(cacheKey: string): T {
-        return this.cache[cacheKey] as T;
+        return this.cache.get(cacheKey) as T;
     }
 
     async getOrPromise<T>(cacheKey: string, promise: () => Promise<T>): Promise<T> {
-        if (this.cache[cacheKey]) {
-            const data = this.cache[cacheKey] as T;
+        if (this.cache.has(cacheKey)) {
+            const data = this.cache.get(cacheKey) as T;
             return Promise.resolve(data);
         } else {
             const data = await promise();
-            this.cache[cacheKey] = data;
+            this.cache.set(cacheKey, data);
             return data;
         }
     }
 
     clear(): void {
-        this.cache = {};
+        this.cache.clear();
     }
 }

src/data/config/StorageClientD2Repository.ts

@@ -18,9 +18,9 @@ export class StorageClientD2Repository implements StorageClientRepository, Stora
     private dataStoreClient: StorageDataStoreClient;
     private constantClient: StorageConstantClient;
 
-    constructor(private instance: Instance) {
-        this.dataStoreClient = new StorageDataStoreClient(this.instance);
-        this.constantClient = new StorageConstantClient(this.instance);
+    constructor(private localInstance: Instance, private targetInstance?: Instance) {
+        this.dataStoreClient = new StorageDataStoreClient(localInstance, this.targetInstance);
+        this.constantClient = new StorageConstantClient(localInstance, this.targetInstance);
     }
 
     @cache()
@@ -49,7 +49,9 @@ export class StorageClientD2Repository implements StorageClientRepository, Stora
 
     @cache()
     public getUserStorageClient(): FutureData<StorageClient> {
-        const dataStoreClient = new StorageDataStoreClient(this.instance, undefined, { storageType: "user" });
+        const dataStoreClient = new StorageDataStoreClient(this.localInstance, this.targetInstance, undefined, {
+            storageType: "user",
+        });
 
         return this.constantClient.getObjectFuture(Namespace.CONFIG).map(constantConfig => {
             return constantConfig ? this.constantClient : dataStoreClient;

src/data/config/StorageClientTestRepository.ts

@@ -14,23 +14,42 @@ export class StorageClientTestRepository implements StorageClientRepository {
             name: "Testing",
             version: "2.36",
         });
-        return Future.success(new StorageDataStoreClient(localInstance, undefined, { storageType: "user" }));
+        const destinationInstance = Instance.build({
+            url: "http://destination.test",
+            name: "Testing",
+            version: "2.36",
+        });
+        return Future.success(
+            new StorageDataStoreClient(localInstance, destinationInstance, undefined, { storageType: "user" })
+        );
     }
     getStorageClientPromise(): Promise<StorageClient> {
         const localInstance = Instance.build({
             url: "http://origin.test",
             name: "Testing",
             version: "2.36",
         });
-        return Promise.resolve(new StorageDataStoreClient(localInstance));
+        const destinationInstance = Instance.build({
+            url: "http://destination.test",
+            name: "Testing",
+            version: "2.36",
+        });
+        return Promise.resolve(new StorageDataStoreClient(localInstance, destinationInstance));
     }
     getStorageClient(): FutureData<StorageClient> {
         const localInstance = Instance.build({
             url: "http://origin.test",
             name: "Testing",
             version: "2.36",
         });
-        return Future.success(new StorageDataStoreClient(localInstance, undefined, { storageType: "user" }));
+        const destinationInstance = Instance.build({
+            url: "http://origin.test",
+            name: "Testing",
+            version: "2.36",
+        });
+        return Future.success(
+            new StorageDataStoreClient(localInstance, destinationInstance, undefined, { storageType: "user" })
+        );
     }
     changeStorageClient(_client: AppStorageType): FutureData<void> {
         return Future.success(undefined);