@etsoo/appscript 1.2.39 → 1.2.43

package/lib/cjs/app/CoreApp.d.ts

@@ -312,6 +312,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -684,6 +689,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/cjs/app/CoreApp.js

@@ -802,6 +802,13 @@ class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url) {
+        window.location.href = url;
+    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -900,7 +907,7 @@ class CoreApp {
      */
     toLoginPage(tryLogin) {
         const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
     /**
      * Transform URL

package/lib/cjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Action result
  */
@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error): IActionResult<D>;
+    static create<D extends {} = {}>(error: Error): IActionResult<D>;
 }

package/lib/cjs/result/IActionResult.d.ts

@@ -1,19 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 /**
  * Result errors
  * Indexable type
@@ -24,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -65,4 +50,10 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export declare type ActionResultId = IActionResult<IdResultData>;
+export declare type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+    id: T;
+}>;
+/**
+ * Action result with dynamic data
+ */
+export declare type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/cjs/result/InitCallResult.d.ts

@@ -1,8 +1,8 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -312,6 +312,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -684,6 +689,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/mjs/app/CoreApp.js

@@ -799,6 +799,13 @@ export class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url) {
+        window.location.href = url;
+    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -897,7 +904,7 @@ export class CoreApp {
      */
     toLoginPage(tryLogin) {
         const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
     /**
      * Transform URL

package/lib/mjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Action result
  */
@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error): IActionResult<D>;
+    static create<D extends {} = {}>(error: Error): IActionResult<D>;
 }

package/lib/mjs/result/IActionResult.d.ts

@@ -1,19 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 /**
  * Result errors
  * Indexable type
@@ -24,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -65,4 +50,10 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export declare type ActionResultId = IActionResult<IdResultData>;
+export declare type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+    id: T;
+}>;
+/**
+ * Action result with dynamic data
+ */
+export declare type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/mjs/result/InitCallResult.d.ts

@@ -1,8 +1,8 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.39",
+    "version": "1.2.43",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -428,6 +428,12 @@ export interface ICoreApp<
      */
     persist(): void;
 
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
+
     /**
      * Switch organization
      * @param id Organization id
@@ -1496,6 +1502,14 @@ export abstract class CoreApp<
         this.lastWarning?.dismiss();
     }
 
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void {
+        window.location.href = url;
+    }
+
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -1618,7 +1632,7 @@ export abstract class CoreApp<
         const url = this.transformUrl(
             '/' + (tryLogin ? '' : '?tryLogin=false')
         );
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
 
     /**

package/src/result/ActionResult.ts

@@ -1,5 +1,5 @@
 import { ApiError } from '@etsoo/restclient';
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 
 /**
  * Action result
@@ -9,7 +9,7 @@ export class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error) {
+    static create<D extends {} = {}>(error: Error) {
         // If the error is ApiError, hold the status
         const status = error instanceof ApiError ? error.status : undefined;
 

package/src/result/IActionResult.ts

@@ -1,20 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 
 /**
  * Result errors
@@ -27,7 +11,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -77,4 +61,12 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export type ActionResultId = IActionResult<IdResultData>;
+export type IdActionResult<T extends DataTypes.IdType = number> =
+    IActionResult<{
+        id: T;
+    }>;
+
+/**
+ * Action result with dynamic data
+ */
+export type DynamicActionResult = IActionResult<Record<string, any>>;

package/src/result/InitCallResult.ts

@@ -1,9 +1,9 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */