@mediusinc/mng-commons 2.5.0-rc.0 → 2.6.0-rc.0

package/lib/services/action-executor.service.d.ts

@@ -1,9 +1,7 @@
 import { Injector, Type } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { ConfirmationService } from 'primeng/api';
 import { DialogService } from 'primeng/dynamicdialog';
-import { Observable } from 'rxjs';
 import { ActionContext, ActionContextValidation, ActionInstance, ActionParameters } from '../components/action/models';
 import { MngTableCellClickEvent } from '../components/tableview/models';
 import { IDataProvider, IEditorDataProvider } from '../data-providers';
@@ -11,7 +9,7 @@ import { ActionDescriptor, ActionEditorDescriptor } from '../descriptors/action'
 import { TableDescriptor } from '../descriptors/table';
 import { MngError } from '../models';
 import { MngParametrizePipe } from '../pipes';
-import { MngConfigurationService } from './configuration.service';
+import { MngCommonsService } from './commons.service';
 import { MngErrorMapperService } from './error-mapper.service';
 import { MngNavigationService } from './navigation.service';
 import * as i0 from "@angular/core";
@@ -19,33 +17,36 @@ export declare class MngActionExecutorService {
     private injector;
     private router;
     private dialogService;
-    private confirmationService;
     private translate;
-    private configurationService;
+    private mngCommons;
     private navigationService;
     private errorMapper;
     private parametrize;
     private defaultEditorDialogComponent;
-    private debug;
-    constructor(injector: Injector, router: Router, dialogService: DialogService, confirmationService: ConfirmationService, translate: TranslateService, configurationService: MngConfigurationService, navigationService: MngNavigationService, errorMapper: MngErrorMapperService, parametrize: MngParametrizePipe, defaultEditorDialogComponent: Type<any>);
+    private readonly debugLog;
+    private readonly instancesBufferMax;
+    private readonly _instances;
+    constructor(injector: Injector, router: Router, dialogService: DialogService, translate: TranslateService, mngCommons: MngCommonsService, navigationService: MngNavigationService, errorMapper: MngErrorMapperService, parametrize: MngParametrizePipe, defaultEditorDialogComponent: Type<any>);
+    get instances(): ActionInstance<any, any>[];
+    /**
+     * Prepares action context for usage in validation.
+     * @param action Action descriptor.
+     * @param parameters Action parameters.
+     * @param dataProvider Data provider.
+     */
     prepareActionContextValidation<T, S>(action: ActionDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IDataProvider<T, S>): ActionContextValidation<T, S>;
-    prepareActionContext<T, S>(instance: ActionInstance<T, S>, parameters: ActionParameters<T>, dataProvider?: IDataProvider<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
     /**
-     * Prepares action exec context for action of type editor.
+     * Runs action context by submitting execution results/errors to context, watching over instance results/errors, displaying notifications,
+     * running next/error action and triggering dismiss of action. Confirmation is also processed here.
      *
-     * @param item Item instance (if exists).
-     * @param itemId Item id (if exists).
-     * @param dataProvider Data provider.
-     * @param sourceComponent Source component from where the context preparation was called.
-     * @param viewContainer View container/service.
-     * @param actionData Additional action data.
+     * @param ctx Action context to run.
      */
-    private prepareContextForEditor;
+    run<T, S>(ctx: ActionContext<T, S>): void;
     /**
      * Runs action context by submitting execution results/errors to context, watching over instance results/errors, displaying notifications,
-     * running next/error action and triggering dismiss of action.
+     * running next/error action and triggering dismiss of action. Confirmation
      *
-     * @param action Action descriptor.
+     * @param ctx Action context to run.
      * @param parameters Action parameters for context.
      * @param dataProvider Editor data provider for context.
      * @param instance Optional existing action instance (if non provided, new will be created).
@@ -53,9 +54,9 @@ export declare class MngActionExecutorService {
      *
      * @return Action context for submit (=run) function.
      */
-    runActionContext<T, S>(ctx: ActionContext<T, S>): Observable<T | null | undefined>;
+    private runWithoutConfirmation;
     /**
-     * Runs editor action's submit (=main run) function by creating new action context for action instance.
+     * Prepares editor action's fetch function by creating new action context for action instance.
      *
      * @param action Action descriptor.
      * @param parameters Action parameters for context.
@@ -63,17 +64,11 @@ export declare class MngActionExecutorService {
      * @param instance Optional existing action instance (if non provided, new will be created).
      * @param previousActionInstance Optional previous action instance to link in next instance.
      *
-     * @return Action context for submit (=run) function.
-     */
-    runEditorSave<T, S>(action: ActionEditorDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IEditorDataProvider<T, S>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
-    /**
-     * Gets service instance of data provider.
-     *
-     * @param dataProvider Data provider instance.
+     * @return Action context for fetch function.
      */
-    private getDataProviderService;
+    prepareContextForEditorFetch<T, S>(action: ActionEditorDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IEditorDataProvider<T, S>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
     /**
-     * Runs editor action's fetch function by creating new action context for action instance.
+     * Runs editor action's submit (=main run) function by creating new action context for action instance.
      *
      * @param action Action descriptor.
      * @param parameters Action parameters for context.
@@ -81,9 +76,20 @@ export declare class MngActionExecutorService {
      * @param instance Optional existing action instance (if non provided, new will be created).
      * @param previousActionInstance Optional previous action instance to link in next instance.
      *
-     * @return Action context for fetch function.
+     * @return Action context for submit (=run) function.
+     */
+    prepareContextForEditorSubmit<T, S>(action: ActionEditorDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IEditorDataProvider<T, S>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
+    /**
+     * Prepares action exec context for action of type editor.
+     *
+     * @param item Item instance (if exists).
+     * @param itemId Item id (if exists).
+     * @param dataProvider Data provider.
+     * @param sourceComponent Source component from where the context preparation was called.
+     * @param viewContainer View container/service.
+     * @param actionData Additional action data.
      */
-    runEditorFetch<T, S>(action: ActionEditorDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IEditorDataProvider<T, S>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
+    private prepareContextForEditor;
     /**
      * Runs action's main run function by creating new action context for action instance.
      *
@@ -95,7 +101,7 @@ export declare class MngActionExecutorService {
      *
      * @return Action context for run function.
      */
-    runAction<T, S>(action: ActionDescriptor<T>, parameters: ActionParameters<T>, dataProvider?: IDataProvider<T, S>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionContext<T, S>;
+    private prepareContext;
     /**
      * Activates action (in case of dialog, dialog will be opened).
      *
@@ -107,13 +113,29 @@ export declare class MngActionExecutorService {
      * @return Action instance - if non provided in parameters, the newly created will be returned.
      */
     activateAction<T, S>(action: ActionDescriptor<T>, parameters: ActionParameters<T>, instance?: ActionInstance<T, S>, previousActionInstance?: ActionInstance<unknown, unknown>): ActionInstance<T, S>;
+    /**
+     * To be called when action editor is initialized to correctly activate action.
+     * @param action Action descriptor.
+     * @param instance Action instance (if available).
+     */
+    onActionEditorInit<T, S>(action: ActionDescriptor<T>, instance?: ActionInstance<T, S>): ActionInstance<T, S>;
+    /**
+     * To be called when action editor cmp is being destroyed to correctly finish action.
+     * @param instance Action instance.
+     */
+    onActionEditorDestroy<T, S>(instance?: ActionInstance<T, S>): void;
+    /**
+     * To be called when action route cmp is being destroyed to correctly finish action.
+     * @param instance Action instance.
+     */
+    onActionRouteDestroy<T, S>(instance?: ActionInstance<T, S>): void;
     /**
      * Deactivates action by choosing final state, closing dialog and completing all subjects in instance and contexts.
      *
      * @param instance Action instance.
-     * @param fromDialogListener Deactivation called from dialog listener, in this case deactivation happens only if true.
+     * @param onDestroy Marks if finish is called on component destroy lifecycle hook.
      */
-    deactivateAction<T, S>(instance: ActionInstance<T, S>, fromDialogListener?: boolean): void;
+    finishAction<T, S>(instance: ActionInstance<T, S>, onDestroy?: boolean): void;
     /**
      * Triggers action from table row click position.
      *
@@ -122,6 +144,8 @@ export declare class MngActionExecutorService {
      * @param route Currently activate route.
      * @param tableDescriptor Table descriptor.
      * @param dataKeyProperty Data key property.
+     *
+     * @deprecated
      */
     triggerRowClickAction<T>(action: ActionDescriptor<T>, event: MngTableCellClickEvent<T>, route?: ActivatedRoute, tableDescriptor?: TableDescriptor<T>, dataKeyProperty?: string): ActionInstance<T, unknown>;
     /**
@@ -137,7 +161,7 @@ export declare class MngActionExecutorService {
      * Deactivates on route triggered action by trying to reroute back to location where action was triggered.
      * @param instance Action instance.
      */
-    deactivateOnRouteTriggeredAction<T, S>(instance: ActionInstance<T, S>): void;
+    finishActionRouteUntrigger<T, S>(instance: ActionInstance<T, S>): void;
     /**
      * Transform error of any type to mng error by using error mapper that could be provided by final project.
      * @param error error of any type.
@@ -145,6 +169,16 @@ export declare class MngActionExecutorService {
      * @return mapped MngError.
      */
     toMngActionError(error?: any): MngError;
+    /**
+     * Creates or gets existing action instance.
+     * @param instance Action instance.
+     * @param action Action descriptor.
+     * @param parameters Action parameters.
+     * @param instanceInitialStatus Action instance initial status.
+     * @param skipInitializationFromViewContainer If initialization of instance from view container should be skipped.
+     * @private
+     */
+    private getOrCreateInstance;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngActionExecutorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MngActionExecutorService>;
 }

package/lib/services/commons.service.d.ts

@@ -77,6 +77,8 @@ export declare class MngCommonsService {
     get userRoles(): Array<string>;
     set userRoles(roles: Array<string>);
     get userRoles$(): Observable<string[]>;
+    get actionsDebugLog(): boolean;
+    get actionsDebugInstances(): boolean;
     reset(): void;
     menuChangeActiveKey(key: string): void;
     menuReset(): void;

package/lib/services/index.d.ts

@@ -3,4 +3,6 @@ export * from './configuration.service';
 export * from './commons.service';
 export * from './error-mapper.service';
 export * from './navigation.service';
+export * from './router.service';
+export * from './version.service';
 export * from './view-container.component.service';

package/lib/services/internal/commons-init.service.d.ts

@@ -1,8 +1,6 @@
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { MngCommonsService } from '../commons.service';
-import { MngConfigurationService } from '../configuration.service';
-import { MngRouterService } from '../router.service';
+import { MngCommonsService, MngConfigurationService, MngRouterService } from '../';
 import * as i0 from "@angular/core";
 export declare class MngCommonsInitService {
     private translate;

package/lib/services/navigation.service.d.ts

@@ -6,8 +6,9 @@ export declare class MngNavigationService {
     private location;
     private history;
     constructor(router: Router, location: Location);
-    getCurrentLocation(): string | null;
-    getPreviousLocation(): string | null;
+    getCurrentLocationFromHistory(): string | null;
+    getCurrentLocationFromUrl(): string;
+    getPreviousLocationFromHistory(): string | null;
     back(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngNavigationService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MngNavigationService>;

package/lib/services/view-container.component.service.d.ts

@@ -1,15 +1,17 @@
 import { MessageService } from 'primeng/api';
 import { Observable } from 'rxjs';
+import { ActionInstance } from '../components/action/models';
 import { IDataProvider } from '../data-providers';
 import { ActionDescriptor } from '../descriptors/action';
-import { IViewContainerEditor, IViewContainerTable, ViewContainerEditorCloseEvent, ViewContainerEditorResetEvent, ViewContainerTableReloadEvent } from '../models';
+import { IViewActionRouteTriggeredContainer, IViewContainerEditor, IViewContainerTable, ViewContainerEditorCloseEvent, ViewContainerEditorResetEvent, ViewContainerTableReloadEvent } from '../models';
 import * as i0 from "@angular/core";
 /**
  * Should be used with providers defined within component.
  */
-export declare class MngViewContainerComponentService<T, S> implements IViewContainerTable<T, S>, IViewContainerEditor<T, S> {
+export declare class MngViewContainerComponentService<T, S> implements IViewContainerTable<T, S>, IViewContainerEditor<T, S>, IViewActionRouteTriggeredContainer<T, S> {
     private messageService;
     private _dataProvider?;
+    private _routeTriggeredActionInstance?;
     private actions;
     private _tableReloadSubject;
     private _editorResetSubject;
@@ -26,6 +28,9 @@ export declare class MngViewContainerComponentService<T, S> implements IViewCont
     resetEditor(event?: ViewContainerEditorResetEvent<T> | undefined): void;
     getEditorClose$(): Observable<ViewContainerEditorCloseEvent<T>>;
     closeEditor(event?: ViewContainerEditorCloseEvent<T>): void;
+    getActionRouteTriggeredInstance(): ActionInstance<T, S> | undefined;
+    setActionRouteTriggeredInstance(instance: ActionInstance<T, S>): void;
+    unsetActionRouteTriggeredInstance(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MngViewContainerComponentService<any, any>, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MngViewContainerComponentService<any, any>>;
 }

package/lib/utils/action-data-provider.util.d.ts

@@ -1,6 +1,8 @@
+import { Injector } from '@angular/core';
 import { Observable } from 'rxjs';
 import { MediusQueryResult } from '../api/models';
 import { ActionContext } from '../components/action/models';
+import { IDataProvider } from '../data-providers';
 export declare class ActionDataProviderUtil {
     static runGetAllOrFail<T, S>(ctx: ActionContext<T, S>): Observable<MediusQueryResult<T>>;
     static runFetchOrFail<T, S>(ctx: ActionContext<T, S>): Observable<T>;
@@ -23,4 +25,10 @@ export declare class ActionDataProviderUtil {
     static runCreateDataProvider<T, S>(ctx: ActionContext<T, S>): Observable<T> | null;
     static runUpdateDataProvider<T, S>(ctx: ActionContext<T, S>): Observable<T> | null;
     static runDeleteDataProvider<T, S>(ctx: ActionContext<T, S>): Observable<T | null> | null;
+    /**
+     * Gets service instance of data provider.
+     *
+     * @param dataProvider Data provider instance.
+     */
+    static getDataProviderService<T, S>(injector: Injector, dataProvider?: IDataProvider<T, S>): S | null;
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mediusinc/mng-commons",
-  "version": "2.5.0-rc.0",
+  "version": "2.6.0-rc.0",
   "peerDependencies": {
+    "@angular/animations": "^15.2.6",
     "@angular/common": "^15.2.6",
     "@angular/core": "^15.2.6",
     "@angular/forms": "^15.2.6",
-    "@angular/router": "^15.2.6",
     "@angular/platform-browser": "^15.2.6",
-    "@angular/animations": "^15.2.6",
+    "@angular/router": "^15.2.6",
     "@ngx-formly/core": "^6.1.3",
     "@ngx-translate/core": "^14.0.0",
     "primeng": "~15.3.0",

package/scss/mng-commons-light.scss

@@ -1,5 +1,8 @@
 /* You can add global styles to this file, and also import other style files */
 
+$multiselectHighlightBg: rgba(68, 72, 109, 0.12) !default;
+$multiselectHighlightTextColor: #44486d;
+
 // theme and layout
 @import 'layout/default/layout-light.scss';
 @import 'theme/default/theme-light.scss';

package/scss/mng-overrides/_theme_multiselect.scss

@@ -0,0 +1,20 @@
+@use 'sass:math';
+
+.p-multiselect-panel {
+    .p-multiselect-items {
+        .p-multiselect-item {
+            &.p-highlight {
+                color: $multiselectHighlightTextColor;
+                background: $multiselectHighlightBg;
+            }
+
+            .p-checkbox {
+                .p-checkbox-box {
+                    &.p-highlight {
+                        border: $checkboxBorder;
+                    }
+                }
+            }
+        }
+    }
+}

package/scss/mng-overrides/_theme_styles.scss

@@ -12,6 +12,7 @@
 @import './theme_toast';
 @import './theme_menu';
 @import './_theme_input';
+@import './theme_multiselect';
 
 .p-tabview-title-error {
     color: $errorColor !important;