@etsoo/appscript 1.2.95 → 1.2.97

package/__tests__/app/CoreApp.ts

@@ -71,7 +71,7 @@ class CoreAppTest extends CoreApp<
                 /**
                  * App root url
                  */
-                homepage: '',
+                homepage: '/cms',
 
                 /**
                  * Web url of the cloud
@@ -125,6 +125,12 @@ class CoreAppTest extends CoreApp<
 
 const app = new CoreAppTest();
 
+test('Tests for addRootUrl', () => {
+    expect(app.addRootUrl('/home')).toBe('/cms/home');
+    expect(app.addRootUrl('./home')).toBe('/cms/./home');
+    expect(app.addRootUrl('home')).toBe('/cms/home');
+});
+
 test('Tests for encrypt / decrypt', () => {
     // Arrange
     const input = 'Hello, world!';

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

@@ -141,6 +141,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected addIdentifier(field: string): string;
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string): string;
     /**
      * Restore settings from persisted source
      */

package/lib/cjs/app/CoreApp.js

@@ -149,6 +149,21 @@ class CoreApp {
     addIdentifier(field) {
         return field + '-' + this.name;
     }
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url) {
+        const page = this.settings.homepage;
+        const endSlash = page.endsWith('/');
+        return (page +
+            (endSlash
+                ? shared_1.Utils.trimStart(url, '/')
+                : url.startsWith('/')
+                    ? url
+                    : '/' + url));
+    }
     /**
      * Restore settings from persisted source
      */

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

@@ -129,6 +129,12 @@ export interface IApp {
      * Is screen size up 'md'
      */
     mdUp?: boolean;
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string): string;
     /**
      * Alert action result
      * @param result Action result

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

@@ -141,6 +141,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected addIdentifier(field: string): string;
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string): string;
     /**
      * Restore settings from persisted source
      */

package/lib/mjs/app/CoreApp.js

@@ -146,6 +146,21 @@ export class CoreApp {
     addIdentifier(field) {
         return field + '-' + this.name;
     }
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url) {
+        const page = this.settings.homepage;
+        const endSlash = page.endsWith('/');
+        return (page +
+            (endSlash
+                ? Utils.trimStart(url, '/')
+                : url.startsWith('/')
+                    ? url
+                    : '/' + url));
+    }
     /**
      * Restore settings from persisted source
      */

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

@@ -129,6 +129,12 @@ export interface IApp {
      * Is screen size up 'md'
      */
     mdUp?: boolean;
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string): string;
     /**
      * Alert action result
      * @param result Action result

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.95",
+    "version": "1.2.97",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.7",
         "@etsoo/restclient": "^1.0.73",
-        "@etsoo/shared": "^1.1.57",
+        "@etsoo/shared": "^1.1.58",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -65,14 +65,14 @@
         "@babel/preset-env": "^7.19.1",
         "@babel/runtime-corejs3": "^7.19.1",
         "@types/jest": "^29.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.37.0",
-        "@typescript-eslint/parser": "^5.37.0",
-        "eslint": "^8.23.1",
+        "@typescript-eslint/eslint-plugin": "^5.38.0",
+        "@typescript-eslint/parser": "^5.38.0",
+        "eslint": "^8.24.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.0.3",
         "jest-environment-jsdom": "^29.0.3",
-        "ts-jest": "^29.0.1",
+        "ts-jest": "^29.0.2",
         "typescript": "^4.8.3"
     }
 }

package/src/app/CoreApp.ts

@@ -303,6 +303,24 @@ export abstract class CoreApp<
         return field + '-' + this.name;
     }
 
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string) {
+        const page = this.settings.homepage;
+        const endSlash = page.endsWith('/');
+        return (
+            page +
+            (endSlash
+                ? Utils.trimStart(url, '/')
+                : url.startsWith('/')
+                ? url
+                : '/' + url)
+        );
+    }
+
     /**
      * Restore settings from persisted source
      */

package/src/app/IApp.ts

@@ -170,6 +170,13 @@ export interface IApp {
      */
     mdUp?: boolean;
 
+    /**
+     * Add root (homepage) to the URL
+     * @param url URL to add
+     * @returns Result
+     */
+    addRootUrl(url: string): string;
+
     /**
      * Alert action result
      * @param result Action result