@finsemble/finsemble-ui 8.0.2 → 8.1.0-beta.2

package/platform/services/workspace/windowStorageManager.d.ts

@@ -0,0 +1,178 @@
+import { FinsembleWindowData } from "../window/types";
+import { StandardErrorCallback } from "../../../types";
+import { CompleteWindowState, StateType } from "./types";
+export declare const GET_WINDOW_STATE_ERROR: (win: string, ws?: string) => string;
+/**
+ * Static, ORM-like layer into the storage of all `windowData`
+ * and `componentState` data, mediating interface with storage
+ * while enforcing consistency and business rules.
+ */
+export declare class WindowStorageManager {
+    /**
+     * This static member is necessary for testing purposes
+     * only. Ideally, we would just use the StorageClient
+     * instance directly; however, this causes inconsistencies
+     * with our mocks that failed our testing efforts.
+     */
+    static _SC: {
+        initialize: () => void;
+        onReady: (cb?: any) => void;
+        clearCache: (cb?: StandardErrorCallback<void> | undefined) => import("../../../types").StandardPromise<void>;
+        remove: (params: {
+            key: string;
+            topic: string;
+        }, cb?: StandardErrorCallback<void> | undefined) => import("../../../types").StandardPromise<void>;
+        getMultiple: (params: any, cb?: StandardErrorCallback<any> | undefined) => import("../../../types").StandardPromise<any>;
+        keys: (params: {
+            topic: string;
+            keyPrefix?: string | undefined;
+        }, cb?: StandardErrorCallback<string[]> | undefined) => import("../../../types").StandardPromise<string[]>;
+        getStandardized: <T = any>(params: {
+            key: string;
+            topic: string;
+        }, cb?: StandardErrorCallback<T> | undefined) => import("../../../types").StandardPromise<T>;
+        get: <T_1 = any>(params: {
+            key: string;
+            topic: string;
+        }, cb?: StandardErrorCallback<T_1> | undefined) => Promise<T_1>;
+        save: (params: import("../window/types").ComponentMutateParams, cb?: StandardErrorCallback<void> | undefined) => import("../../../types").StandardPromise<void>;
+        setStore: (params: {
+            topic: string;
+            dataStore?: string | undefined;
+        }, cb?: StandardErrorCallback<void> | undefined) => import("../../../types").StandardPromise<void>;
+        setUser: (params: {
+            user: string;
+        }, cb?: StandardErrorCallback<void> | undefined) => import("../../../types").StandardPromise<void>;
+        delete: (...args: any[]) => void;
+        remove1: (params: {
+            key: string;
+            topic: string;
+        }) => void;
+        get1: <T_2 = any>(params: {
+            key: string;
+            topic: string;
+        }, cb?: StandardErrorCallback<T_2> | undefined) => Promise<T_2>;
+        save1: (params: {
+            key: string;
+            topic: string;
+            value: any;
+        }) => void;
+        keys1: (params: {
+            topic: string;
+            keyPrefix?: string | undefined;
+        }) => Promise<string[]>;
+    };
+    static getWindowID: (win: FinsembleWindowData) => string;
+    /**
+     * Asynchronously updates provided key in storage by first retrieving the key
+     * then running a provided function on the result and re-saving its value.
+     * There’s no guarantees of consistency or atomicity
+     *
+     * @param params {any} Update storage params
+     * @param params.topic {string} The storage topic
+     * @param params.key {string} The storage key
+     * @param params.updateFn {Function} Function to run to determine the value to store
+     * @private
+     */
+    static updateStorage(params: {
+        topic: string;
+        key: string;
+        updateFn: (x: any) => any;
+    }): Promise<{
+        err?: import("../../../types").StandardError;
+        data?: void | undefined;
+    }>;
+    /**
+     * Rate limited updateStorage.
+     * @private
+     */
+    static updateStorage1(params: {
+        topic: string;
+        key: string;
+        updateFn: (x: any) => any;
+    }): Promise<{
+        err?: import("../../../types").StandardError;
+        data?: void | undefined;
+    }>;
+    /**
+     * Given a type, window, and workspace name, returns the correct storage topic and key
+     * for the `windowData` or `componentState`.
+     * Omit the workspace name to target the active workspace.
+     */
+    static getTopicAndKey(type: StateType, windowName: string, workspaceName?: string): {
+        topic: string;
+        key: string;
+    };
+    /**
+     * Retrieves a window or component state belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static getState(type: StateType, windowName: string, workspaceName?: string): Promise<FinsembleWindowData>;
+    /**
+     * Same as `getState` but retrieves both `componentState` and `windowData`.
+     * NOTE: either or both of windowData may be null or emtpy objects (i.e, when
+     * the requested data doesn't exist).
+     */
+    static getCompleteState(windowName: string, workspaceName?: string): Promise<CompleteWindowState>;
+    /**
+     * Retrieves multiple states (`componentState` or `windowData`) belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * It's possible to request a window state before it's been saved to storage particularly.
+     * if the window was added to a workspace by name (not by data). Therefore, unlike `getState`,
+     * this method doesn't throw errors if unable to fulfill the request; rather, it logs a warning instead.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static getManyStates(type: StateType, windowNames: string[], workspaceName?: string): Promise<FinsembleWindowData[]>;
+    /**
+     * Same as `getManyStates` but retrieves both `componentState` and `windowData`.
+     */
+    static getManyCompleteStates(windowNames: string[], workspaceName?: string): Promise<CompleteWindowState[]>;
+    /**
+     * Persists a state to storage under the given workspace name.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static setState(type: StateType, windowName: string, data: FinsembleWindowData | Record<string, any>, workspaceName?: string): Promise<void>;
+    /**
+     * Same as `setState`, but sets both `componentState` and `windowData`.
+     */
+    static setCompleteState(state: CompleteWindowState, workspaceName?: string): Promise<void>;
+    /**
+     * Given an array of states, persists their states to storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static setManyStates(type: StateType, windows: FinsembleWindowData[], workspaceName?: string): Promise<void[]>;
+    /**
+     * Same as `setManyStates`, but sets both `componentState` and `windowData`.
+     */
+    static setManyCompleteStates(windows: CompleteWindowState[], workspaceName?: string): Promise<void[]>;
+    /**
+     * Given a window name and an update function, retrieves the state
+     * under that name from storage, applies the update function to it, then sets
+     * the storage with the result.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static updateState(type: StateType, updateFn: (window: FinsembleWindowData) => FinsembleWindowData, windowName: string, workspaceName?: any): Promise<void>;
+    /**
+     * Removes a window's state (both `componentState` and `windowData`) from storage under the
+     * given workspace name. Omit the workspace name to target the active workspace.
+     *
+     * Logs a warning if unable to fulfill the request (doesn't throw).
+     */
+    static removeCompleteState(windowName: string, workspaceName?: string): Promise<void>;
+    /**
+     * Removes multiple states (both `componentState` and `windowData`) belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     */
+    static removeManyCompleteStates(windowNames: string[], workspaceName?: string): Promise<void[]>;
+}
+//# sourceMappingURL=windowStorageManager.d.ts.map

package/platform/services/workspace/windowStorageManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"windowStorageManager.d.ts","sourceRoot":"","sources":["../../../../../src/platform/services/workspace/windowStorageManager.ts"],"names":[],"mappings":"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"}

package/platform/services/workspace/windowStorageManager.js

@@ -0,0 +1,195 @@
+import StorageClient from "../../../clients/storageClient";
+import { camelCase, identity } from "../../../common/util";
+import { WORKSPACE } from "../../../common/constants";
+import { LoggerClient as Logger } from "../../../clients/logger";
+import pLimit from "p-limit";
+const limit = pLimit(1);
+const { ACTIVE_WORKSPACE, CACHE_STORAGE_TOPIC, STORAGE_TOPIC } = WORKSPACE;
+export const GET_WINDOW_STATE_ERROR = (win, ws = ACTIVE_WORKSPACE) => `No Window State found for window "${win}" in workspace "${ws}"`;
+/**
+ * Rate limited functions
+ */
+const remove1 = (params) => limit(() => StorageClient.remove(params));
+const get1 = (params, cb) => limit(() => StorageClient.get(params, cb));
+const save1 = (params) => limit(() => StorageClient.save(params));
+/**
+ * Static, ORM-like layer into the storage of all `windowData`
+ * and `componentState` data, mediating interface with storage
+ * while enforcing consistency and business rules.
+ */
+export class WindowStorageManager {
+    /**
+     * Asynchronously updates provided key in storage by first retrieving the key
+     * then running a provided function on the result and re-saving its value.
+     * There’s no guarantees of consistency or atomicity
+     *
+     * @param params {any} Update storage params
+     * @param params.topic {string} The storage topic
+     * @param params.key {string} The storage key
+     * @param params.updateFn {Function} Function to run to determine the value to store
+     * @private
+     */
+    static async updateStorage(params) {
+        const { topic, key, updateFn } = params;
+        const result = await WindowStorageManager._SC.get({ topic, key });
+        return await WindowStorageManager._SC.save({ topic, key, value: updateFn(result) });
+    }
+    /**
+     * Rate limited updateStorage.
+     * @private
+     */
+    static updateStorage1(params) {
+        return limit(() => WindowStorageManager.updateStorage(params));
+    }
+    /**
+     * Given a type, window, and workspace name, returns the correct storage topic and key
+     * for the `windowData` or `componentState`.
+     * Omit the workspace name to target the active workspace.
+     */
+    static getTopicAndKey(type, windowName, workspaceName = ACTIVE_WORKSPACE) {
+        /** The `windowData` is stored under the key with the format "workspacenameWindowname",
+         * while the `componentState` is stored under "workspacenameWindownameWindowname" */
+        const keyArgs = type === "windowData" ? [workspaceName, windowName] : [workspaceName, windowName, windowName];
+        return {
+            topic: workspaceName === ACTIVE_WORKSPACE ? CACHE_STORAGE_TOPIC : STORAGE_TOPIC,
+            key: camelCase.apply(null, keyArgs),
+        };
+    }
+    /**
+     * Retrieves a window or component state belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static async getState(type, windowName, workspaceName) {
+        const topicAndKey = WindowStorageManager.getTopicAndKey(type, windowName, workspaceName);
+        //disabled to reduce load on logging system generated when when retrieving activeWorkspace
+        //Logger.system.debug("getState", type, windowName, workspaceName, topicAndKey, "Result=", result);
+        return (await get1(topicAndKey)) || null;
+    }
+    /**
+     * Same as `getState` but retrieves both `componentState` and `windowData`.
+     * NOTE: either or both of windowData may be null or emtpy objects (i.e, when
+     * the requested data doesn't exist).
+     */
+    static async getCompleteState(windowName, workspaceName) {
+        let componentState = (await WindowStorageManager.getState("componentState", windowName, workspaceName)
+            // Windows may not necessarily have component state, so we must catch that occurance here.
+            .catch(() => {
+            return {};
+        }));
+        let windowData = (await WindowStorageManager.getState("windowData", windowName, workspaceName));
+        Logger.system.debug("getCompleteState", windowName, workspaceName, componentState, windowData);
+        return { componentState, windowData };
+    }
+    /**
+     * Retrieves multiple states (`componentState` or `windowData`) belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * It's possible to request a window state before it's been saved to storage particularly.
+     * if the window was added to a workspace by name (not by data). Therefore, unlike `getState`,
+     * this method doesn't throw errors if unable to fulfill the request; rather, it logs a warning instead.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static async getManyStates(type, windowNames, workspaceName) {
+        const promises = windowNames.flatMap((x) => {
+            try {
+                const state = WindowStorageManager.getState(type, x, workspaceName);
+                return [state];
+            }
+            catch (e) {
+                return [];
+            }
+        });
+        return Promise.all(promises).then((x) => x.filter(identity));
+    }
+    /**
+     * Same as `getManyStates` but retrieves both `componentState` and `windowData`.
+     */
+    static async getManyCompleteStates(windowNames, workspaceName) {
+        return Promise.all(windowNames.map((x) => WindowStorageManager.getCompleteState(x, workspaceName).catch((err) => {
+            Logger.system.warn(err);
+            return null;
+        }))).then((x) => x.filter(identity));
+    }
+    /**
+     * Persists a state to storage under the given workspace name.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static async setState(type, windowName, data, workspaceName) {
+        await save1(Object.assign(Object.assign({}, WindowStorageManager.getTopicAndKey(type, windowName, workspaceName)), { value: data }));
+    }
+    /**
+     * Same as `setState`, but sets both `componentState` and `windowData`.
+     */
+    static async setCompleteState(state, workspaceName) {
+        // This only happens if a very seldomly hit race condition happens, and a window is removed from storage but not from the active workspace.
+        // We didn't spend a ton of time trying to figure it out because the underlying issue had no
+        // observable effect.
+        // Removing this line will cause the workspace to crash if it hits, though. so leave it.
+        if (!state.windowData || !state.componentState)
+            return;
+        await WindowStorageManager.setState("windowData", state.windowData.name, state.windowData, workspaceName);
+        await WindowStorageManager.setState("componentState", state.windowData.name, state.componentState, workspaceName);
+    }
+    /**
+     * Given an array of states, persists their states to storage.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static async setManyStates(type, windows, workspaceName) {
+        return Promise.all(windows.map((x) => WindowStorageManager.setState(type, x.name, x, workspaceName)));
+    }
+    /**
+     * Same as `setManyStates`, but sets both `componentState` and `windowData`.
+     */
+    static async setManyCompleteStates(windows, workspaceName) {
+        return Promise.all(windows.map((x) => WindowStorageManager.setCompleteState(x, workspaceName)));
+    }
+    /**
+     * Given a window name and an update function, retrieves the state
+     * under that name from storage, applies the update function to it, then sets
+     * the storage with the result.
+     * Omit the workspace name to target the active workspace.
+     *
+     * @param type Either `componentState` or `windowData`.
+     */
+    static async updateState(type, updateFn, windowName, workspaceName) {
+        await WindowStorageManager.updateStorage1(Object.assign(Object.assign({}, WindowStorageManager.getTopicAndKey(type, windowName, workspaceName)), { updateFn }));
+    }
+    /**
+     * Removes a window's state (both `componentState` and `windowData`) from storage under the
+     * given workspace name. Omit the workspace name to target the active workspace.
+     *
+     * Logs a warning if unable to fulfill the request (doesn't throw).
+     */
+    static async removeCompleteState(windowName, workspaceName) {
+        try {
+            await remove1(WindowStorageManager.getTopicAndKey("windowData", windowName, workspaceName));
+            await remove1(WindowStorageManager.getTopicAndKey("componentState", windowName, workspaceName));
+        }
+        catch (error) {
+            Logger.system.warn(error);
+        }
+    }
+    /**
+     * Removes multiple states (both `componentState` and `windowData`) belonging to the given workspace from storage.
+     * Omit the workspace name to target the active workspace.
+     */
+    static async removeManyCompleteStates(windowNames, workspaceName) {
+        return Promise.all(windowNames.map((x) => WindowStorageManager.removeCompleteState(x, workspaceName)));
+    }
+}
+/**
+ * This static member is necessary for testing purposes
+ * only. Ideally, we would just use the StorageClient
+ * instance directly; however, this causes inconsistencies
+ * with our mocks that failed our testing efforts.
+ */
+WindowStorageManager._SC = StorageClient;
+WindowStorageManager.getWindowID = (win) => camelCase(win.name);
+//# sourceMappingURL=windowStorageManager.js.map

package/platform/services/workspace/windowStorageManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windowStorageManager.js","sourceRoot":"","sources":["../../../../../src/platform/services/workspace/windowStorageManager.ts"],"names":[],"mappings":"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"}

package/platform/services/workspace/workspaceAdminAPI.d.ts

@@ -6,7 +6,7 @@ import { FinsembleWindowData } from "../window/types";
 /**
  * Adds a newly launched window to the current active workspace
  */
-export declare const addWindowReferenceToActiveWorkspace: (params: FinsembleWindowData, cb?: any) => Promise<import("../../../clients/routerClient").QueryResponse<any>>;
+export declare const addWindowReferenceToActiveWorkspace: (params: FinsembleWindowData, cb?: any) => Promise<import("../router/types").QueryResponse<any>>;
 /**
  * Removes window from active workspace (but does not close it).
  *

package/platform/services/workspace/workspaceAdminAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceAdminAPI.d.ts","sourceRoot":"","sources":["../../../../../src/platform/services/workspace/workspaceAdminAPI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD;;GAEG;AACH,eAAO,MAAM,mCAAmC,WAAkB,mBAAmB,OAAM,GAAG,wEAS7F,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,wCAAwC,WAC5C;IACP,MAAM,MAAM,CAAC;CACb,wBAcD,CAAC"}
+{"version":3,"file":"workspaceAdminAPI.d.ts","sourceRoot":"","sources":["../../../../../src/platform/services/workspace/workspaceAdminAPI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD;;GAEG;AACH,eAAO,MAAM,mCAAmC,WAAkB,mBAAmB,OAAM,GAAG,0DAS7F,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,wCAAwC,WAC5C;IACP,MAAM,MAAM,CAAC;CACb,wBAcD,CAAC"}

package/react/actions/smartDesktopDesignerActions.d.ts

@@ -22,6 +22,7 @@ export declare const SmartDesktopDesignerActions: import("unionize").Unionized<{
     set_project_error: ProjectError;
     delete_project_error: ProjectError;
     set_reviewing_project_errors: boolean;
+    set_fsbl_version: string;
 }, import("unionize").SingleValueVariants<{
     change_view: string;
     update_apps: AppDefinition[];
@@ -42,6 +43,7 @@ export declare const SmartDesktopDesignerActions: import("unionize").Unionized<{
     set_project_error: ProjectError;
     delete_project_error: ProjectError;
     set_reviewing_project_errors: boolean;
+    set_fsbl_version: string;
 }, "type", "payload">, "type">;
 export declare type SmartDesktopDesignerActionsTypes = UnionOf<typeof SmartDesktopDesignerActions>;
 //# sourceMappingURL=smartDesktopDesignerActions.d.ts.map

package/react/actions/smartDesktopDesignerActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartDesktopDesignerActions.d.ts","sourceRoot":"","sources":["../../../../src/ui/actions/smartDesktopDesignerActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EACN,sBAAsB,EACtB,QAAQ,EACR,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAuBvC,CAAC;AAEF,oBAAY,gCAAgC,GAAG,OAAO,CAAC,OAAO,2BAA2B,CAAC,CAAC"}
+{"version":3,"file":"smartDesktopDesignerActions.d.ts","sourceRoot":"","sources":["../../../../src/ui/actions/smartDesktopDesignerActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EACN,sBAAsB,EACtB,QAAQ,EACR,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAwBvC,CAAC;AAEF,oBAAY,gCAAgC,GAAG,OAAO,CAAC,OAAO,2BAA2B,CAAC,CAAC"}

package/react/actions/smartDesktopDesignerActions.js

@@ -19,5 +19,6 @@ export const SmartDesktopDesignerActions = unionize({
     set_project_error: ofType(),
     delete_project_error: ofType(),
     set_reviewing_project_errors: ofType(),
+    set_fsbl_version: ofType(),
 }, { tag: "type", value: "payload" });
 //# sourceMappingURL=smartDesktopDesignerActions.js.map

package/react/actions/smartDesktopDesignerActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"smartDesktopDesignerActions.js","sourceRoot":"","sources":["../../../../src/ui/actions/smartDesktopDesignerActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAW,MAAM,UAAU,CAAC;AAYrD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAQ,CAClD;IACC,WAAW,EAAE,MAAM,EAAU;IAC7B,WAAW,EAAE,MAAM,EAAmB;IACtC,OAAO,EAAE,MAAM,EAAiB;IAChC,kBAAkB,EAAE,MAAM,EAAiB;IAC3C,UAAU,EAAE,MAAM,EAAiB;IACnC,UAAU,EAAE,MAAM,EAAU;IAC5B,YAAY,EAAE,MAAM,EAAY;IAChC,eAAe,EAAE,MAAM,EAAc;IACrC,mBAAmB,EAAE,MAAM,EAAsB;IACjD,eAAe,EAAE,MAAM,EAAqB;IAC5C,iBAAiB,EAAE,MAAM,EAAiB;IAC1C,iBAAiB,EAAE,MAAM,EAAW;IACpC,gBAAgB,EAAE,MAAM,EAAmB;IAC3C,sBAAsB,EAAE,MAAM,EAAW;IACzC,oBAAoB,EAAE,MAAM,EAA0B;IACtD,oBAAoB,EAAE,MAAM,EAAU;IACtC,iBAAiB,EAAE,MAAM,EAAgB;IACzC,oBAAoB,EAAE,MAAM,EAAgB;IAC5C,4BAA4B,EAAE,MAAM,EAAW;CAC/C,EACD,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CACjC,CAAC"}
+{"version":3,"file":"smartDesktopDesignerActions.js","sourceRoot":"","sources":["../../../../src/ui/actions/smartDesktopDesignerActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAW,MAAM,UAAU,CAAC;AAYrD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAQ,CAClD;IACC,WAAW,EAAE,MAAM,EAAU;IAC7B,WAAW,EAAE,MAAM,EAAmB;IACtC,OAAO,EAAE,MAAM,EAAiB;IAChC,kBAAkB,EAAE,MAAM,EAAiB;IAC3C,UAAU,EAAE,MAAM,EAAiB;IACnC,UAAU,EAAE,MAAM,EAAU;IAC5B,YAAY,EAAE,MAAM,EAAY;IAChC,eAAe,EAAE,MAAM,EAAc;IACrC,mBAAmB,EAAE,MAAM,EAAsB;IACjD,eAAe,EAAE,MAAM,EAAqB;IAC5C,iBAAiB,EAAE,MAAM,EAAiB;IAC1C,iBAAiB,EAAE,MAAM,EAAW;IACpC,gBAAgB,EAAE,MAAM,EAAmB;IAC3C,sBAAsB,EAAE,MAAM,EAAW;IACzC,oBAAoB,EAAE,MAAM,EAA0B;IACtD,oBAAoB,EAAE,MAAM,EAAU;IACtC,iBAAiB,EAAE,MAAM,EAAgB;IACzC,oBAAoB,EAAE,MAAM,EAAgB;IAC5C,4BAA4B,EAAE,MAAM,EAAW;IAC/C,gBAAgB,EAAE,MAAM,EAAU;CAClC,EACD,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CACjC,CAAC"}

package/react/assets/css/download.css

@@ -0,0 +1,119 @@
+body {
+	overflow-x: hidden;
+}
+
+.download-header {
+	display: flex;
+	width: 191px;
+	height: 31px;
+	margin: 20px 156px 10px 0;
+	font-family: OpenSans;
+	font-size: 21px;
+}
+
+.download-title {
+	display: inline-block;
+}
+
+.download-settings {
+	margin: 0 19.6px 0 105%;
+}
+
+.no-downloads {
+	margin: 20px 0 16px 21px;
+}
+
+.download-row {
+	margin: 10px 16px 15.9px 20px;
+	border-bottom: solid 1px #979797;
+}
+
+.download-progress-button-row {
+	display: inline-block;
+	margin-bottom: 20px;
+}
+
+.download-name {
+	margin: 0 196px 0 0;
+	font-family: OpenSans;
+	font-size: 12px;
+	font-weight: bold;
+	font-stretch: normal;
+	font-style: normal;
+	line-height: 1.5;
+	letter-spacing: normal;
+	color: #fff;
+}
+
+.download-url {
+	margin: 0 0 16px;
+	width: 80%;
+	font-family: OpenSans;
+	font-size: 12px;
+	font-weight: normal;
+	font-stretch: normal;
+	font-style: normal;
+	letter-spacing: normal;
+	color: #5b606f;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.download-progress {
+	width: 98px;
+	height: 12px;
+	margin: 17px 12px 28px 0;
+	font-family: OpenSans;
+	font-size: 10px;
+	font-weight: normal;
+	font-stretch: normal;
+	font-style: normal;
+	line-height: 1.2;
+	letter-spacing: normal;
+	color: #fff;
+}
+
+.download-buttons {
+	height: 12px;
+	margin: 16px 0 20px 3px;
+	font-family: OpenSans;
+	font-size: 10px;
+	font-weight: normal;
+	font-stretch: normal;
+	font-style: normal;
+	line-height: 1.2;
+	letter-spacing: normal;
+	color: #fff;
+}
+
+.download-remove {
+	width: 9.6px;
+	height: 9.6px;
+	margin: 0 19.6px 0 90%;
+	object-fit: contain;
+}
+
+.button-container-icon span.btn-label {
+	font-size: 10px;
+}
+
+.finsemble-download-pause svg {
+	fill: #fdda0d;
+}
+
+.finsemble-download-cancel svg {
+	fill: #f26666;
+}
+
+.finsemble-download-resume svg {
+	fill: #2cc13f;
+}
+
+.download-settings-button svg .finsemble-download-remove svg {
+	fill: #979797;
+}
+
+.finsemble-download-folder svg {
+	fill: #42a5ba;
+}

package/react/assets/css/userPreferences.css

@@ -141,6 +141,11 @@ img {
 	overflow: auto;
 }
 
+.complex-menu-content-row .checkbox-wrapper {
+	display: flex;
+	align-items: center;
+}
+
 .items-header {
 	font-size: 1.4em;
 }
@@ -404,6 +409,22 @@ img {
 	color: var(--core-primary-5);
 }
 
+.download-header {
+	margin: 30px 29px 10px 10px;
+	font-family: OpenSans;
+	font-size: 21px;
+	font-weight: bold;
+}
+
+.download-location-row {
+	display: flex;
+}
+
+.download-location-label {
+	display: inline-block;
+	padding-right: 10px;
+}
+
 .disabled-restart {
 	/* stylelint-disable-next-line declaration-no-important */
 	color: var(--core-primary-5) !important;
@@ -448,6 +469,10 @@ option:focus {
 	text-align: center;
 }
 
+.dashbar-items-table tr.dashbar-preferences-item td span.finsembleToggle {
+	display: flex;
+}
+
 /* Notifications Preferences */
 
 .notifications-main-preferences__container {
@@ -520,6 +545,31 @@ option:focus {
 	margin-left: auto;
 }
 
+.finsemble-dropdown__btn.file-left {
+	width: 348px;
+	border-radius: 0;
+	background-color: #5b606f;
+}
+
+.finsemble-dropdown__btn.file-left i {
+	margin-left: auto;
+}
+
+.finsemble-dropdown__btn-options.file-options-left {
+	margin-right: auto;
+	max-width: 400px;
+	width: 360px;
+	white-space: normal;
+	overflow-wrap: break-word;
+	text-align: left;
+	top: 100%;
+	right: auto;
+	left: 0;
+	background-color: #5b606f;
+	border-radius: 0;
+	padding: 5px 2px;
+}
+
 .heading-larger {
 	font-size: var(--font-size-larger);
 	color: var(--core-primary-5);

package/react/assets/css/windowTitleBar.css

@@ -132,6 +132,7 @@ html.desktop-active .fsbl-tab-title-text {
 	color: var(--titleBar-active-font-color);
 }
 
+/* This class applies to a tab that is ALONE and active. For tabs that have neighbors, see .fsbl-tab */
 .fsbl-header-title {
 	position: relative;
 	height: 100%;
@@ -143,7 +144,7 @@ html.desktop-active .fsbl-tab-title-text {
 	transition: background-color 0.2s ease;
 	border-top-left-radius: 10px;
 	border-top-right-radius: 10px;
-	background-color: var(--titlebar-tab-inactive-background-color);
+	background-color: var(--titlebar-tab-active-background-color);
 }
 
 .fsbl-header-title:hover {