@uxland/primary-shell 3.5.1 → 3.5.2

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

@@ -19,6 +19,7 @@ export declare class PrimariaShell extends PrimariaShell_base {
         message: string;
     };
     _toggleSidebar(): void;
+    private subscriptions;
     _subscribeEvents(): void;
     _unsubscribeEvents(): void;
 }

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

@@ -37,4 +37,4 @@ export interface ConfirmResult<T = any> {
 }
 export type NotifyOrder = "first" | "second" | "third" | "fourth" | "fifth";
 export type NotifyPosition = "bottom" | "center" | "top";
-export type NotifyType = "danger" | "warning" | "info" | "success" | "error";
+export type NotifyType = "warning" | "info" | "success" | "error";

package/dist/primary/shell/src/internal-plugins/activity-history/components/activity-history/activity-history.d.ts

@@ -17,6 +17,8 @@ export declare class ActivityHistory extends ActivityHistory_base {
     _toggleFilters(): void;
     _maximize(): void;
     _minimize(): void;
+    _subscribeEvents(): void;
+    _unsubscribeEvents(): void;
     searchQuery: string;
     _handleSearchChange(event: any): void;
     _handleSelectDate(date: string): void;

package/package.json

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

package/src/UI/components/primaria-shell/primaria-shell.ts

@@ -8,6 +8,7 @@ import { template } from "./template";
 import { shellViews } from "./constants";
 import { shellEvents } from "../../../events";
 import { activateDefaultView } from "../../../handle-views";
+import { BrokerDisposableHandler } from "harmonix/core/dist";
 
 //@ts-ignore
 @customElement("primaria-shell")
@@ -68,14 +69,20 @@ export class PrimariaShell extends PrimariaRegionHost(LitElement) {
     this.sidebarExpanded = !this.sidebarExpanded;
   }
 
+  private subscriptions: BrokerDisposableHandler[] = [];
+
   _subscribeEvents() {
-    shellApi.broker.subscribe(shellEvents.appCrashed, (error: { message: string }) => {
-      this.viewSelected = shellViews.error;
-      this.error = error;
-    });
+    const subscription = shellApi.broker.subscribe(
+      shellEvents.appCrashed,
+      (error: { message: string }) => {
+        this.viewSelected = shellViews.error;
+        this.error = error;
+      },
+    );
+    this.subscriptions.push(subscription);
   }
 
   _unsubscribeEvents() {
-    //TODO unsubscribe when broker accept unsuscribe
+    this.subscriptions.forEach((s) => s.dispose());
   }
 }

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

@@ -33,28 +33,28 @@
     visibility: visible; /* Show the snackbar */
   }
   &.success {
-    background-color: #00893d;
+    background-color: var(--color-green-500);
     color: white;
     box-shadow:
       rgb(67 160 71 / 30%) 0px 0px 2px,
       rgb(67 160 71 / 22%) 0px 0px 5px;
   }
-  &.danger {
-    background-color: red;
+  &.error {
+    background-color: var(--color-red-500);
     color: white;
     box-shadow:
       rgb(229 57 53 / 30%) 0px 0px 2px,
       rgb(229 57 53 / 22%) 0px 0px 5px;
   }
   &.warning {
-    background-color: orange;
-    color: white;
+    background-color: var(--color-yellow-500);
+    color: black;
     box-shadow:
       rgb(251 140 0 / 30%) 0px 0px 2px,
       rgb(251 140 0 / 22%) 0px 0px 5px;
   }
   &.info {
-    background-color: blue;
+    background-color: var(--color-primary-500);
     color: white;
     box-shadow:
       rgb(14 80 138 / 30%) 0px 0px 2px,

package/src/UI/shared-components/primaria-interaction/components/notifier-component.ts

@@ -8,10 +8,10 @@ function getIcon(type: NotifyType | undefined) {
   if (!type) return;
 
   const types = new Map<NotifyType, string>([
-    ["danger", "cancel"],
+    ["error", "error"],
     ["info", "info"],
     ["warning", "warning"],
-    ["success", "done"],
+    ["success", "check_circle"],
   ]);
 
   return types.get(type) as string;

package/src/UI/shared-components/primaria-interaction/typings.ts

@@ -43,4 +43,4 @@ export interface ConfirmResult<T = any> {
 
 export type NotifyOrder = "first" | "second" | "third" | "fourth" | "fifth";
 export type NotifyPosition = "bottom" | "center" | "top";
-export type NotifyType = "danger" | "warning" | "info" | "success" | "error";
+export type NotifyType = "warning" | "info" | "success" | "error";

package/src/UI/shared-components/primaria-nav-item/primaria-nav-item.ts

@@ -6,6 +6,7 @@ import { shellApi } from "../../../api/api";
 import { shellEvents } from "../../../events";
 import { PrimariaNavItemConfig } from "../typings";
 import { regionView } from "@uxland/regions";
+import { BrokerDisposableHandler } from "harmonix/core/dist";
 
 @customElement("primaria-nav-item")
 export class PrimariaNavItem extends regionView(LitElement) {
@@ -18,11 +19,15 @@ export class PrimariaNavItem extends regionView(LitElement) {
     this.config = config;
   }
 
+  private subscriptions: BrokerDisposableHandler[] = [];
+
   connectedCallback(): void {
     super.connectedCallback();
-    shellApi.broker.subscribe(shellEvents.mainViewChanged, (payload: { viewId: string }) => {
-      this.isActive = payload.viewId === this.view?.id;
-    });
+    this._subscribeEvents();
+  }
+
+  disconnectedCallback(): void {
+    this._unsubscribeEvents();
   }
 
   firstUpdated(_changedProps: PropertyValues<PrimariaNavItem>) {
@@ -42,6 +47,20 @@ export class PrimariaNavItem extends regionView(LitElement) {
     observer.observe(parentElement as HTMLElement);
   }
 
+  _subscribeEvents() {
+    const subscription = shellApi.broker.subscribe(
+      shellEvents.mainViewChanged,
+      (payload: { viewId: string }) => {
+        this.isActive = payload.viewId === this.view?.id;
+      },
+    );
+    this.subscriptions.push(subscription);
+  }
+
+  _unsubscribeEvents() {
+    this.subscriptions.forEach((s) => s.dispose());
+  }
+
   render() {
     return html`${template(this)}`;
   }

package/src/api/broker/factory.ts

@@ -129,8 +129,20 @@ const createDynamicRequestHandler = (handler: messageHandler) =>
 const createDynamicEventHandler = (handler: messageHandler) =>
   createDynamicMessageHandler(handler, "EventHandler");
 
+const usedSuffixes = new Set();
+
+function generateUniqueRandomSuffix() {
+  let suffix;
+  do {
+    suffix = Math.floor(Math.random() * 10000);
+  } while (usedSuffixes.has(suffix));
+
+  usedSuffixes.add(suffix);
+  return suffix;
+}
+
 const createDynamicMessageHandler = (handler: messageHandler, classPrefix: string) => {
-  const className = `${classPrefix}_${Math.floor(Math.random() * 10000)}`; // Generate a random class name
+  const className = `${classPrefix}_${generateUniqueRandomSuffix()}`; // Generate a random class name
   return new Function(
     "handler",
     `return class ${className}{

package/src/internal-plugins/activity-history/components/activity-history/activity-history-timeline/activity-history-timeline.ts

@@ -16,7 +16,7 @@ import { IActivityHistoryGroup } from "../../../domain/model";
 @customElement("activity-history-timeline")
 export class ActivityHistoryTimeline extends PrimariaRegionHost(LitElement) {
   render() {
-    return html`${template(this)}${console.log(this.historyGroups)}`;
+    return html`${template(this)}`;
   }
 
   static styles = css`

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

@@ -31,16 +31,12 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
 
   connectedCallback() {
     super.connectedCallback();
-    this.subscriptions.push(
-      this.api.broker.subscribe(shellEvents.openClinicalMonitoringRequested, () => {
-        this.maximized = false;
-      }),
-    );
+    this._subscribeEvents();
   }
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.subscriptions.forEach((s) => s.dispose());
+    this._unsubscribeEvents();
   }
 
   @property({ type: Boolean })
@@ -73,6 +69,20 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
     this.maximized = false;
   }
 
+  _subscribeEvents() {
+    const subscription = this.api.broker.subscribe(
+      shellEvents.openClinicalMonitoringRequested,
+      () => {
+        this.maximized = false;
+      },
+    );
+    this.subscriptions.push(subscription);
+  }
+
+  _unsubscribeEvents() {
+    this.subscriptions.forEach((s) => s.dispose());
+  }
+
   @property()
   searchQuery = "";
   _handleSearchChange(event) {

package/src/internal-plugins/activity-history/components/activity-history/template.ts

@@ -16,7 +16,7 @@ export const template = (props: ActivityHistory) =>
                 <div class="title">${translate("activityHistory")}</div>
                 <dss-search-bar dropdownStyle=${"display: none"} @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="2" recentsearchestext="" emptydropdowntext="">
                     <label slot="label" for="searchbar1" aria-hidden="false"></label>
-                    <input slot="input" id="searchbar1" type="text" @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
+                    <input slot="input" id="searchbar1" type="text" value=${props.searchQuery} @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
                 </dss-search-bar>
                 <dss-datepicker dropdownFixed inputsize="md" class="date-picker" @onValueChange=${(event) => props._handleSelectDate(event.detail)}>
                     <label slot="label" for="myDatepicker">${translate("goToDate")}</label>
@@ -65,7 +65,7 @@ export const headerMaximizedTemplate = (props: ActivityHistory) => html`
                 <div class="title">${translate("activityHistory")}</div>
                 <dss-search-bar dropdownStyle=${"display: none"} @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="3" recentsearchestext="" emptydropdowntext="Sense resultats per">
                     <label slot="label" for="searchbar1" aria-hidden="false"></label>
-                    <input slot="input" id="searchbar1" type="text" @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
+                    <input slot="input" id="searchbar1" type="text" value=${props.searchQuery} @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
                 </dss-search-bar>
                 <dss-datepicker dropdownFixed inputsize="md" class="date-picker" @onValueChange=${(event) => props._handleSelectDate(event.detail)}>
                     <label slot="label" for="myDatepicker">${translate("goToDate")}</label>