@uxland/primary-shell 4.3.1 → 5.1.0

package/src/api/plugin-busy-manager/plugin-busy-manager.ts

@@ -1,22 +1,44 @@
+import { shellEvents } from "../../events";
+import { PrimariaBroker } from "../broker/primaria-broker";
+
 export interface PluginBusyTask {
   taskId: string;
   taskDescription: string;
 }
 
+export interface QuickActionBusyTask {
+  taskId: string;
+}
+
 export abstract class PluginBusyManager {
   abstract addBusyPluginTask(busyTask: PluginBusyTask): void;
-  abstract removeBusyPluginTask(taskId: string): any;
+  abstract removeBusyPluginTask(taskId: string): void;
+  abstract addBusyQuickActionTask(busyTask: QuickActionBusyTask): void;
+  abstract removeBusyQuickActionTask(taskId: string): void;
   abstract clearAllBusyPlugins(): void;
   abstract isAnyPluginBusy(): boolean;
+  abstract isAnyQuickActionBusy(): boolean;
   abstract getBusyPluginTasks(): PluginBusyTask[];
 }
 export class PluginBusyManagerImpl implements PluginBusyManager {
+  constructor(public broker: PrimariaBroker) {}
   private busyPluginTasks: PluginBusyTask[] = [];
+  private busyQuickActionTasks: QuickActionBusyTask[] = [];
 
   public addBusyPluginTask(busyTask: PluginBusyTask): void {
     this.busyPluginTasks.push(busyTask);
   }
 
+  public addBusyQuickActionTask(busyTask: QuickActionBusyTask): void {
+    const index = this.busyQuickActionTasks.findIndex((item) => item.taskId === busyTask.taskId);
+    if (index > -1) {
+      return;
+    }
+
+    this.busyQuickActionTasks.push(busyTask);
+    this.emitQuickActionBusyChanged();
+  }
+
   public removeBusyPluginTask(taskId: string): any {
     const index = this.busyPluginTasks.findIndex((item) => item.taskId === taskId);
     if (index > -1) {
@@ -24,15 +46,36 @@ export class PluginBusyManagerImpl implements PluginBusyManager {
     }
   }
 
+  public removeBusyQuickActionTask(taskId: string): any {
+    const index = this.busyQuickActionTasks.findIndex((item) => item.taskId === taskId);
+    if (index > -1) {
+      this.busyQuickActionTasks.splice(index, 1);
+      this.emitQuickActionBusyChanged();
+    }
+  }
+
   public isAnyPluginBusy(): boolean {
     return this.busyPluginTasks.length > 0;
   }
 
+  public isAnyQuickActionBusy(): boolean {
+    return this.busyQuickActionTasks.length > 0;
+  }
+
   public clearAllBusyPlugins(): void {
     this.busyPluginTasks = [];
   }
 
+  public clearAllBusyQuickActions(): void {
+    this.busyQuickActionTasks = [];
+  }
+
   public getBusyPluginTasks(): PluginBusyTask[] {
     return this.busyPluginTasks;
   }
+
+  private emitQuickActionBusyChanged() {
+    const busy = this.isAnyQuickActionBusy();
+    this.broker.publish(shellEvents.quickActionBusyChanged, { busy });
+  }
 }

package/src/api/region-manager/region-manager.ts

@@ -11,6 +11,7 @@ export interface PrimariaRegionManager extends HarmonixRegionManager {
   registerMainView(view: HarmonixViewDefinition): Promise<void>;
   activateMainView(viewId: string): Promise<void>;
   getCurrentMainViewActive(): string | undefined;
+  _destroy(): void;
 }
 
 class RegionManagerProxy implements PrimariaRegionManager {
@@ -140,6 +141,10 @@ class RegionManagerProxy implements PrimariaRegionManager {
   _notifyMainViewChanged(viewId: string) {
     this.broker.publish(shellEvents.mainViewChanged, { viewId });
   }
+
+  _destroy() {
+    this.regionManager.destroy();
+  }
 }
 
 /**

package/src/disposer.ts

@@ -1,7 +1,7 @@
 import { shellApi } from "./api/api";
 import { teardownFeatures } from "./features/bootstrapper";
 export const disposeShell = () => {
-  teardownFeatures();
+  teardownFeatures(shellApi);
 };
 
 export const raiseCloseEvent = () => {

package/src/events.ts

@@ -3,4 +3,6 @@ export const shellEvents = {
   appCrashed: "appCrashed",
   mainViewChanged: "mainViewChanged",
   refreshTokenFailed: "refreshTokenFailed",
+  mpidHeaderInvalid: "mpidHeaderInvalid",
+  quickActionBusyChanged: "quickActionBusyChanged",
 };

package/src/features/bootstrapper.ts

@@ -1,4 +1,5 @@
-import { PrimariaApi, shellApi } from "../api/api";
+import { mediatorSettings } from "mediatr-ts";
+import { PrimariaApi } from "../api/api";
 import { container } from "../infrastructure/ioc/container";
 import { TYPES } from "../infrastructure/ioc/types";
 import { bootstrapExitShell, teardownExitShell } from "./exit/bootstrapper";
@@ -9,11 +10,13 @@ export const bootstrapFeatures = (api: PrimariaApi) => {
   container.bind(TYPES.primaryApi).toConstantValue(api);
   bootstrapGetUserInfo();
   bootstrapExitShell();
-  shellApi.broker.send(new GetUserInfo());
+  api.broker.send(new GetUserInfo());
 };
 
-export const teardownFeatures = () => {
+export const teardownFeatures = (api: PrimariaApi) => {
   teardownGetUserInfo();
   teardownExitShell();
   container.unbindAll();
+  api.regionManager._destroy();
+  mediatorSettings.resolver.clear();
 };

package/src/features/exit/handler.ts

@@ -1,4 +1,4 @@
-import { CustomConfirmOptions, PrimariaApi } from "@uxland/primary-shell";
+import { PrimariaApi } from "@uxland/primary-shell";
 import { TYPES } from "../../infrastructure/ioc/types";
 import { inject } from "inversify";
 import { ExitShell } from "./request";
@@ -27,22 +27,17 @@ export class ExitShellHandler {
 
       raiseCloseEvent();
     } catch (error) {
-      this.api.interactionManager.notify({
-        type: "error",
-        message: error.message,
-      });
+      this.api.notificationService.error(error.message);
     }
   }
 
   private askForClose(busyTasks: PluginBusyTask[]) {
-    return this.api.interactionManager.customConfirm({
+    return this.api.interactionService.confirm({ busyTasks }, PluginBusyList, {
       title: translate("actions.askExit"),
-      componentConstructor: PluginBusyList,
-      type: "danger",
-      model: { busyTasks },
-      acceptLabel: "Si",
-      cancelLabel: "No",
-    } as CustomConfirmOptions<{ busyTasks: PluginBusyTask[] }>);
+      state: "error",
+      confirmButtonText: "Sí",
+      cancelButtonText: "No",
+    });
   }
 
   private timeout(ms: number) {

package/src/features/get-user-info/handler.ts

@@ -17,10 +17,9 @@ export class GetUserInfoHandler {
       this.api.globalStateManager.setData("userInfo", userInfo);
       return userInfo;
     } catch (error) {
-      this.api.interactionManager.notify({
-        type: "error",
-        message: error.message,
-      });
+      this.api.notificationService.error(
+        error.message,
+      );
     }
   }
 }

package/src/index.ts

@@ -7,8 +7,6 @@ export * from "./api/api";
 export * from "./api/broker/primaria-broker";
 export * from "./UI/index";
 export { PrimariaNavItem } from "./UI/shared-components/primaria-nav-item/primaria-nav-item";
-export { confirmMixin } from "./UI/shared-components/primaria-interaction";
-export type { CustomConfirmOptions } from "./UI/shared-components/primaria-interaction";
 export {
   EcapEventManager,
   createEcapEventManager,
@@ -17,3 +15,4 @@ export type { IEcapEvent } from "./api/ecap-event-manager/typings";
 export * from "./internal-plugins";
 export * from "@uxland/harmonix-adapters";
 export * from "./events";
+export * from "./api/interaction-service";

package/src/internal-plugins/activity-history/activity-history-item/export-to-pdf/export-pdf-modal/export-pdf-modal.ts

@@ -2,10 +2,9 @@ import { LitElement, css, html, unsafeCSS } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import styles from "./export-pdf-modal.css?inline";
 import { template } from "./template";
-import { confirmMixin } from "../../../../../UI/shared-components/primaria-interaction/confirm-mixin";
 
 @customElement("export-pdf-modal")
-export class ExportPdfModal extends confirmMixin(LitElement) {
+export class ExportPdfModal extends LitElement {
   render() {
     return html`
         ${template(this)} 
@@ -38,14 +37,6 @@ export class ExportPdfModal extends confirmMixin(LitElement) {
     { label: "Element 4", value: "4" },
   ];
 
-  _accept() {
-    this.close({ confirmed: true, outputModel: this.outputModel });
-  }
-
-  _cancel() {
-    this.close({ confirmed: false, outputModel: this.outputModel });
-  }
-
   handleTest() {
     console.log(
       // this.selectedVisibilityLevelElement,

package/src/internal-plugins/activity-history/activity-history-item/export-to-pdf/export-pdf-modal/template.ts

@@ -14,7 +14,6 @@ export const template = (props: ExportPdfModal) => {
                 <input id="dropdown1" slot="input" type="text" class="dss-input" />
             </dss-input-dropdown> -->
             <div class="content-options">
-              <span>${translate("modal.selectExportOption")}</span>
               <div class="selector-options">
                 <dss-radio-button>
                   <input slot="input" id="radioButton1" type="radio" name="exportOption" @change=${() => {
@@ -47,11 +46,5 @@ export const template = (props: ExportPdfModal) => {
               </div>`
                 : nothing
             }
-            <div class="actions">
-              <dss-button @click="${props._cancel}" id="cancel-btn" label="${translate("modal.cancel")}" size="md" variant="secondary"></dss-button>
-              <dss-button @click="${props._accept}" ?disabled="${!props.selectedRadioOption}" id="accept-btn"  label="${translate("modal.export")}" size="md"></dss-button>
-            </div>
-            <!-- Button to test 
-            <button @click=${() => props.handleTest()}>Console log</button> -->
         </div>`;
 };

package/src/internal-plugins/activity-history/activity-history-item/export-to-pdf/handler.ts

@@ -1,13 +1,14 @@
 import { ApiBaseHandler } from "../../infrastructure/base-handlers";
+import { translate } from "../../localization";
 import { ExportPdfModal } from "./export-pdf-modal/export-pdf-modal";
 
 export class ExportToPdfHandler extends ApiBaseHandler {
   async handle() {
     try {
-      this.api.interactionManager.customConfirm({
-        title: "Exportar a PDF",
-        componentConstructor: ExportPdfModal,
-        type: "info",
+      this.api.interactionService.confirm(undefined, ExportPdfModal, {
+        title: translate("modal.selectExportOption"),
+        confirmButtonText: "Exportar",
+        cancelButtonText: "Cancelar",
       });
     } catch (error) {
       this._notifyError(error.message);
@@ -15,9 +16,8 @@ export class ExportToPdfHandler extends ApiBaseHandler {
   }
 
   _notifyError(errorMessage?: string) {
-    this.api.interactionManager.notify({
-      type: "error",
-      message: errorMessage || "actions.delete.error",
-    });
+    this.api.notificationService.error(
+      errorMessage || "actions.delete.error",
+    );
   }
 }

package/src/internal-plugins/activity-history/activity-history-item/list/UI/main-view/template.ts

@@ -25,7 +25,7 @@ export const template = (props: ActivityHistoryMain) =>
                 <dss-action-menu position="bottom-start">
                     <dss-action-menu-item lefticon="view_timeline" label=${translate("actions.cronogram")} @click=${props._raiseEcapCronogramEvent}></dss-action-menu-item>
                     <dss-action-menu-item lefticon="file_download" label=${translate("actions.exportPdf")} @click=${() => props.api.broker.send(new ExportPdf())}></dss-action-menu-item>
-                    <dss-action-menu-item label=${translate("actions.noteLegend")}></dss-action-menu-item>
+                    <dss-action-menu-item lefticon="info" label=${translate("actions.entryLegend")}></dss-action-menu-item>
                 </dss-action-menu>
             </div>  
         </div>`

package/src/internal-plugins/activity-history/activity-history-item/search/handler.ts

@@ -7,9 +7,11 @@ export class SearchItemsHandler extends BaseHandler {
   async handle(request: SearchActivityHistoryItems) {
     try {
       this.store.dispatch(setSearchString(request.searchString));
-      this.api.broker.publish(events.activityHistorySearched, {
-        searchQuery: request.searchString,
-      });
+      setTimeout(() => {
+        this.api.broker.publish(events.activityHistorySearched, {
+          searchQuery: request.searchString,
+        });
+      }, 300);
     } catch (e) {
       console.log(e.message);
     }

package/src/internal-plugins/activity-history/localization.ts

@@ -40,7 +40,6 @@ export const locales = {
       actions: {
         cronogram: "Cronograma",
         exportPdf: "Exportar PDF",
-        noteLegend: "Llegenda notes",
         moreOptions: "Més opcions",
         entryLegend: "Llegenda entrades",
         maximizeButton: "Botó maximitzar",

package/src/locales.ts

@@ -40,6 +40,11 @@ export const locales = {
       clinicalMonitoring: {
         title: "Seguiment clínic",
       },
+      errors: {
+        session: "Hi ha hagut un error amb la sessió. Siusplau, tanca i torna a obrir l'aplicació.",
+        invalidPatient:
+          "El pacient actual no és vàlid. Siusplau, tanca i torna a obrir l'aplicació.",
+      },
       header: {
         workCenter: "Centre treball",
         role: "Rol",

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/components/dialog-component.d.ts

@@ -1,19 +0,0 @@
-import { LitElement } from 'lit';
-import { ConfirmOptions, ConfirmResult, CustomConfirmOptions } from '../typings';
-
-export declare class DialogComponent extends LitElement {
-    render(): import('lit').TemplateResult<1>;
-    static get styles(): import('lit').CSSResult;
-    options: ConfirmOptions & CustomConfirmOptions;
-    modal: any;
-    _cancel(e: any): void;
-    _accept(e: any): void;
-    componentCloseRequest(e: CustomEvent): void;
-    close(result: ConfirmResult): Promise<void>;
-    getCustomComponent(): any;
-    acceptButton: HTMLElement;
-    actionsContainer: HTMLElement;
-    header: HTMLElement;
-    content: HTMLElement;
-    show(): void;
-}

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/components/notifier-component.d.ts

@@ -1,12 +0,0 @@
-import { LitElement } from 'lit';
-import { NotifyOptions } from '../typings';
-
-export declare class NotifierComponent extends LitElement {
-    render(): import('lit').TemplateResult<1>;
-    static get styles(): import('lit').CSSResult;
-    options: NotifyOptions;
-    snackbar: HTMLElement;
-    show(): void;
-    clearAndUpdateOrder(order: string): void;
-    close(): void;
-}

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/confirm-mixin.d.ts

@@ -1,11 +0,0 @@
-import { LitElement } from 'lit';
-import { ConfirmResult, Constructor } from './typings';
-
-export declare class ConfirmMixinBase {
-    model: any;
-    outputModel: any;
-    close(result: ConfirmResult): void;
-    canAccept(): Promise<boolean> | boolean;
-    accept(result: ConfirmResult): Promise<ConfirmResult>;
-}
-export declare function confirmMixin<T extends Constructor<LitElement>>(superClass: T): Constructor<ConfirmMixinBase> & T;

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/confirm.d.ts

@@ -1,3 +0,0 @@
-import { ConfirmOptions, ConfirmResult, CustomConfirmOptions } from './typings';
-
-export declare const confirm: (options: (ConfirmOptions & CustomConfirmOptions) | any) => Promise<ConfirmResult>;

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/index.d.ts

@@ -1,5 +0,0 @@
-export * from './confirm';
-export * from './notify';
-export * from './open-dialog';
-export * from './confirm-mixin';
-export * from './typings';

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/notify.d.ts

@@ -1,4 +0,0 @@
-import { NotifyOptions } from './typings';
-
-export declare function generateId(): string;
-export declare const notify: (options: NotifyOptions) => void;

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/open-dialog.d.ts

@@ -1,3 +0,0 @@
-import { DialogOptions } from './typings';
-
-export declare const openDialog: (options: DialogOptions | any) => void;

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/shared.d.ts

@@ -1,3 +0,0 @@
-import { ConfirmOptions, ConfirmResult, CustomConfirmOptions, DialogOptions } from './typings';
-
-export declare const buildDialogComponent: (options: DialogOptions & ConfirmOptions & CustomConfirmOptions) => Promise<ConfirmResult>;

package/dist/primary/shell/src/UI/shared-components/primaria-interaction/typings.d.ts

@@ -1,40 +0,0 @@
-import { LitElement } from 'lit';
-
-export declare type Constructor<T = Record<string, unknown>> = new (...args: any[]) => T;
-export interface ConfirmOptions {
-    title: string;
-    message: string;
-    type: ConfirmType;
-    acceptLabel: string;
-    cancelLabel: string;
-}
-export interface CustomConfirmOptions<T = any> {
-    title: string;
-    componentConstructor: Constructor<LitElement | any>;
-    type: ConfirmType;
-    acceptLabel?: string;
-    cancelLabel?: string;
-    model?: T;
-    fullCustomization?: boolean;
-}
-export interface DialogOptions<T = any> {
-    title: string;
-    componentConstructor: Constructor<LitElement | any>;
-    model?: T;
-    showCloseButton?: boolean;
-    fullCustomization?: boolean;
-}
-export type ConfirmType = "danger" | "warning" | "info" | "success";
-export interface NotifyOptions {
-    message?: string;
-    type?: NotifyType;
-    position?: NotifyPosition;
-    order?: string;
-}
-export interface ConfirmResult<T = any> {
-    confirmed: boolean;
-    outputModel?: T;
-}
-export type NotifyOrder = "first" | "second" | "third" | "fourth" | "fifth";
-export type NotifyPosition = "bottom" | "center" | "top";
-export type NotifyType = "warning" | "info" | "success" | "error";

package/dist/primary/shell/src/api/interaction-manager/interaction.d.ts

@@ -1,9 +0,0 @@
-import { ConfirmOptions, ConfirmResult, CustomConfirmOptions, DialogOptions, NotifyOptions } from '../../UI/shared-components/primaria-interaction';
-
-export interface PrimariaInteractionManager {
-    notify(options: NotifyOptions): void;
-    confirm(options: ConfirmOptions): Promise<ConfirmResult>;
-    customConfirm(options: CustomConfirmOptions): Promise<ConfirmResult>;
-    openDialog(options: DialogOptions): void;
-}
-export declare const createInteractionManager: () => PrimariaInteractionManager;

package/src/UI/shared-components/primaria-interaction/components/dialog-component-styles.css

@@ -1,104 +0,0 @@
-*[hidden] {
-  display: none !important;
-}
-
-.modal {
-  font-family: "Open Sans";
-  display: none;
-  position: fixed;
-  z-index: 400;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.65);
-
-  .dialog {
-    display: flex;
-    flex-direction: column;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    z-index: 21;
-    background: #fff;
-    border-radius: 16px;
-    width: auto;
-    height: auto;
-    max-height: 95%;
-    min-width: 400px;
-    box-shadow:
-      0px 0px 14px rgb(0 0 0 / 25%),
-      0px 1px 10px rgb(0 0 0 / 22%);
-
-    .dialog__header {
-      display: flex;
-      flex-direction: row;
-      justify-content: center;
-      padding: 24px;
-      border-top-left-radius: 8px;
-      border-top-right-radius: 8px;
-      align-items: center;
-
-      &.with-close{
-        justify-content: space-between;
-      }
-      h2 {
-        color: var(--color-neutral-900);
-        padding: 0;
-        margin: 0;
-        font-weight: 700;
-        font-size: 1.286rem;
-        line-height: 30px;
-      }
-    }
-    .dialog__content {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      align-items: center;
-
-      min-height: 1px;
-      height: 100%;
-      padding-inline: 24px;
-      padding-bottom: 24px;
-      font-weight: 400;
-      font-size: 16px;
-      line-height: 24px;
-      border-bottom-left-radius: 8px;
-      border-bottom-right-radius: 8px;
-
-      & > * {
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
-      }
-    }
-    .dialog__actions {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: center;
-      gap: 16px;
-      padding: 24px 16px;
-    }
-  }
-}
-
-/* Animations to fade the snackbar in and out */
-@-webkit-keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}