From 8effbafa2564f0173aa22b8c53d76f883a989e98 Mon Sep 17 00:00:00 2001 From: Daniela Date: Wed, 24 Nov 2021 09:44:52 +0100 Subject: [PATCH 01/10] fix provenance graph replay wait for the obj ref to be defined when replaying --- dist/components/dialogs.d.ts | 1 - dist/dummy/DummyReactView.d.ts | 1 - dist/provenance/ProvenanceGraphUtils.js | 9 ++++++++- dist/provenance/ProvenanceGraphUtils.js.map | 2 +- dist/table/PHOVEA_UI_Table.d.ts | 1 - src/provenance/ProvenanceGraphUtils.ts | 9 ++++++++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dist/components/dialogs.d.ts b/dist/components/dialogs.d.ts index e17cc6bc1..706b80bde 100644 --- a/dist/components/dialogs.d.ts +++ b/dist/components/dialogs.d.ts @@ -1,6 +1,5 @@ /// /// -/// /// import '../webpack/_bootstrap'; export interface IDialogOptions { diff --git a/dist/dummy/DummyReactView.d.ts b/dist/dummy/DummyReactView.d.ts index b2363a9e6..93050f4dd 100644 --- a/dist/dummy/DummyReactView.d.ts +++ b/dist/dummy/DummyReactView.d.ts @@ -1,4 +1,3 @@ -/// import { ISelector } from '../views/AReactView'; import { AReactChooserView } from '../views/AReactChooserView'; export declare class DummyReactView extends AReactChooserView { diff --git a/dist/provenance/ProvenanceGraphUtils.js b/dist/provenance/ProvenanceGraphUtils.js index d7fcb3da5..b41ade6b9 100644 --- a/dist/provenance/ProvenanceGraphUtils.js +++ b/dist/provenance/ProvenanceGraphUtils.js @@ -106,7 +106,14 @@ export class ProvenanceGraphUtils { } const lazyFunction = (id) => { let _resolved = null; - return function (inputs, parameters) { + return async function (inputs, parameters) { + // ObjectRef value might not be defined when replayed -> therefore + // waiting until it is defined + let counter = 0; + while (!inputs.every((o) => o.v) && counter < 10) { + await new Promise((resolve) => setTimeout(resolve, 500)); + counter++; + } const that = this, args = Array.from(arguments); if (_resolved == null) { _resolved = resolveFun(id); diff --git a/dist/provenance/ProvenanceGraphUtils.js.map b/dist/provenance/ProvenanceGraphUtils.js.map index c7150384e..e8d73bbbf 100644 --- a/dist/provenance/ProvenanceGraphUtils.js.map +++ b/dist/provenance/ProvenanceGraphUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"ProvenanceGraphUtils.js","sourceRoot":"","sources":["../../src/provenance/ProvenanceGraphUtils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ProvenanceGraphUtils.js","sourceRoot":"","sources":["../../src/provenance/ProvenanceGraphUtils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/table/PHOVEA_UI_Table.d.ts b/dist/table/PHOVEA_UI_Table.d.ts index 70f7f8c76..f588ff19d 100644 --- a/dist/table/PHOVEA_UI_Table.d.ts +++ b/dist/table/PHOVEA_UI_Table.d.ts @@ -1,4 +1,3 @@ -/// import { Column } from 'react-table'; export interface ITableProps { columns: Column[]; diff --git a/src/provenance/ProvenanceGraphUtils.ts b/src/provenance/ProvenanceGraphUtils.ts index b2750936e..77c3b0cf4 100644 --- a/src/provenance/ProvenanceGraphUtils.ts +++ b/src/provenance/ProvenanceGraphUtils.ts @@ -118,7 +118,14 @@ export class ProvenanceGraphUtils { const lazyFunction = (id: string) => { let _resolved: PromiseLike = null; - return function (this: any, inputs: IObjectRef[], parameters: any) { + return async function (this: any, inputs: IObjectRef[], parameters: any) { + // ObjectRef value might not be defined when replayed -> therefore + // waiting until it is defined + let counter = 0; + while(!inputs.every((o) => o.v) && counter < 10) { + await new Promise((resolve) => setTimeout(resolve, 500)); + counter++; + } const that = this, args = Array.from(arguments); if (_resolved == null) { _resolved = resolveFun(id); From c6aa3b9474b47bc00e643ebc580880d428351bb8 Mon Sep 17 00:00:00 2001 From: Michael Puehringer Date: Thu, 2 Dec 2021 17:25:17 +0100 Subject: [PATCH 02/10] Added flask-smorest, marshmallow and marshmallow-sqlalchemy --- requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements.txt b/requirements.txt index 1a9e22044..e14dfb90e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,10 @@ pymongo~=3.11.1 requests~=2.25.0 SQLAlchemy==1.3.20 +marshmallow==3.14.1 +marshmallow-sqlalchemy==0.26.1 +# Last version to support flask < 2: https://flask-smorest.readthedocs.io/en/latest/changelog.html#id10 +flask-smorest==0.30.0 urllib3==1.26.5 flask-swagger-ui==3.36.0 yamlreader==3.0.4 From 427113ca73891e7bca1f03c4bee52d089ee00dc0 Mon Sep 17 00:00:00 2001 From: Michael Puehringer Date: Thu, 2 Dec 2021 17:42:03 +0100 Subject: [PATCH 03/10] Fixed tour backdrop blocker --- dist/scss/components/_tour.scss | 2 ++ dist/tour/TourManager.js | 6 +++--- dist/tour/TourManager.js.map | 2 +- src/scss/components/_tour.scss | 2 ++ src/tour/TourManager.ts | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dist/scss/components/_tour.scss b/dist/scss/components/_tour.scss index 2cf277e03..ac6b31927 100644 --- a/dist/scss/components/_tour.scss +++ b/dist/scss/components/_tour.scss @@ -18,6 +18,8 @@ $step-border: lightgray !default; z-index: 1999; top: 0; left: 0; + right: 0; + bottom: 0; animation: tdp-tour-fade-in 0.2; } .tdp-tour-backdrop { diff --git a/dist/tour/TourManager.js b/dist/tour/TourManager.js index de7abcbfe..fd30b5ff1 100644 --- a/dist/tour/TourManager.js +++ b/dist/tour/TourManager.js @@ -383,9 +383,9 @@ export class TourManager { this.takeDown(); if (finished) { this.rememberFinished(this.activeTour); - const finished = this.chooser.querySelector(`li[data-id="${this.activeTour.id}"] > i`); - finished.classList.remove('fa-square-o'); - finished.classList.add('fa-check-square'); + const finishedTourNode = this.chooser.querySelector(`li[data-id="${this.activeTour.id}"] > i`); + finishedTourNode === null || finishedTourNode === void 0 ? void 0 : finishedTourNode.classList.remove('fa-square-o'); + finishedTourNode === null || finishedTourNode === void 0 ? void 0 : finishedTourNode.classList.add('fa-check-square'); } this.activeTour = null; this.activeTourContext = null; diff --git a/dist/tour/TourManager.js.map b/dist/tour/TourManager.js.map index 9186e3571..4058dfe48 100644 --- a/dist/tour/TourManager.js.map +++ b/dist/tour/TourManager.js.map @@ -1 +1 @@ -{"version":3,"file":"TourManager.js","sourceRoot":"","sources":["../../src/tour/TourManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"TourManager.js","sourceRoot":"","sources":["../../src/tour/TourManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/scss/components/_tour.scss b/src/scss/components/_tour.scss index 2cf277e03..ac6b31927 100644 --- a/src/scss/components/_tour.scss +++ b/src/scss/components/_tour.scss @@ -18,6 +18,8 @@ $step-border: lightgray !default; z-index: 1999; top: 0; left: 0; + right: 0; + bottom: 0; animation: tdp-tour-fade-in 0.2; } .tdp-tour-backdrop { diff --git a/src/tour/TourManager.ts b/src/tour/TourManager.ts index 474cef70a..153495e96 100644 --- a/src/tour/TourManager.ts +++ b/src/tour/TourManager.ts @@ -445,9 +445,9 @@ export class TourManager { this.takeDown(); if (finished) { this.rememberFinished(this.activeTour); - const finished = this.chooser.querySelector(`li[data-id="${this.activeTour.id}"] > i`); - finished.classList.remove('fa-square-o'); - finished.classList.add('fa-check-square'); + const finishedTourNode = this.chooser.querySelector(`li[data-id="${this.activeTour.id}"] > i`); + finishedTourNode?.classList.remove('fa-square-o'); + finishedTourNode?.classList.add('fa-check-square'); } this.activeTour = null; this.activeTourContext = null; From 97bd676d1f258b6a4d05002d8cd77cfa55fdb87f Mon Sep 17 00:00:00 2001 From: Michael Puehringer Date: Thu, 2 Dec 2021 18:09:57 +0100 Subject: [PATCH 04/10] Unified the two login menus into single one --- dist/ATDPApplication.d.ts | 2 +- dist/ATDPApplication.js | 2 +- dist/base/LoginMenu.d.ts | 30 +++----------- dist/base/LoginMenu.js | 30 +++++++------- dist/base/LoginMenu.js.map | 2 +- dist/hooks/useBootstrap.js | 1 + dist/hooks/useBootstrap.js.map | 2 +- dist/lineup/internal/ScoreUtils.d.ts | 16 +++----- dist/menu/LoginMenu.d.ts | 9 ----- dist/menu/LoginMenu.js | 14 ------- dist/menu/LoginMenu.js.map | 1 - dist/menu/index.d.ts | 1 - dist/menu/index.js | 1 - dist/menu/index.js.map | 2 +- dist/stratification/Stratification.d.ts | 2 +- dist/utils/TDPApplicationUtils.d.ts | 6 ++- dist/wrapper/CLUEWrapper.js | 2 +- src/ATDPApplication.ts | 2 +- src/base/LoginMenu.ts | 54 +++++++++---------------- src/menu/LoginMenu.ts | 21 ---------- src/menu/index.ts | 1 - src/wrapper/CLUEWrapper.ts | 2 +- 22 files changed, 59 insertions(+), 144 deletions(-) delete mode 100644 dist/menu/LoginMenu.d.ts delete mode 100644 dist/menu/LoginMenu.js delete mode 100644 dist/menu/LoginMenu.js.map delete mode 100644 src/menu/LoginMenu.ts diff --git a/dist/ATDPApplication.d.ts b/dist/ATDPApplication.d.ts index 5196ca6e6..fd4bf3d8e 100644 --- a/dist/ATDPApplication.d.ts +++ b/dist/ATDPApplication.d.ts @@ -3,7 +3,7 @@ import './webpack/_bootstrap'; import { TourManager } from './tour/TourManager'; import { IAuthorizationConfiguration } from './auth'; import { ACLUEWrapper } from './wrapper'; -import { LoginMenu } from './menu'; +import { LoginMenu } from './base'; import { CLUEGraphManager } from './base'; import { IMixedStorageProvenanceGraphManagerOptions, ProvenanceGraph } from './provenance'; export interface ITDPOptions { diff --git a/dist/ATDPApplication.js b/dist/ATDPApplication.js index 94189e454..df2fb002f 100644 --- a/dist/ATDPApplication.js +++ b/dist/ATDPApplication.js @@ -8,7 +8,7 @@ import { TourManager } from './tour/TourManager'; import { TemporarySessionList } from './utils/SessionList'; import { TDPTokenManager } from './auth'; import { ACLUEWrapper } from './wrapper'; -import { LoginMenu } from './menu'; +import { LoginMenu } from './base'; import { Ajax, BaseUtils, ButtonModeSelector, CLUEGraphManager } from './base'; import { UserSession, PluginRegistry } from './app'; import { I18nextManager } from './i18n'; diff --git a/dist/base/LoginMenu.d.ts b/dist/base/LoginMenu.d.ts index d2983d916..cbd4ce0db 100644 --- a/dist/base/LoginMenu.d.ts +++ b/dist/base/LoginMenu.d.ts @@ -1,43 +1,25 @@ import { EventHandler } from './event'; -export interface PHOVEA_SECURITY_FLASK_ILoginMenuOptions { +import { AppHeader } from '../components'; +export interface ILoginMenuOptions { /** * formular used for the login dialog */ loginForm?: string; document?: Document; watch?: boolean; -} -export interface ILoginMenuAdapter { - wait(): void; - ready(): void; - /** - * `($(selector)).modal('hide');` - * @param {string} selector - */ - hideDialog(selector: string): void; - /** - * ``` - * $(selector).modal('show') - * .on('shown.bs.modal', function () { - * ($(focusSelector, $loginDialog)).focus(); - * }); - * ``` - * @param {string} selector - * @param {string} focusSelector - */ - showAndFocusOn(selector: string, focusSelector: string): void; + insertIntoHeader?: boolean; } /** * utility login menu that can be added to the Appheader for instance */ -export declare class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { - private readonly adapter; +export declare class LoginMenu extends EventHandler { + private readonly header; static readonly EVENT_LOGGED_IN = "loggedIn"; static readonly EVENT_LOGGED_OUT = "loggedOut"; readonly node: HTMLUListElement; private readonly options; private readonly customizer; - constructor(adapter: ILoginMenuAdapter, options?: PHOVEA_SECURITY_FLASK_ILoginMenuOptions); + constructor(header: AppHeader, options?: ILoginMenuOptions); private init; private logout; private runCustomizer; diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js index c5fe1beb9..302bde075 100644 --- a/dist/base/LoginMenu.js +++ b/dist/base/LoginMenu.js @@ -8,22 +8,24 @@ import { SessionWatcher } from './watcher'; /** * utility login menu that can be added to the Appheader for instance */ -// tslint:disable-next-line: class-name -export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { - constructor(adapter, options = {}) { +export class LoginMenu extends EventHandler { + constructor(header, options = {}) { super(); - this.adapter = adapter; + this.header = header; this.options = { loginForm: undefined, document, watch: false }; - BaseUtils.mixin(this.options, options); + BaseUtils.mixin(this.options, { document: header.rightMenu.ownerDocument }, options); this.customizer = PluginRegistry.getInstance().listPlugins(EXTENSION_POINT_CUSTOMIZED_LOGIN_FORM); this.node = this.init(); if (this.options.watch) { SessionWatcher.startWatching(() => this.logout()); } + if (this.options.insertIntoHeader) { + this.header.insertCustomRightMenu(this.node); + } } init() { const doc = this.options.document; @@ -53,9 +55,9 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { } logout() { const doc = this.options.document; - this.adapter.wait(); + this.header.wait(); LoginUtils.logout().then(() => { - this.fire(PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_OUT); + this.fire(LoginMenu.EVENT_LOGGED_OUT); const userMenu = doc.querySelector('#user_menu'); if (userMenu) { userMenu.style.display = 'none'; @@ -64,7 +66,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { Array.from(doc.querySelectorAll('.login_required')).forEach((n) => { n.classList.add('disabled'); }); - this.adapter.ready(); + this.header.ready(); }); } runCustomizer(menu, dialog) { @@ -76,7 +78,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { const doc = this.options.document; const loginDialog = doc.querySelector('#loginDialog'); loginDialog.querySelector('.modal-header .btn-close').setAttribute('hidden', null); // disable closing the dialog - this.adapter.showAndFocusOn('#loginDialog', '#login_username'); + this.header.showAndFocusOn('#loginDialog', '#login_username'); } initLoginDialog(body) { let loginForm = this.options.loginForm; @@ -111,7 +113,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { LoginUtils.bindLoginForm(form, (error, user) => { const success = !error && user; if (!success) { - this.adapter.ready(); + this.header.ready(); if (error === 'not_reachable') { dialog.classList.add('has-warning'); } @@ -121,7 +123,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { } return; } - this.fire(PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_IN); + this.fire(LoginMenu.EVENT_LOGGED_IN); const doc = this.options.document; dialog.classList.remove('has-error', 'has-warning'); const userMenu = doc.querySelector('#user_menu'); @@ -138,7 +140,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { n.classList.remove('disabled'); n.setAttribute('disabled', null); }); - this.adapter.hideDialog('#loginDialog'); + this.header.hideDialog('#loginDialog'); }, () => { // reset error dialog.classList.remove('has-error', 'has-warning'); @@ -146,6 +148,6 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { return dialog; } } -PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_IN = 'loggedIn'; -PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_OUT = 'loggedOut'; +LoginMenu.EVENT_LOGGED_IN = 'loggedIn'; +LoginMenu.EVENT_LOGGED_OUT = 'loggedOut'; //# sourceMappingURL=LoginMenu.js.map \ No newline at end of file diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map index 784ab73b7..232e4d53d 100644 --- a/dist/base/LoginMenu.js.map +++ b/dist/base/LoginMenu.js.map @@ -1 +1 @@ -{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/hooks/useBootstrap.js b/dist/hooks/useBootstrap.js index 0a1cca7bd..80ee19c9c 100644 --- a/dist/hooks/useBootstrap.js +++ b/dist/hooks/useBootstrap.js @@ -22,6 +22,7 @@ function useBSClass(clazz, ...options) { }); }, []); React.useEffect(() => { + // Whenever we are unmounting (an instance), destroy it. return () => instance === null || instance === void 0 ? void 0 : instance.dispose(); }, [instance]); return [setRef, instance]; diff --git a/dist/hooks/useBootstrap.js.map b/dist/hooks/useBootstrap.js.map index 1e4f59f30..37661351f 100644 --- a/dist/hooks/useBootstrap.js.map +++ b/dist/hooks/useBootstrap.js.map @@ -1 +1 @@ -{"version":3,"file":"useBootstrap.js","sourceRoot":"","sources":["../../src/hooks/useBootstrap.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"useBootstrap.js","sourceRoot":"","sources":["../../src/hooks/useBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAetG,SAAS,UAAU,CACjB,KAAQ,EACR,GAAG,OAA4C;IAE/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,GAAuB,EAAE,EAAE;QAC3D,WAAW,CAAC,CAAC,eAAe,EAAE,EAAE;YAC9B,iDAAiD;YACjD,aAAa;YACb,IAAI,eAAe,IAAI,GAAG,IAAI,GAAG,KAAK,eAAe,CAAC,QAAQ,EAAE;gBAC9D,OAAO,eAAe,CAAC;aACxB;YACD,2BAA2B;YAC3B,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,GAAG;YAC3B,qCAAqC;YACrC,IAAI,GAAG,EAAE;gBACP,mFAAmF;gBACnF,OAAO,IAAI,KAAK,CAAC,GAAG,EAAE,GAAG,OAAO,CAAoB,CAAC;aACtD;YACD,2CAA2C;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,wDAAwD;QACxD,OAAO,GAAG,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,EAAE,CAAC;IACnC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,YAAY,CAAsC,KAAQ;IACjE,OAAO,CAAC,GAAG,OAA4C,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,CAAC;AAC5F,CAAC;AAID,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;AAC1C,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;AAEpD;;;;GAIG;AACH,MAAM,gBAAiB,SAAQ,KAAK,CAAC,SAAS;IAG5C,MAAM;QACJ,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;;AAJM,4BAAW,GAAG,oBAAoB,CAAC;AAO5C;;;;GAIG;AACH,SAAS,OAAO,CACd,IAAc,EACd,cAA4F;IAE5F,OAAO,CAAC,EACN,QAAQ,EACR,WAAW;IACX,iIAAiI;IACjI,GAAG,OAAO,EAU8B,EAAE,EAAE;QAC5C,uBAAuB;QACvB,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtC,6EAA6E;QAC7E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,QAAQ,EAAE;QAC1B,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEf,qDAAqD;QACrD,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,QAAQ,EAAE,OAAO,EAAE;QAEpC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CACnC,CAAC,UAAU,EAAE,EAAE;YACb,IAAI;gBACF,oEAAoE;gBACpE,mGAAmG;gBACnG,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAgB,CAAC,CAAC;aACtD;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,CAAC;aACX;QACH,CAAC,EACD,CAAC,GAAG,CAAC,CACN,CAAC;QAEF,2BAA2B;QAC3B,OAAO,oBAAC,gBAAgB,IAAC,GAAG,EAAE,WAAW,IAAG,QAAQ,CAAoB,CAAC;IAC3E,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAmB,QAA0B,EAAE,SAAwC;IAC5G,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE;gBAC7B,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;aACzD;iBAAM;gBACL,aAAa;gBACb,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAuB,CAAC;gBACjD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChG,OAAO,GAAG,EAAE;oBACV,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACrG,CAAC,CAAC;aACH;SACF;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa,CAAC,QAAsD,EAAE,IAAa;IAC1F,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI;YACF,IAAI,IAAI,EAAE;gBACR,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,GAAG;aAClB;iBAAM;gBACL,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,GAAG;aAClB;SACF;QAAC,OAAM,CAAC,EAAE;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACvB,CAAC;AAED,mCAAmC;AACnC,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IACtI,cAAc,CAAC,QAAQ,EAAE;QACvB,gBAAgB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QACvC,iBAAiB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC1C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IACtI,cAAc,CAAC,QAAQ,EAAE;QACvB,gBAAgB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QACvC,iBAAiB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC1C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IAC1I,cAAc,CAAC,QAAQ,EAAE;QACvB,kBAAkB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QACzC,mBAAmB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC5C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAChC,cAAc,EACd,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAsF,EAAQ,EAAE;IACvI,cAAc,CAAC,QAAQ,EAAE;QACvB,oBAAoB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QAC3C,qBAAqB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC9C,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,IAAI,EAAE;YACR,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,aAAa,EAAE;SAC/B;aAAM;YACL,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,GAAG;SAClB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACvB,CAAC,CACF,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IAC1I,cAAc,CAAC,QAAQ,EAAE;QACvB,kBAAkB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QACzC,mBAAmB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC5C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IAC5I,cAAc,CAAC,QAAQ,EAAE;QACvB,mBAAmB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QAC1C,oBAAoB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC7C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAyD,EAAQ,EAAE;IAC5I,cAAc,CAAC,QAAQ,EAAE;QACvB,mBAAmB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC;QAC1C,oBAAoB,EAAE,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC;KAC7C,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,mBAAmB"} \ No newline at end of file diff --git a/dist/lineup/internal/ScoreUtils.d.ts b/dist/lineup/internal/ScoreUtils.d.ts index 347d03091..9725e7526 100644 --- a/dist/lineup/internal/ScoreUtils.d.ts +++ b/dist/lineup/internal/ScoreUtils.d.ts @@ -4,18 +4,12 @@ export declare class ScoreUtils { static readonly CMD_ADD_SCORE = "tdpAddScore"; static readonly CMD_REMOVE_SCORE = "tdpRemoveScore"; private static addScoreLogic; - static addScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ - inverse: import("../../provenance").IAction; - }>; - static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise<{ - inverse: import("../../provenance").IAction; - }>; - static removeScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ - inverse: import("../../provenance").IAction; - }>; - static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): import("../../provenance").IAction; + static addScoreImpl(inputs: IObjectRef[], parameter: any): any; + static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise; + static removeScoreImpl(inputs: IObjectRef[], parameter: any): any; + static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): any; static pushScoreAsync(graph: ProvenanceGraph, provider: IObjectRef, scoreName: string, scoreId: string, params: any): Promise; - static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): import("../../provenance").IAction; + static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): any; private static shallowEqualObjects; /** * compresses score creation and removal diff --git a/dist/menu/LoginMenu.d.ts b/dist/menu/LoginMenu.d.ts deleted file mode 100644 index f6e8b03a3..000000000 --- a/dist/menu/LoginMenu.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { AppHeader } from '../components'; -import { PHOVEA_SECURITY_FLASK_LoginMenu as BaseLoginMenu, PHOVEA_SECURITY_FLASK_ILoginMenuOptions as IBaseLoginMenuOptions } from '../base'; -export interface ILoginMenuOptions extends IBaseLoginMenuOptions { - insertIntoHeader?: boolean; -} -export declare class LoginMenu extends BaseLoginMenu { - private readonly header; - constructor(header: AppHeader, options?: ILoginMenuOptions); -} diff --git a/dist/menu/LoginMenu.js b/dist/menu/LoginMenu.js deleted file mode 100644 index e4cdc1002..000000000 --- a/dist/menu/LoginMenu.js +++ /dev/null @@ -1,14 +0,0 @@ -import { BaseUtils } from '../base'; -import { PHOVEA_SECURITY_FLASK_LoginMenu as BaseLoginMenu } from '../base'; -export class LoginMenu extends BaseLoginMenu { - constructor(header, options = {}) { - super(header, BaseUtils.mixin({ - document: header.rightMenu.ownerDocument - }, options)); - this.header = header; - if (options.insertIntoHeader) { - this.header.insertCustomRightMenu(this.node); - } - } -} -//# sourceMappingURL=LoginMenu.js.map \ No newline at end of file diff --git a/dist/menu/LoginMenu.js.map b/dist/menu/LoginMenu.js.map deleted file mode 100644 index 743fdddab..000000000 --- a/dist/menu/LoginMenu.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/menu/LoginMenu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,+BAA+B,IAAI,aAAa,EAExD,MAAM,SAAS,CAAC;AAOjB,MAAM,OAAO,SAAU,SAAQ,aAAa;IAC1C,YAA6B,MAAiB,EAAE,UAA6B,EAAE;QAC7E,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC;YAC5B,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,aAAa;SACzC,EAAE,OAAO,CAAC,CAAC,CAAC;QAHc,WAAM,GAAN,MAAM,CAAW;QAI5C,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9C;IACH,CAAC;CACF"} \ No newline at end of file diff --git a/dist/menu/index.d.ts b/dist/menu/index.d.ts index 28caf3fc2..a0558e204 100644 --- a/dist/menu/index.d.ts +++ b/dist/menu/index.d.ts @@ -1,2 +1 @@ -export * from './LoginMenu'; export * from './ProvenanceGraphMenu'; diff --git a/dist/menu/index.js b/dist/menu/index.js index ac17b359e..54d0fad12 100644 --- a/dist/menu/index.js +++ b/dist/menu/index.js @@ -1,3 +1,2 @@ -export * from './LoginMenu'; export * from './ProvenanceGraphMenu'; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/menu/index.js.map b/dist/menu/index.js.map index c07e75bf1..568b21fd5 100644 --- a/dist/menu/index.js.map +++ b/dist/menu/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/menu/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/menu/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"} \ No newline at end of file diff --git a/dist/stratification/Stratification.d.ts b/dist/stratification/Stratification.d.ts index 62428ed58..a83193e77 100644 --- a/dist/stratification/Stratification.d.ts +++ b/dist/stratification/Stratification.d.ts @@ -29,7 +29,7 @@ export declare class Stratification extends ADataType[], parameter: any, graph: ProvenanceGraph): any; - static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): any; + static setParameterImpl(inputs: IObjectRef[], parameter: any, graph: ProvenanceGraph): Promise<{ + inverse: import("../provenance").IAction; + }>; + static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): import("../provenance").IAction; static compressSetParameter(path: ActionNode[]): ActionNode[]; /** * @deprecated diff --git a/dist/wrapper/CLUEWrapper.js b/dist/wrapper/CLUEWrapper.js index a720294bf..d9775df3c 100644 --- a/dist/wrapper/CLUEWrapper.js +++ b/dist/wrapper/CLUEWrapper.js @@ -10,7 +10,7 @@ import { CLUEMode, ButtonModeSelector, ModeWrapper } from '../base/mode'; import { VisLoader } from '../vis/VisLoader'; import { CLUEGraphManager } from '../base/CLUEGraphManager'; import { ProvenanceGraphMenu } from '../menu/ProvenanceGraphMenu'; -import { LoginMenu } from '../menu/LoginMenu'; +import { LoginMenu } from '../base/LoginMenu'; import { ACLUEWrapper } from './ACLUEWrapper'; import * as d3 from 'd3'; import { AppHeader, AppHeaderLink } from '../components'; diff --git a/src/ATDPApplication.ts b/src/ATDPApplication.ts index d3f1cadd9..b230bf23e 100644 --- a/src/ATDPApplication.ts +++ b/src/ATDPApplication.ts @@ -9,7 +9,7 @@ import {TourManager} from './tour/TourManager'; import {TemporarySessionList} from './utils/SessionList'; import { IAuthorizationConfiguration, TDPTokenManager } from './auth'; import {ACLUEWrapper} from './wrapper'; -import {LoginMenu} from './menu'; +import {LoginMenu} from './base'; import {Ajax, BaseUtils, ButtonModeSelector, CLUEGraphManager} from './base'; import {UserSession, PluginRegistry} from './app'; import {I18nextManager} from './i18n'; diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts index e25ea832f..94ca2cbcd 100644 --- a/src/base/LoginMenu.ts +++ b/src/base/LoginMenu.ts @@ -5,11 +5,11 @@ import {I18nextManager} from '../i18n'; import {EXTENSION_POINT_CUSTOMIZED_LOGIN_FORM, ICustomizedLoginFormPluginDesc, ICustomizedLoginFormPlugin} from './extensions'; import {LoginUtils} from './LoginUtils'; import {SessionWatcher} from './watcher'; +import {AppHeader} from '../components'; // const DEFAULT_SESSION_TIMEOUT = 60 * 1000; // 10 min -// tslint:disable-next-line: class-name -export interface PHOVEA_SECURITY_FLASK_ILoginMenuOptions { +export interface ILoginMenuOptions { /** * formular used for the login dialog */ @@ -18,41 +18,19 @@ export interface PHOVEA_SECURITY_FLASK_ILoginMenuOptions { document?: Document; watch?: boolean; -} - -export interface ILoginMenuAdapter { - wait(): void; - ready(): void; - - /** - * `($(selector)).modal('hide');` - * @param {string} selector - */ - hideDialog(selector: string): void; - /** - * ``` - * $(selector).modal('show') - * .on('shown.bs.modal', function () { - * ($(focusSelector, $loginDialog)).focus(); - * }); - * ``` - * @param {string} selector - * @param {string} focusSelector - */ - showAndFocusOn(selector: string, focusSelector: string): void; + insertIntoHeader?: boolean; } /** * utility login menu that can be added to the Appheader for instance */ -// tslint:disable-next-line: class-name -export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { +export class LoginMenu extends EventHandler { static readonly EVENT_LOGGED_IN = 'loggedIn'; static readonly EVENT_LOGGED_OUT = 'loggedOut'; readonly node: HTMLUListElement; - private readonly options: PHOVEA_SECURITY_FLASK_ILoginMenuOptions = { + private readonly options: ILoginMenuOptions = { loginForm: undefined, document, watch: false @@ -60,14 +38,18 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { private readonly customizer: ICustomizedLoginFormPluginDesc[]; - constructor(private readonly adapter: ILoginMenuAdapter, options: PHOVEA_SECURITY_FLASK_ILoginMenuOptions = {}) { + constructor(private readonly header: AppHeader, options: ILoginMenuOptions = {}) { super(); - BaseUtils.mixin(this.options, options); + + BaseUtils.mixin(this.options, { document: header.rightMenu.ownerDocument }, options); this.customizer = PluginRegistry.getInstance().listPlugins(EXTENSION_POINT_CUSTOMIZED_LOGIN_FORM); this.node = this.init(); if (this.options.watch) { SessionWatcher.startWatching(() => this.logout()); } + if (this.options.insertIntoHeader) { + this.header.insertCustomRightMenu(this.node); + } } private init() { @@ -104,9 +86,9 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { private logout() { const doc = this.options.document; - this.adapter.wait(); + this.header.wait(); LoginUtils.logout().then(() => { - this.fire(PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_OUT); + this.fire(LoginMenu.EVENT_LOGGED_OUT); const userMenu = doc.querySelector('#user_menu'); if (userMenu) { userMenu.style.display = 'none'; @@ -115,7 +97,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { Array.from(doc.querySelectorAll('.login_required')).forEach((n: HTMLElement) => { n.classList.add('disabled'); }); - this.adapter.ready(); + this.header.ready(); }); } @@ -129,7 +111,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { const doc = this.options.document; const loginDialog = doc.querySelector('#loginDialog'); (loginDialog.querySelector('.modal-header .btn-close')).setAttribute('hidden', null); // disable closing the dialog - this.adapter.showAndFocusOn('#loginDialog', '#login_username'); + this.header.showAndFocusOn('#loginDialog', '#login_username'); } private initLoginDialog(body: HTMLElement) { @@ -166,7 +148,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { LoginUtils.bindLoginForm(form, (error, user) => { const success = !error && user; if (!success) { - this.adapter.ready(); + this.header.ready(); if (error === 'not_reachable') { dialog.classList.add('has-warning'); } else { @@ -176,7 +158,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { return; } - this.fire(PHOVEA_SECURITY_FLASK_LoginMenu.EVENT_LOGGED_IN); + this.fire(LoginMenu.EVENT_LOGGED_IN); const doc = this.options.document; dialog.classList.remove('has-error', 'has-warning'); @@ -197,7 +179,7 @@ export class PHOVEA_SECURITY_FLASK_LoginMenu extends EventHandler { n.setAttribute('disabled', null); }); - this.adapter.hideDialog('#loginDialog'); + this.header.hideDialog('#loginDialog'); }, () => { // reset error dialog.classList.remove('has-error', 'has-warning'); diff --git a/src/menu/LoginMenu.ts b/src/menu/LoginMenu.ts deleted file mode 100644 index 98fe7f0ec..000000000 --- a/src/menu/LoginMenu.ts +++ /dev/null @@ -1,21 +0,0 @@ -import {BaseUtils} from '../base'; -import {AppHeader} from '../components'; -import { PHOVEA_SECURITY_FLASK_LoginMenu as BaseLoginMenu, - PHOVEA_SECURITY_FLASK_ILoginMenuOptions as IBaseLoginMenuOptions -} from '../base'; - - -export interface ILoginMenuOptions extends IBaseLoginMenuOptions { - insertIntoHeader?: boolean; -} - -export class LoginMenu extends BaseLoginMenu { - constructor(private readonly header: AppHeader, options: ILoginMenuOptions = {}) { - super(header, BaseUtils.mixin({ - document: header.rightMenu.ownerDocument - }, options)); - if (options.insertIntoHeader) { - this.header.insertCustomRightMenu(this.node); - } - } -} diff --git a/src/menu/index.ts b/src/menu/index.ts index 28caf3fc2..a0558e204 100644 --- a/src/menu/index.ts +++ b/src/menu/index.ts @@ -1,2 +1 @@ -export * from './LoginMenu'; export * from './ProvenanceGraphMenu'; diff --git a/src/wrapper/CLUEWrapper.ts b/src/wrapper/CLUEWrapper.ts index 4b8b4b0c8..95ce37699 100644 --- a/src/wrapper/CLUEWrapper.ts +++ b/src/wrapper/CLUEWrapper.ts @@ -14,7 +14,7 @@ import {CLUEMode, ButtonModeSelector, ModeWrapper} from '../base/mode'; import {VisLoader} from '../vis/VisLoader'; import {CLUEGraphManager} from '../base/CLUEGraphManager'; import {ProvenanceGraphMenu} from '../menu/ProvenanceGraphMenu'; -import {LoginMenu} from '../menu/LoginMenu'; +import {LoginMenu} from '../base/LoginMenu'; import {ACLUEWrapper, IACLUEWrapperOptions} from './ACLUEWrapper'; import * as d3 from 'd3'; import {AppHeader, AppHeaderLink, IAppHeaderOptions, IHeaderLink} from '../components'; From d7c2f7cea03e8a88fa6cdc8db33334f37cb93aa9 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 6 Dec 2021 23:53:00 +0100 Subject: [PATCH 05/10] Add compression func to remove consecutive nodes --- dist/base/Compression.d.ts | 21 +++++++++++++++++ dist/base/Compression.js | 40 +++++++++++++++++++++++++++++++++ dist/base/Compression.js.map | 2 +- src/base/Compression.ts | 41 ++++++++++++++++++++++++++++++++++ tests/base/Compression.test.ts | 38 +++++++++++++++++++++++++++++++ 5 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 tests/base/Compression.test.ts diff --git a/dist/base/Compression.d.ts b/dist/base/Compression.d.ts index ce9ad18fd..4968209d0 100644 --- a/dist/base/Compression.d.ts +++ b/dist/base/Compression.d.ts @@ -1,5 +1,26 @@ import { ActionNode } from '../provenance'; export declare class Compression { + /** + * Removes all ActionNodes from the given path that matches the given function id and key. + * Only the very last item is kept and all previous ones are removed, + * independent of intermediate, non-matching items. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ static lastOnly(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string): ActionNode[]; + /** + * Remove consecutive items from a path array. + * The removal is only applied on nodes with the given function id + * and checks the key with the given key function. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ + static removeConsecutiveNodes(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string): ActionNode[]; static createRemove(path: ActionNode[], createFunctionId: string, removeFunctionId: string): ActionNode[]; } diff --git a/dist/base/Compression.js b/dist/base/Compression.js index 01a6b2a94..f38f513d3 100644 --- a/dist/base/Compression.js +++ b/dist/base/Compression.js @@ -1,4 +1,14 @@ export class Compression { + /** + * Removes all ActionNodes from the given path that matches the given function id and key. + * Only the very last item is kept and all previous ones are removed, + * independent of intermediate, non-matching items. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ static lastOnly(path, functionId, toKey) { const lastOnes = new Map(); path.forEach((p) => { @@ -15,6 +25,36 @@ export class Compression { return lastOnes.get(key) === p; }); } + /** + * Remove consecutive items from a path array. + * The removal is only applied on nodes with the given function id + * and checks the key with the given key function. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ + static removeConsecutiveNodes(path, functionId, toKey) { + // recursive function that mutates the input array + const compress = (arr, len = 0, deletable = false) => { + if (len < arr.length) { + if (deletable) { + arr.splice(len, 1); + len--; + } + const canDelete = arr[len + 1] && (arr[len].f_id === functionId) && (arr[len + 1].f_id === functionId) && toKey(arr[len]) === toKey(arr[len]); + return compress(arr, len + 1, canDelete); + } + ; + return; + }; + const pathCopy = path.slice(0); // copy path because path is mutated + pathCopy.reverse(); // reverse array to keep the last consecutive item and remove the first ones + compress(pathCopy); + pathCopy.reverse(); // reverse array to return the original order + return pathCopy; + } static createRemove(path, createFunctionId, removeFunctionId) { const r = []; outer: for (const act of path) { diff --git a/dist/base/Compression.js.map b/dist/base/Compression.js.map index 75ddf655d..6c9eda796 100644 --- a/dist/base/Compression.js.map +++ b/dist/base/Compression.js.map @@ -1 +1 @@ -{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,WAAW;IAEtB,MAAM,CAAC,QAAQ,CAAC,IAAkB,EAAE,UAAkB,EAAE,KAAqC;QAC3F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBACzB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBACzB,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,kBAAkB;YAClB,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAkB,EAAE,gBAAwB,EAAE,gBAAwB;QACxF,MAAM,CAAC,GAAiB,EAAE,CAAC;QAC3B,KAAK,EAAE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBACjC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC/B,+DAA+D;gBAC/D,KAAI,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,kCAAkC;oBACzE,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBACnC,MAAM,QAAQ,GAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,QAAQ,EAAE;wBACZ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;qBAChB;yBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,gBAAgB,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;wBAChF,0BAA0B;wBAC1B,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACf,SAAS,KAAK,CAAC;qBAChB;iBACF;aACF;YACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/base/Compression.ts b/src/base/Compression.ts index 1647bf44a..5b345305d 100644 --- a/src/base/Compression.ts +++ b/src/base/Compression.ts @@ -3,6 +3,16 @@ import {ActionNode} from '../provenance'; export class Compression { + /** + * Removes all ActionNodes from the given path that matches the given function id and key. + * Only the very last item is kept and all previous ones are removed, + * independent of intermediate, non-matching items. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ static lastOnly(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string) { const lastOnes = new Map(); path.forEach((p) => { @@ -20,6 +30,37 @@ export class Compression { }); } + /** + * Remove consecutive items from a path array. + * The removal is only applied on nodes with the given function id + * and checks the key with the given key function. + * + * @param path Array of ActionNodes + * @param functionId Apply removal only on ActionNodes with the given function id + * @param toKey Unique key to check the consecutive duplicates + * @returns A copy of the path which can be mutated in the number of items + */ + static removeConsecutiveNodes(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string) { + // recursive function that mutates the input array + const compress = (arr: ActionNode[], len: number = 0, deletable: boolean = false) => { + if(len < arr.length) { + if(deletable) { + arr.splice(len, 1); + len--; + } + const canDelete = arr[len+1] && (arr[len].f_id === functionId) && (arr[len+1].f_id === functionId) && toKey(arr[len]) === toKey(arr[len]); + return compress(arr, len+1, canDelete); + }; + return; + }; + + const pathCopy = path.slice(0); // copy path because path is mutated + pathCopy.reverse(); // reverse array to keep the last consecutive item and remove the first ones + compress(pathCopy); + pathCopy.reverse(); // reverse array to return the original order + return pathCopy; + } + static createRemove(path: ActionNode[], createFunctionId: string, removeFunctionId: string) { const r: ActionNode[] = []; outer: for (const act of path) { diff --git a/tests/base/Compression.test.ts b/tests/base/Compression.test.ts new file mode 100644 index 000000000..d4d54020c --- /dev/null +++ b/tests/base/Compression.test.ts @@ -0,0 +1,38 @@ +/// +import {Compression} from '../../src/base/Compression'; +import {ActionMetaData, ActionNode} from '../../src/provenance'; + +describe('action compressor', () => { + + const path: ActionNode[] = [ + new ActionNode(new ActionMetaData('', '', 'action1'), 'selection1', () => null), + new ActionNode(new ActionMetaData('', '', 'action2'), 'selection2', () => null), + new ActionNode(new ActionMetaData('', '', 'action3'), 'selection2', () => null), // consecutive duplicate + new ActionNode(new ActionMetaData('', '', 'action4'), 'selection3', () => null), + new ActionNode(new ActionMetaData('', '', 'action5'), 'selection3', () => null), // consecutive duplicate + new ActionNode(new ActionMetaData('', '', 'action6'), 'selection2', () => null), + ]; + + + it('ground truth', () => { + expect(path.length).toBe(6); + expect(path.toString()).toBe('action1,action2,action3,action4,action5,action6'); + }); + + it('lastOnly()', () => { + // remove only consecutive nodes of `selection2` but not `selection3` + const newPath = Compression.lastOnly(path, 'selection2', (p) => p.f_id); + expect(newPath.length).toBe(4); + expect(newPath[newPath.length - 1].toString()).toBe('action6'); + expect(newPath.toString()).toBe('action1,action4,action5,action6'); // missing action2 and action3 + }); + + it('removeConsecutiveNodes()', () => { + // remove only consecutive nodes of `selection2` but not `selection3` + const newPath = Compression.removeConsecutiveNodes(path, 'selection2', (p) => p.f_id); + expect(newPath.length).toBe(5); + expect(newPath[newPath.length - 1].toString()).toBe('action6'); + expect(newPath.toString()).toBe('action1,action3,action4,action5,action6'); // missing action2 only + }); + +}); From 86fa0ffa0dc253daa8acc12c98b83b1db0992573 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 7 Dec 2021 00:03:09 +0100 Subject: [PATCH 06/10] Modify compression test --- tests/base/Compression.test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/base/Compression.test.ts b/tests/base/Compression.test.ts index d4d54020c..e5239426a 100644 --- a/tests/base/Compression.test.ts +++ b/tests/base/Compression.test.ts @@ -23,7 +23,6 @@ describe('action compressor', () => { // remove only consecutive nodes of `selection2` but not `selection3` const newPath = Compression.lastOnly(path, 'selection2', (p) => p.f_id); expect(newPath.length).toBe(4); - expect(newPath[newPath.length - 1].toString()).toBe('action6'); expect(newPath.toString()).toBe('action1,action4,action5,action6'); // missing action2 and action3 }); @@ -31,7 +30,6 @@ describe('action compressor', () => { // remove only consecutive nodes of `selection2` but not `selection3` const newPath = Compression.removeConsecutiveNodes(path, 'selection2', (p) => p.f_id); expect(newPath.length).toBe(5); - expect(newPath[newPath.length - 1].toString()).toBe('action6'); expect(newPath.toString()).toBe('action1,action3,action4,action5,action6'); // missing action2 only }); From 0a638b6be29fe0629d189a8ed5cbe555a23e798e Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 7 Dec 2021 00:08:09 +0100 Subject: [PATCH 07/10] Fix tslint --- dist/base/Compression.js | 1 - dist/base/Compression.js.map | 2 +- src/base/Compression.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dist/base/Compression.js b/dist/base/Compression.js index f38f513d3..5c3f5befc 100644 --- a/dist/base/Compression.js +++ b/dist/base/Compression.js @@ -46,7 +46,6 @@ export class Compression { const canDelete = arr[len + 1] && (arr[len].f_id === functionId) && (arr[len + 1].f_id === functionId) && toKey(arr[len]) === toKey(arr[len]); return compress(arr, len + 1, canDelete); } - ; return; }; const pathCopy = path.slice(0); // copy path because path is mutated diff --git a/dist/base/Compression.js.map b/dist/base/Compression.js.map index 6c9eda796..52c4a02ad 100644 --- a/dist/base/Compression.js.map +++ b/dist/base/Compression.js.map @@ -1 +1 @@ -{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/base/Compression.ts b/src/base/Compression.ts index 5b345305d..977184885 100644 --- a/src/base/Compression.ts +++ b/src/base/Compression.ts @@ -50,7 +50,7 @@ export class Compression { } const canDelete = arr[len+1] && (arr[len].f_id === functionId) && (arr[len+1].f_id === functionId) && toKey(arr[len]) === toKey(arr[len]); return compress(arr, len+1, canDelete); - }; + } return; }; From 983e37b142cfdbbf3d7ec98b1b7aa83c550de736 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 7 Dec 2021 09:39:06 +0100 Subject: [PATCH 08/10] Rename new compressor function --- dist/base/Compression.d.ts | 2 +- dist/base/Compression.js | 2 +- dist/base/Compression.js.map | 2 +- dist/base/Selection.js | 2 +- dist/base/Selection.js.map | 2 +- src/base/Compression.ts | 2 +- src/base/Selection.ts | 2 +- tests/base/Compression.test.ts | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/base/Compression.d.ts b/dist/base/Compression.d.ts index 4968209d0..0eb7bcfac 100644 --- a/dist/base/Compression.d.ts +++ b/dist/base/Compression.d.ts @@ -21,6 +21,6 @@ export declare class Compression { * @param toKey Unique key to check the consecutive duplicates * @returns A copy of the path which can be mutated in the number of items */ - static removeConsecutiveNodes(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string): ActionNode[]; + static lastConsecutive(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string): ActionNode[]; static createRemove(path: ActionNode[], createFunctionId: string, removeFunctionId: string): ActionNode[]; } diff --git a/dist/base/Compression.js b/dist/base/Compression.js index 5c3f5befc..34ad4ce90 100644 --- a/dist/base/Compression.js +++ b/dist/base/Compression.js @@ -35,7 +35,7 @@ export class Compression { * @param toKey Unique key to check the consecutive duplicates * @returns A copy of the path which can be mutated in the number of items */ - static removeConsecutiveNodes(path, functionId, toKey) { + static lastConsecutive(path, functionId, toKey) { // recursive function that mutates the input array const compress = (arr, len = 0, deletable = false) => { if (len < arr.length) { diff --git a/dist/base/Compression.js.map b/dist/base/Compression.js.map index 52c4a02ad..cc8bb5d19 100644 --- a/dist/base/Compression.js.map +++ b/dist/base/Compression.js.map @@ -1 +1 @@ -{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,WAAW;IAEtB;;;;;;;;;OASG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAkB,EAAE,UAAkB,EAAE,KAAqC;QAC3F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBACzB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBACzB,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,kBAAkB;YAClB,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACH,MAAM,CAAC,sBAAsB,CAAC,IAAkB,EAAE,UAAkB,EAAE,KAAqC;QACzG,kDAAkD;QAClD,MAAM,QAAQ,GAAG,CAAC,GAAiB,EAAE,MAAc,CAAC,EAAE,YAAqB,KAAK,EAAE,EAAE;YAClF,IAAG,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE;gBACnB,IAAG,SAAS,EAAE;oBACZ,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBACnB,GAAG,EAAE,CAAC;iBACP;gBACD,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,GAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC1I,OAAO,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAC,CAAC,EAAE,SAAS,CAAC,CAAC;aACxC;YACD,OAAO;QACT,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,oCAAoC;QACpE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,4EAA4E;QAChG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,6CAA6C;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAkB,EAAE,gBAAwB,EAAE,gBAAwB;QACxF,MAAM,CAAC,GAAiB,EAAE,CAAC;QAC3B,KAAK,EAAE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBACjC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC/B,+DAA+D;gBAC/D,KAAI,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,kCAAkC;oBACzE,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBACnC,MAAM,QAAQ,GAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,QAAQ,EAAE;wBACZ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;qBAChB;yBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,gBAAgB,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;wBAChF,0BAA0B;wBAC1B,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACf,SAAS,KAAK,CAAC;qBAChB;iBACF;aACF;YACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"Compression.js","sourceRoot":"","sources":["../../src/base/Compression.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/base/Selection.js b/dist/base/Selection.js index 4bdcb1113..1f37253f9 100644 --- a/dist/base/Selection.js +++ b/dist/base/Selection.js @@ -75,7 +75,7 @@ export class Selection { }); } static compressSelection(path) { - return Compression.lastOnly(path, 'select', (p) => p.parameter.idtype + '@' + p.parameter.type); + return Compression.lastConsecutive(path, 'select', (p) => p.parameter.idtype + '@' + p.parameter.type); } } /** diff --git a/dist/base/Selection.js.map b/dist/base/Selection.js.map index b3ce3d3af..ce98c769e 100644 --- a/dist/base/Selection.js.map +++ b/dist/base/Selection.js.map @@ -1 +1 @@ -{"version":3,"file":"Selection.js","sourceRoot":"","sources":["../../src/base/Selection.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Selection.js","sourceRoot":"","sources":["../../src/base/Selection.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/base/Compression.ts b/src/base/Compression.ts index 977184885..7b7999d2d 100644 --- a/src/base/Compression.ts +++ b/src/base/Compression.ts @@ -40,7 +40,7 @@ export class Compression { * @param toKey Unique key to check the consecutive duplicates * @returns A copy of the path which can be mutated in the number of items */ - static removeConsecutiveNodes(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string) { + static lastConsecutive(path: ActionNode[], functionId: string, toKey: (action: ActionNode) => string) { // recursive function that mutates the input array const compress = (arr: ActionNode[], len: number = 0, deletable: boolean = false) => { if(len < arr.length) { diff --git a/src/base/Selection.ts b/src/base/Selection.ts index b637358e4..6e25116fa 100644 --- a/src/base/Selection.ts +++ b/src/base/Selection.ts @@ -85,7 +85,7 @@ export class Selection { } static compressSelection(path: ActionNode[]) { - return Compression.lastOnly(path, 'select', (p) => p.parameter.idtype + '@' + p.parameter.type); + return Compression.lastConsecutive(path, 'select', (p) => p.parameter.idtype + '@' + p.parameter.type); } } diff --git a/tests/base/Compression.test.ts b/tests/base/Compression.test.ts index e5239426a..6b7755643 100644 --- a/tests/base/Compression.test.ts +++ b/tests/base/Compression.test.ts @@ -26,9 +26,9 @@ describe('action compressor', () => { expect(newPath.toString()).toBe('action1,action4,action5,action6'); // missing action2 and action3 }); - it('removeConsecutiveNodes()', () => { + it('lastConsecutive()', () => { // remove only consecutive nodes of `selection2` but not `selection3` - const newPath = Compression.removeConsecutiveNodes(path, 'selection2', (p) => p.f_id); + const newPath = Compression.lastConsecutive(path, 'selection2', (p) => p.f_id); expect(newPath.length).toBe(5); expect(newPath.toString()).toBe('action1,action3,action4,action5,action6'); // missing action2 only }); From 7bad965a81b4d80b852331474d924bdf1e6a08b8 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Tue, 7 Dec 2021 09:39:52 +0100 Subject: [PATCH 09/10] Use `lastConsecutive()` for parameter compressor --- dist/utils/TDPApplicationUtils.js | 2 +- dist/utils/TDPApplicationUtils.js.map | 2 +- src/utils/TDPApplicationUtils.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/utils/TDPApplicationUtils.js b/dist/utils/TDPApplicationUtils.js index fad6b3853..340feda4c 100644 --- a/dist/utils/TDPApplicationUtils.js +++ b/dist/utils/TDPApplicationUtils.js @@ -219,7 +219,7 @@ export class TDPApplicationUtils { }); } static compressSetParameter(path) { - return Compression.lastOnly(path, TDPApplicationUtils.CMD_SET_PARAMETER, (p) => `${p.requires[0].id}_${p.parameter.name}`); + return Compression.lastConsecutive(path, TDPApplicationUtils.CMD_SET_PARAMETER, (p) => `${p.requires[0].id}_${p.parameter.name}`); } /** * @deprecated diff --git a/dist/utils/TDPApplicationUtils.js.map b/dist/utils/TDPApplicationUtils.js.map index d9734b531..3c11e2cf3 100644 --- a/dist/utils/TDPApplicationUtils.js.map +++ b/dist/utils/TDPApplicationUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"TDPApplicationUtils.js","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,EAAE,cAAc,EAAE,cAAc,EAA8B,MAAM,eAAe,CAAC;AACnH,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAClC,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,WAAW,EAAe,UAAU,EAAE,SAAS,EAAC,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAC,WAAW,EAAC,MAAM,QAAQ,CAAC;AAkBnC,MAAM,OAAO,mBAAmB;IA0B9B;;;OAGG;IAEH,MAAM,CAAC,OAAO,CAAC,IAAmB;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAErG,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,IAAI,EAAE;YACR,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;SAC9E;QAED,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAoB;IACzI,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,UAA4B;QAChD,OAAO,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC;IAClI,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,IAAkB,EAAE,UAA2C,EAAE;QACrF,MAAM,CAAC,GAAqC,MAAM,CAAC,MAAM,CAAC;YACxD,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,QAAQ;SACd,EAAE,OAAO,CAAC,CAAC;QACZ,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC;QAEjE,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAEzF,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACvC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,GAAG,CAAC,SAAS,GAAG;;gHAE4F,EAAE,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;sFAC1G,EAAE,kCAAkC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;;;+GAGhF,EAAE,oBAAoB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;qFACxG,EAAE,kCAAkC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC;;;4GAGpF,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,CAAC;QAC1K,CAAC,CAAC,KAAK;;;uDAGwC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC;;;6GAGd,EAAE,0CAA0C,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;sDAC5J,EAAE;4CACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,qCAAqC,CAAC;;6GAET,EAAE,0CAA0C,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;sDACxM,EAAE;4CACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC;;6GAED,EAAE,4CAA4C,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;sDAC9J,EAAE;4CACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;;;;;UAKrG,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,0CAA0C,CAAC;;;kFAGP,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;8CAC9G,EAAE;cAClC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;;;yGAGlB,EAAE,0CAA0C,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;qDACxJ,EAAE;2CACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,qCAAqC,CAAC;;2GAEV,EAAE,0CAA0C,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;qDACrM,EAAE;4CACX,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC;;2GAEH,EAAE,4CAA4C,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;qDAC5J,EAAE;6CACV,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;;;;;UAKtG,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC,CAAC;;;oFAGC,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;+CACjH,EAAE,sFAAsF,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,2CAA2C,CAAC,YAAY,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;;+GAEtK,EAAE,0CAA0C,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;uDAC9J,EAAE;4CACb,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,qCAAqC,CAAC;;+GAEP,EAAE,0CAA0C,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;uDAC3M,EAAE;4CACb,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC;;+GAEC,EAAE,4CAA4C,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;uDAChK,EAAE;6CACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;;;;;UAKtG,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,2CAA2C,CAAC;;aAE7E,CAAC;QAEV,GAAG,CAAC,aAAa,CAAc,kCAAkC,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE;YACnF,GAAG,CAAC,cAAc,EAAE,CAAC;YACrB,GAAG,CAAC,eAAe,EAAE,CAAC;YACtB,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YAC/B,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC7D,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAmB,+BAA+B,CAAC,CAAC,CAAC;QACzG,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAmB,+BAA+B,CAAC,CAAC,CAAC;QACnG,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAmB,8BAA8B,CAAC,CAAC,CAAC;QACjG,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAmB,gCAAgC,CAAC,CAAC,CAAC;QAErG,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7E,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5E,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC;QAEF,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACzB,CAAC,CAAC,QAAQ,GAAG,GAAG,EAAE;gBAChB,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;oBACd,OAAO;iBACR;gBAED,mBAAmB;gBACnB,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;gBACxD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC;gBAExD,UAAU,EAAE,CAAC;YACf,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,CAAC,CAAC,QAAQ,GAAG,GAAG,EAAE;gBAChB,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;oBACd,OAAO;iBACR;gBAED,mBAAmB;gBACnB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACzD,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;gBAE5D,UAAU,EAAE,CAAC;YACf,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE;YAC9B,IAAI,KAAK,KAAK,MAAM,EAAE;gBACpB,OAAO,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;aACpC;iBAAM,IAAI,KAAK,KAAK,OAAO,EAAE;gBAC5B,OAAO,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;aACvD;YACD,OAAO,IAAI,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,CAAC,IAAc,EAAwB,EAAE;gBAChD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACjE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC/H,OAAO;oBACL,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,EAAoB,KAAK,EAAoB,MAAM,EAAoB,OAAO,CAAC;oBACjL,KAAK,EAAE,SAAS;oBAChB,OAAO,EAAE,WAAW;iBACrB,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,OAA0B,EAAE,UAAkB;QACnE,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,mCAAmC;QACnC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;aACvD;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC;SAC9C,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAW;QAC5B,OAAO,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/Q,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAyB,EAAE,SAAS,EAAE,KAAsB;QACxF,MAAM,IAAI,GAAmB,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QAC5B,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QAC9B,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC;QAChH,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,OAAO;YACL,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAgC,EAAE,IAAY,EAAE,KAAU,EAAE,aAAkB;QAChG,aAAa;QACb,OAAO,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EAAE,EAAC,IAAI,EAAC,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/Q,IAAI;YACJ,KAAK;YACL,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,IAAkB;QAC5C,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IACzI,CAAC;IAGD;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAAC,IAAkB;QAC/C,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IACxH,CAAC;;AA7Qe,uBAAG,GAAG,EAAE,CAAC;AACT,wBAAI,GAAG,mBAAmB,CAAC,GAAG,GAAG,EAAE,CAAC;AACpC,uBAAG,GAAG,mBAAmB,CAAC,IAAI,GAAG,EAAE,CAAC;AACpD,UAAU;AACM,oCAAgB,GAAG,gBAAgB,CAAC;AACpC,qCAAiB,GAAG,iBAAiB,CAAC;AAEtC,4BAAQ,GAAuD,GAAG,EAAE;IAClF,OAAO;QACL,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC;QAC1E,CAAC,EAAE,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC;QACjF,CAAC,EAAE,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC;QAC9E,CAAC,EAAE,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC;QAC1E,CAAC,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;QAC5J,CAAC,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC;QAClG,CAAC,EAAE,GAAG,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC;QAC5J,CAAC,EAAE,GAAG,mBAAmB,CAAC,IAAI,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC;QAClG,CAAC,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;QACzJ,CAAC,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC;QACnG,CAAC,GAAG,GAAG,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,mBAAmB,CAAC,GAAG,GAAG,EAAE,CAAC,EAAC,CAAC,CAAC;QACjK,CAAC,GAAG,GAAG,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC;KAC3G,CAAC;AACJ,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"TDPApplicationUtils.js","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/TDPApplicationUtils.ts b/src/utils/TDPApplicationUtils.ts index 992d4d9b1..2fa35801a 100644 --- a/src/utils/TDPApplicationUtils.ts +++ b/src/utils/TDPApplicationUtils.ts @@ -283,7 +283,7 @@ export class TDPApplicationUtils { } static compressSetParameter(path: ActionNode[]) { - return Compression.lastOnly(path, TDPApplicationUtils.CMD_SET_PARAMETER, (p: ActionNode) => `${p.requires[0].id}_${p.parameter.name}`); + return Compression.lastConsecutive(path, TDPApplicationUtils.CMD_SET_PARAMETER, (p: ActionNode) => `${p.requires[0].id}_${p.parameter.name}`); } From 313a9aeb87182973acec0d6f2c79e2ba8adcd897 Mon Sep 17 00:00:00 2001 From: Michael Puehringer Date: Mon, 13 Dec 2021 11:03:15 +0100 Subject: [PATCH 10/10] Added options override to Ajax.send --- dist/base/ajax.d.ts | 2 +- dist/base/ajax.js | 25 +++++++++++++------------ dist/base/ajax.js.map | 2 +- src/base/ajax.ts | 25 +++++++++++++------------ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dist/base/ajax.d.ts b/dist/base/ajax.d.ts index 83ce21637..241e55187 100644 --- a/dist/base/ajax.d.ts +++ b/dist/base/ajax.d.ts @@ -20,7 +20,7 @@ export declare class Ajax { * @param requestBody body mime type, default auto derive * @returns {Promise} */ - static send(url: string, data?: any, method?: string, expectedDataType?: string, requestBody?: string): Promise; + static send(url: string, data?: any, method?: string, expectedDataType?: string, requestBody?: string, options?: Partial): Promise; /** * to get some ajax json file * @param url diff --git a/dist/base/ajax.js b/dist/base/ajax.js index 6bf864a25..566bbe243 100644 --- a/dist/base/ajax.js +++ b/dist/base/ajax.js @@ -1,4 +1,5 @@ import { GlobalEventHandler } from './event'; +import { merge } from 'lodash'; export class AjaxError extends Error { constructor(response, message) { super(message ? message : response.statusText); @@ -41,7 +42,7 @@ export class Ajax { * @param requestBody body mime type, default auto derive * @returns {Promise} */ - static async send(url, data = {}, method = 'GET', expectedDataType = 'json', requestBody = 'formdata') { + static async send(url, data = {}, method = 'GET', expectedDataType = 'json', requestBody = 'formdata', options = {}) { // for compatibility method = method.toUpperCase(); // need to encode the body in the url in case of GET and HEAD @@ -52,49 +53,49 @@ export class Ajax { data = null; } } - const options = { + const mergedOptions = merge({ credentials: 'same-origin', method, headers: { 'Accept': 'application/json' }, - }; + }, options); if (data) { let mimetype = ''; switch (requestBody.trim().toLowerCase()) { case 'json': case 'application/json': mimetype = 'application/json'; - options.body = typeof data === 'string' ? data : JSON.stringify(data); + mergedOptions.body = typeof data === 'string' ? data : JSON.stringify(data); break; case 'text': case 'text/plain': mimetype = 'text/plain'; - options.body = String(data); + mergedOptions.body = String(data); break; case 'blob': case 'arraybuffer': mimetype = 'application/octet-stream'; - options.body = data; + mergedOptions.body = data; break; default: if (data instanceof FormData) { - options.body = data; + mergedOptions.body = data; } else { mimetype = 'application/x-www-form-urlencoded'; - options.body = Ajax.encodeParams(data); + mergedOptions.body = Ajax.encodeParams(data); } } if (mimetype) { - options.headers['Content-Type'] = mimetype; + mergedOptions.headers['Content-Type'] = mimetype; } } // there are no typings for fetch so far - GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_PRE_SEND, url, options); - const r = Ajax.checkStatus(await self.fetch(url, options)); + GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_PRE_SEND, url, mergedOptions); + const r = Ajax.checkStatus(await self.fetch(url, mergedOptions)); const output = Ajax.parseType(expectedDataType, r); - GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_POST_SEND, url, options, r, output); + GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_POST_SEND, url, mergedOptions, r, output); return output; } /** diff --git a/dist/base/ajax.js.map b/dist/base/ajax.js.map index 51751c642..cf231bee8 100644 --- a/dist/base/ajax.js.map +++ b/dist/base/ajax.js.map @@ -1 +1 @@ -{"version":3,"file":"ajax.js","sourceRoot":"","sources":["../../src/base/ajax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAI3C,MAAM,OAAO,SAAU,SAAQ,KAAK;IAClC,YAA4B,QAAkB,EAAE,OAAgB;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QADrB,aAAQ,GAAR,QAAQ,CAAU;QAE5C,0DAA0D;QAC1D,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,OAAO,IAAI;IAUf,MAAM,CAAC,WAAW,CAAC,QAAkB;QACnC,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,OAAO,QAAQ,CAAC;SACjB;aAAM;YACL,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC;SAC/B;IACH,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,gBAAwB,EAAE,QAAkB;QAC3D,QAAQ,gBAAgB,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;YAC7C,KAAK,MAAM,CAAC;YACZ,KAAK,kBAAkB;gBACrB,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzB,KAAK,MAAM,CAAC;YACZ,KAAK,YAAY;gBACf,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzB,KAAK,MAAM;gBACT,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzB,KAAK,aAAa;gBAChB,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;YAChC;gBACE,MAAM,IAAI,SAAS,CAAC,QAAQ,EAAE,gCAAgC,gBAAgB,GAAG,CAAC,CAAC;SACtF;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,OAAY,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,gBAAgB,GAAG,MAAM,EAAE,WAAW,GAAG,UAAU;QAChH,oBAAoB;QACpB,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QAE9B,6DAA6D;QAC7D,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,EAAE;YACzC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe;YAC/C,IAAI,IAAI,EAAE;gBACR,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;gBAC3C,IAAI,GAAG,IAAI,CAAC;aACb;SACF;QAED,MAAM,OAAO,GAAgB;YAC3B,WAAW,EAAE,aAAa;YAC1B,MAAM;YACN,OAAO,EAAE;gBACP,QAAQ,EAAE,kBAAkB;aAC7B;SACF,CAAC;QAEF,IAAI,IAAI,EAAE;YACR,IAAI,QAAQ,GAAW,EAAE,CAAC;YAC1B,QAAQ,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBACxC,KAAK,MAAM,CAAC;gBACZ,KAAK,kBAAkB;oBACrB,QAAQ,GAAG,kBAAkB,CAAC;oBAC9B,OAAO,CAAC,IAAI,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBACtE,MAAM;gBACR,KAAK,MAAM,CAAC;gBACZ,KAAK,YAAY;oBACf,QAAQ,GAAG,YAAY,CAAC;oBACxB,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC5B,MAAM;gBACR,KAAK,MAAM,CAAC;gBACZ,KAAK,aAAa;oBAChB,QAAQ,GAAG,0BAA0B,CAAC;oBACtC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;oBACpB,MAAM;gBACR;oBACE,IAAI,IAAI,YAAY,QAAQ,EAAE;wBAC5B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;qBACrB;yBAAM;wBACL,QAAQ,GAAG,mCAAmC,CAAC;wBAC/C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;qBACxC;aACJ;YACD,IAAI,QAAQ,EAAE;gBACN,OAAO,CAAC,OAAQ,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC;aACnD;SACF;QAED,wCAAwC;QACxC,kBAAkB,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACnD,kBAAkB,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QACjG,OAAO,MAAM,CAAC;IAChB,CAAC;IACD;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,OAAY,EAAE;QACxC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,OAAY,EAAE,EAAE,gBAAgB,GAAG,MAAM;QACnE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,OAAY,IAAI;QAClC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,GAAa,EAAE,CAAC;QAEvB,SAAS,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,KAAU;YAClD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;wBACzB,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;qBAChC;yBAAM;wBACL,oCAAoC;wBACpC,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;qBAC5B;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,KAAK,IAAI,IAAI,EAAE;gBACxB,OAAO;aACR;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACpC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC/B,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;aAC5E;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,qCAAqC;QACrC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;;AAtKa,+BAA0B,GAAG,aAAa,CAAC;AAC3C,gCAA2B,GAAG,cAAc,CAAC;AAE3D;;GAEG;AACW,mBAAc,GAAG,IAAI,CAAC"} \ No newline at end of file +{"version":3,"file":"ajax.js","sourceRoot":"","sources":["../../src/base/ajax.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/base/ajax.ts b/src/base/ajax.ts index 93de98954..fa2beb460 100644 --- a/src/base/ajax.ts +++ b/src/base/ajax.ts @@ -1,4 +1,5 @@ import {GlobalEventHandler} from './event'; +import {merge} from 'lodash'; @@ -54,7 +55,7 @@ export class Ajax { * @param requestBody body mime type, default auto derive * @returns {Promise} */ - static async send(url: string, data: any = {}, method = 'GET', expectedDataType = 'json', requestBody = 'formdata'): Promise { + static async send(url: string, data: any = {}, method = 'GET', expectedDataType = 'json', requestBody = 'formdata', options: Partial = {}): Promise { // for compatibility method = method.toUpperCase(); @@ -67,13 +68,13 @@ export class Ajax { } } - const options: RequestInit = { + const mergedOptions: RequestInit = merge({ credentials: 'same-origin', method, headers: { 'Accept': 'application/json' }, - }; + }, options); if (data) { let mimetype: string = ''; @@ -81,36 +82,36 @@ export class Ajax { case 'json': case 'application/json': mimetype = 'application/json'; - options.body = typeof data === 'string' ? data : JSON.stringify(data); + mergedOptions.body = typeof data === 'string' ? data : JSON.stringify(data); break; case 'text': case 'text/plain': mimetype = 'text/plain'; - options.body = String(data); + mergedOptions.body = String(data); break; case 'blob': case 'arraybuffer': mimetype = 'application/octet-stream'; - options.body = data; + mergedOptions.body = data; break; default: if (data instanceof FormData) { - options.body = data; + mergedOptions.body = data; } else { mimetype = 'application/x-www-form-urlencoded'; - options.body = Ajax.encodeParams(data); + mergedOptions.body = Ajax.encodeParams(data); } } if (mimetype) { - (options.headers)['Content-Type'] = mimetype; + mergedOptions.headers['Content-Type'] = mimetype; } } // there are no typings for fetch so far - GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_PRE_SEND, url, options); - const r = Ajax.checkStatus(await self.fetch(url, options)); + GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_PRE_SEND, url, mergedOptions); + const r = Ajax.checkStatus(await self.fetch(url, mergedOptions)); const output = Ajax.parseType(expectedDataType, r); - GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_POST_SEND, url, options, r, output); + GlobalEventHandler.getInstance().fire(Ajax.GLOBAL_EVENT_AJAX_POST_SEND, url, mergedOptions, r, output); return output; } /**