@applicaster/zapp-react-native-bridge 14.0.0-alpha.1054425138 → 14.0.0-alpha.2847632144

package/ZappStorage/StorageMultiSelectProvider.ts

@@ -1,11 +1,8 @@
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { bridgeLogger } from "../logger";
 import { BehaviorSubject } from "rxjs";
-import { Storage } from "@applicaster/zapp-react-native-bridge/ZappStorage/Storage";
 import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import { getNamespaceAndKey } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/utils";
-import { StorageType } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/consts";
 
 export const { log_verbose, log_debug, log_warning, log_info, log_error } =
   createLogger({
@@ -37,28 +34,18 @@ export interface MultiSelectProvider {
 export class StorageMultiSelectProvider implements MultiSelectProvider {
   // TODO: Unsubscribe and remove when there is no listeners
   private static multiSelectProviders: Record<
-    StorageType,
-    Record<string, StorageMultiSelectProvider>
-  > = {
-    [StorageType.local]: {},
-    [StorageType.session]: {},
-    // TODO: not implemented yet
-    [StorageType.secure]: {},
-  };
-
-  public static getProvider(
-    keyNamespace: string,
-    storage: StorageType = StorageType.local
-  ): MultiSelectProvider {
-    if (!this.multiSelectProviders[storage][keyNamespace]) {
-      const storageImpl =
-        storage === StorageType.session ? sessionStorage : localStorage;
-
-      this.multiSelectProviders[storage][keyNamespace] =
-        new StorageMultiSelectProvider(keyNamespace, storageImpl);
+    string,
+    StorageMultiSelectProvider
+  > = {};
+
+  public static getProvider(keyNamespace: string): StorageMultiSelectProvider {
+    if (!this.multiSelectProviders[keyNamespace]) {
+      this.multiSelectProviders[keyNamespace] = new StorageMultiSelectProvider(
+        keyNamespace
+      );
     }
 
-    return this.multiSelectProviders[storage][keyNamespace];
+    return this.multiSelectProviders[keyNamespace];
   }
 
   private itemSubject: BehaviorSubject<string[] | null>;
@@ -66,10 +53,7 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
   private readonly key: string;
   private readonly namespace: string;
 
-  private constructor(
-    keyNamespace: string,
-    private storage: Storage
-  ) {
+  private constructor(keyNamespace: string) {
     const { namespace, key } = getNamespaceAndKey(keyNamespace);
 
     if (!key) {
@@ -78,7 +62,7 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
 
     this.key = key;
     this.namespace = namespace;
-    this.storage.addListener?.({ key, namespace }, this.reloadItems);
+    localStorage.addListener?.({ key, namespace }, this.reloadItems);
 
     this.itemSubject = new BehaviorSubject([]);
 
@@ -100,7 +84,7 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
   public getObservable = (): BehaviorSubject<string[]> => this.itemSubject;
 
   private async getSetOfCurrentItems() {
-    const currentResult: string = await this.storage.getItem(
+    const currentResult: string = await localStorage.getItem(
       this.key,
       this.namespace
     );
@@ -111,7 +95,7 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
   private async updateItemsAndNotifyObservers(currentItems: Set<string>) {
     const arrayOfItems = Array.from(currentItems);
     const newValue = arrayOfItems.join(",");
-    await this.storage.setItem(this.key, newValue, this.namespace);
+    await localStorage.setItem(this.key, newValue, this.namespace);
 
     this.itemSubject.next(arrayOfItems);
   }
@@ -166,14 +150,14 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
   };
 
   public removeAllItems = async (): Promise<void> => {
-    await this.storage.removeItem(this.key, this.namespace);
+    await localStorage.removeItem(this.key, this.namespace);
     log_debug(`removeAllItems: Removing all items, current items: ${[]}`);
 
     this.itemSubject.next([]);
   };
 
   public getSelectedAsync = async (): Promise<string[]> => {
-    const value = await this.storage.getItem(this.key, this.namespace);
+    const value = await localStorage.getItem(this.key, this.namespace);
     const selectedItems = value ? value.split(",") : [];
     this.itemSubject.next(selectedItems);
 

package/ZappStorage/StorageSingleSelectProvider.ts

@@ -31,7 +31,7 @@ export class StorageSingleValueProvider implements SingleValueProvider {
     StorageSingleValueProvider
   > = {};
 
-  public static getProvider(keyNamespace: string): SingleValueProvider {
+  public static getProvider(keyNamespace: string): StorageSingleValueProvider {
     if (!this.singleValueProviders[keyNamespace]) {
       this.singleValueProviders[keyNamespace] = new StorageSingleValueProvider(
         keyNamespace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-bridge",
-  "version": "14.0.0-alpha.1054425138",
+  "version": "14.0.0-alpha.2847632144",
   "description": "Applicaster Zapp React Native modules",
   "main": "index.js",
   "types": "index.d.ts",
@@ -32,7 +32,7 @@
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
     "@applicaster/zapp-pipes-dev-kit": "1.4.7",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1054425138",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.2847632144",
     "md5": "^2.3.0",
     "uuid": "^3.3.2"
   },

package/ZappStorage/ScreenSingleValueProvider.ts

@@ -1,92 +0,0 @@
-import { BehaviorSubject } from "rxjs";
-import { log_debug, SingleValueProvider } from "./StorageSingleSelectProvider";
-
-export const screenStates: Record<string, Record<string, string>> = {};
-
-export class ScreenSingleValueProvider implements SingleValueProvider {
-  private static providers: Record<
-    string,
-    Record<string, SingleValueProvider>
-  > = {};
-
-  // TODO: Screen State should be stored outside of this class and should be shared with screen multi-select provider
-  public static getState(screenRoute: string): Record<string, string> {
-    return screenStates[screenRoute] || {};
-  }
-
-  public static getProvider(
-    key: string,
-    screenRoute: string
-  ): SingleValueProvider {
-    if (!key) {
-      throw new Error("ScreenSingleValueProvider: Key is required");
-    }
-
-    if (!screenRoute) {
-      throw new Error("ScreenSingleValueProvider: Screen route is required");
-    }
-
-    if (!this.providers[screenRoute]) {
-      this.providers[screenRoute] = {};
-    }
-
-    if (!this.providers[screenRoute][key]) {
-      this.providers[screenRoute][key] = new ScreenSingleValueProvider(
-        key,
-        screenRoute
-      );
-    }
-
-    if (!screenStates[screenRoute]) {
-      screenStates[screenRoute] = {};
-    }
-
-    return this.providers[screenRoute][key];
-  }
-
-  // @ts-ignore
-  private valueSubject: BehaviorSubject<string | null>;
-  p;
-  // @ts-ignore
-  private constructor(
-    private key: string,
-    private route: string
-  ) {
-    if (!key) {
-      throw new Error("ScreenSingleValueProvider: Key is required");
-    }
-
-    // localStorage.addListener?.({ key, namespace }, this.reloadValue);
-
-    this.valueSubject = new BehaviorSubject<string | null>(null);
-
-    void this.getValueAsync();
-    log_debug("ScreenSingleValueProvider: Initializing");
-  }
-
-  clearValue(): Promise<void> {
-    delete [this.route][this.key];
-    this.valueSubject.next(null);
-
-    return Promise.resolve();
-  }
-
-  getObservable(): BehaviorSubject<string | null> {
-    return this.valueSubject;
-  }
-
-  getValue(): string | null {
-    return this.valueSubject.value;
-  }
-
-  getValueAsync(): Promise<string | null> {
-    return Promise.resolve(this.valueSubject.value);
-  }
-
-  setValue(value: string): Promise<void> {
-    screenStates[this.route][this.key] = value;
-    this.valueSubject.next(value);
-
-    return Promise.resolve();
-  }
-}

package/ZappStorage/ScreenStateMultiSelectProvider.ts

@@ -1,119 +0,0 @@
-import { log_debug, MultiSelectProvider } from "./StorageMultiSelectProvider";
-import { BehaviorSubject } from "rxjs";
-import { screenStates } from "./ScreenSingleValueProvider";
-
-export class ScreenMultiSelectProvider implements MultiSelectProvider {
-  // @ts-ignore
-  private itemSubject: BehaviorSubject<string[] | null>;
-
-  private static providers: Record<
-    string,
-    Record<string, MultiSelectProvider>
-  > = {};
-
-  public static getProvider(
-    key: string,
-    screenRoute: string
-  ): MultiSelectProvider {
-    if (!key) {
-      throw new Error("ScreenSingleValueProvider: Key is required");
-    }
-
-    if (!screenRoute) {
-      throw new Error("ScreenSingleValueProvider: Screen route is required");
-    }
-
-    if (!this.providers[screenRoute]) {
-      this.providers[screenRoute] = {};
-    }
-
-    if (!this.providers[screenRoute][key]) {
-      this.providers[screenRoute][key] = new ScreenMultiSelectProvider(
-        key,
-        screenRoute
-      );
-    }
-
-    if (!screenStates[screenRoute]) {
-      screenStates[screenRoute] = {};
-    }
-
-    return this.providers[screenRoute][key];
-  }
-
-  // @ts-ignore
-  private constructor(
-    private key: string,
-    private route: string
-  ) {
-    if (!key) {
-      throw new Error("StorageMultiSelectProvider: Key is required");
-    }
-
-    this.key = key;
-    // this.storage.addListener?.({ key, namespace }, this.reloadItems);
-
-    this.itemSubject = new BehaviorSubject([]);
-
-    void this.getSelectedAsync();
-    log_debug("StorageMultiSelectProvider: Initializing");
-  }
-
-  private getSetOfCurrentItems() {
-    const currentResult: string = screenStates[this.route][this.key];
-
-    return new Set(currentResult ? currentResult.split(",") : []);
-  }
-
-  addItem(item: string): Promise<void> {
-    const items = this.getSetOfCurrentItems();
-    items.add(item);
-    screenStates[this.route][this.key] = Array.from(items).join(",");
-    this.itemSubject.next(Array.from(items) || []);
-
-    log_debug(
-      `addItem: item added: ${item}, current items: ${Array.from(items)}`
-    );
-
-    return Promise.resolve();
-  }
-
-  addItems(_items: string[]): Promise<void> {
-    return Promise.resolve();
-  }
-
-  public getObservable = (): BehaviorSubject<string[]> => this.itemSubject;
-
-  getSelectedAsync(): Promise<string[]> {
-    const values = screenStates[this.route][this.key]?.split(",");
-    this.itemSubject.next(values || []);
-
-    return Promise.resolve(values || []);
-  }
-
-  getSelectedItems(): string[] {
-    return this.itemSubject.value;
-  }
-
-  removeAllItems(): Promise<void> {
-    return Promise.resolve();
-  }
-
-  removeItem(item: string): Promise<void> {
-    const items = this.getSetOfCurrentItems();
-    items.delete(item);
-
-    screenStates[this.route][this.key] = Array.from(items).join(",");
-    this.itemSubject.next(Array.from(items) || []);
-
-    return Promise.resolve();
-  }
-
-  removeItems(_items: string[]): Promise<void> {
-    return Promise.resolve();
-  }
-
-  setSelectedItems(_items: string[]): Promise<void> {
-    return Promise.resolve();
-  }
-}