@uxland/primary-shell 5.3.4 → 5.3.6

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

@@ -5,10 +5,10 @@ export declare abstract class EcapEventManager {
      * @param eventType - Event type.
      * @param url - Asociated URL to event.
      */
-    abstract publish(eventType: string, accio: string, payload: Record<string, string>): void;
+    abstract publish(eventType: string, accio: string, payload?: Record<string, string>): void;
 }
 declare class EcapEventManagerImpl implements EcapEventManager {
-    publish(eventType: string, accio: string, payload: Record<string, string>): void;
+    publish(eventType: string, accio: string, payload?: Record<string, string>): void;
     private createEcapEvent;
     private raiseEcapEvent;
 }

package/dist/primary/shell/src/disposer.d.ts

@@ -1,2 +1,3 @@
 export declare const disposeShell: () => void;
 export declare const raiseCloseEvent: () => void;
+export declare const raiseCustomCloseEvent: (event: string) => void;

package/dist/primary/shell/src/features/exit/handler.d.ts

@@ -4,7 +4,8 @@ import { ExitShell } from './request';
 export declare class ExitShellHandler {
     private api;
     constructor(api: PrimariaApi);
-    handle(message: ExitShell): Promise<void>;
+    handle({ ecapEvent }: ExitShell): Promise<void>;
     private askForClose;
     private timeout;
+    private emitClose;
 }

package/dist/primary/shell/src/features/exit/request.d.ts

@@ -1,4 +1,6 @@
 import { IRequest } from '../..';
 
 export declare class ExitShell implements IRequest<void> {
+    ecapEvent?: string | undefined;
+    constructor(ecapEvent?: string | undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.3.4",
+  "version": "5.3.6",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/UI/components/primaria-shell/styles.css

@@ -94,7 +94,6 @@
       }
     }
     .create-button-opened {
-      padding: 1px;
       cursor: pointer;
       background-color: #f0f0f0;
       color: var(--color-primary-700);

package/src/UI/internal-views/upper-nav-views.ts

@@ -35,7 +35,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
     label: "Pàgina inici",
     type: "item",
     sortHint: "0010",
-    callbackFn: () => shellApi.broker.send(new ExitShell()),
+    callbackFn: () => shellApi.broker.send(new ExitShell("OBRIR_PI")),
   },
   {
     id: "processes",

package/src/api/ecap-event-manager/ecap-event-manager.ts

@@ -7,12 +7,12 @@ export abstract class EcapEventManager {
    * @param eventType - Event type.
    * @param url - Asociated URL to event.
    */
-  abstract publish(eventType: string, accio: string, payload: Record<string, string>): void;
+  abstract publish(eventType: string, accio: string, payload?: Record<string, string>): void;
 }
 
 class EcapEventManagerImpl implements EcapEventManager {
-  publish(eventType: string, accio: string, payload: Record<string, string>) {
-    const ecapEvent = this.createEcapEvent(eventType, accio, payload);
+  publish(eventType: string, accio: string, payload?: Record<string, string>) {
+    const ecapEvent = this.createEcapEvent(eventType, accio, payload ?? {});
     this.raiseEcapEvent(ecapEvent);
   }
 

package/src/disposer.ts

@@ -7,3 +7,7 @@ export const disposeShell = () => {
 export const raiseCloseEvent = () => {
   shellApi.ecapEventManager.publish("CLOSE_FORM", "", {});
 };
+
+export const raiseCustomCloseEvent = (event: string) => {
+  shellApi.ecapEventManager.publish(event, "", {});
+};

package/src/features/exit/handler.ts

@@ -2,7 +2,7 @@ import { PrimariaApi } from "@uxland/primary-shell";
 import { TYPES } from "../../infrastructure/ioc/types";
 import { inject } from "inversify";
 import { ExitShell } from "./request";
-import { disposeShell, raiseCloseEvent } from "../../disposer";
+import { disposeShell, raiseCloseEvent, raiseCustomCloseEvent } from "../../disposer";
 import { disposePlugins } from "../../handle-plugins";
 import { PluginBusyTask } from "../../api/plugin-busy-manager/plugin-busy-manager";
 import { PluginBusyList } from "../../api/plugin-busy-manager/plugin-busy-list/component";
@@ -10,7 +10,7 @@ import { translate } from "../../locales";
 
 export class ExitShellHandler {
   constructor(@inject(TYPES.primaryApi) private api: PrimariaApi) {}
-  async handle(message: ExitShell): Promise<void> {
+  async handle({ ecapEvent }: ExitShell): Promise<void> {
     try {
       const busyTasks = this.api.pluginBusyManager.getBusyPluginTasks();
       if (busyTasks.length > 0) {
@@ -24,10 +24,10 @@ export class ExitShellHandler {
         this.timeout(5000), // Si passen 5s, es segueix amb l'execució
       ]);
       disposeShell();
-      raiseCloseEvent();
+      this.emitClose(ecapEvent);
     } catch (error) {
       this.api.notificationService.error(error.message);
-      raiseCloseEvent();
+      this.emitClose(ecapEvent);
     }
   }
 
@@ -43,4 +43,12 @@ export class ExitShellHandler {
   private timeout(ms: number) {
     return new Promise<void>((resolve) => setTimeout(resolve, ms));
   }
+
+  private emitClose(ecapEvent?: string): void {
+    if (ecapEvent) {
+      raiseCustomCloseEvent(ecapEvent);
+    } else {
+      raiseCloseEvent();
+    }
+  }
 }

package/src/features/exit/request.ts

@@ -1,3 +1,5 @@
 import { IRequest } from "@uxland/primary-shell";
 
-export class ExitShell implements IRequest<void> {}
+export class ExitShell implements IRequest<void> {
+  constructor(public ecapEvent?: string) {}
+}

package/src/internal-plugins/activity-history/activity-history-item/domain/business-rules.ts

@@ -20,10 +20,5 @@ export const hasItemDivider = (
     return true;
   }
 
-  const currentDate = new Date(item.date).getTime();
-  const nextDate = new Date(items[currentIndex + 1].date).getTime();
-
-  const diffMinutes = Math.abs(nextDate - currentDate) / (1000 * 60);
-
-  return diffMinutes > 15;
+  return !item.diagnostics.length;
 };

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

@@ -98,6 +98,7 @@ const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivit
     showRole ? props.highlighted(item.professional.role.description) : null,
     props.highlighted(item.center.description),
     props.highlighted(item.professional.speciality.description),
+    props.highlighted(item.service.description),
   ].filter(Boolean);
 
   const professionalValues = professionalItems.map(