@etsoo/appscript 1.4.26 → 1.4.28

package/__tests__/app/CoreApp.ts

@@ -333,6 +333,11 @@ test('Tests for publicApi', async () => {
     });
     expect(defaultExchangeRate?.exchangeRate).toBe(100);
 
+    const url = app.publicApi.getOrgAvatar(1);
+    expect(url).toBe(
+        'http://localhost/com.etsoo.SmartERPApi/api/Storage/OrgAvatar/1'
+    );
+
     /*
     const amount1 = await app.publicApi.exchangeAmount(1000, 'NZD', 'CNY');
     const amount2 = await app.publicApi.exchangeAmount(100, 'NZD', 'USD');
@@ -343,5 +348,6 @@ test('Tests for publicApi', async () => {
 
     const orgsQuery = await app.orgApi.query({ currentPage: 1, batchSize: 2 });
     console.log(orgsQuery);
+
     */
 });

package/lib/cjs/app/CoreApp.js

@@ -1299,7 +1299,9 @@ class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        const url = '/?url=' +
+            encodeURIComponent(location.href) +
+            (tryLogin ? '' : '&tryLogin=false');
         this.navigate(url);
     }
     /**

package/lib/cjs/erp/PublicApi.d.ts

@@ -63,6 +63,12 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies: (Currency | string)[], months?: number, payload?: IApiPayload<ExchangeRateHistoryDto[]>): Promise<ExchangeRateHistoryDto[] | undefined>;
+    /**
+     * Get organization's avatar URL
+     * @param id Organization id
+     * @returns Result
+     */
+    getOrgAvatar(id: number): string;
     /**
      * Get currency label
      * @param currency Currency

package/lib/cjs/erp/PublicApi.js

@@ -118,6 +118,14 @@ class PublicApi extends BaseApi_1.BaseApi {
         payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [] });
         return this.api.post('Public/ExchangeRateHistory', { currencies, months }, payload);
     }
+    /**
+     * Get organization's avatar URL
+     * @param id Organization id
+     * @returns Result
+     */
+    getOrgAvatar(id) {
+        return `${this.api.baseUrl}Storage/OrgAvatar/${id}`;
+    }
     /**
      * Get currency label
      * @param currency Currency

package/lib/mjs/app/CoreApp.js

@@ -1273,7 +1273,9 @@ export class CoreApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        const url = '/?url=' +
+            encodeURIComponent(location.href) +
+            (tryLogin ? '' : '&tryLogin=false');
         this.navigate(url);
     }
     /**

package/lib/mjs/erp/PublicApi.d.ts

@@ -63,6 +63,12 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies: (Currency | string)[], months?: number, payload?: IApiPayload<ExchangeRateHistoryDto[]>): Promise<ExchangeRateHistoryDto[] | undefined>;
+    /**
+     * Get organization's avatar URL
+     * @param id Organization id
+     * @returns Result
+     */
+    getOrgAvatar(id: number): string;
     /**
      * Get currency label
      * @param currency Currency

package/lib/mjs/erp/PublicApi.js

@@ -115,6 +115,14 @@ export class PublicApi extends BaseApi {
         payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [] });
         return this.api.post('Public/ExchangeRateHistory', { currencies, months }, payload);
     }
+    /**
+     * Get organization's avatar URL
+     * @param id Organization id
+     * @returns Result
+     */
+    getOrgAvatar(id) {
+        return `${this.api.baseUrl}Storage/OrgAvatar/${id}`;
+    }
     /**
      * Get currency label
      * @param currency Currency

package/package.json

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

package/src/app/CoreApp.ts

@@ -1667,7 +1667,10 @@ export abstract class CoreApp<
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin?: boolean) {
-        const url = '/' + (tryLogin ? '' : '?tryLogin=false');
+        const url =
+            '/?url=' +
+            encodeURIComponent(location.href) +
+            (tryLogin ? '' : '&tryLogin=false');
         this.navigate(url);
     }
 

package/src/erp/PublicApi.ts

@@ -158,6 +158,15 @@ export class PublicApi extends BaseApi {
         );
     }
 
+    /**
+     * Get organization's avatar URL
+     * @param id Organization id
+     * @returns Result
+     */
+    getOrgAvatar(id: number) {
+        return `${this.api.baseUrl}Storage/OrgAvatar/${id}`;
+    }
+
     /**
      * Get currency label
      * @param currency Currency