@uxland/primary-shell 5.6.4 → 5.6.5

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/component.d.ts

@@ -0,0 +1,6 @@
+import { LitElement } from 'lit';
+
+export declare class ActivityHistoryIsGroupingBusy extends LitElement {
+    static styles: import('lit').CSSResult;
+    render(): import('lit').TemplateResult<1>;
+}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/template.d.ts

@@ -0,0 +1,3 @@
+import { ActivityHistoryIsGroupingBusy } from './component';
+
+export declare const template: (_props: ActivityHistoryIsGroupingBusy) => import('lit').TemplateResult<1>;

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

@@ -18,6 +18,11 @@ export declare const locales: {
             goToDate: string;
             busyEntriesLoading: string;
             noResults: string;
+            noData: {
+                title: string;
+                description: string;
+            };
+            isGrouping: string;
             searchBarResults: string;
             actions: {
                 cronogram: string;

package/package.json

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

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

@@ -9,14 +9,14 @@ export class AddHistoryItemHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemPayload) {
     try {
       ensureAreValidBasicActivityHistoryItems([payload.item]);
+      handleAddDiagnosticsFilter([payload.item], this.store);
+      handleAddUpFilter([payload.item], this.store);
       this.store.dispatch(
         addActivityHistoryItem({
           id: payload.entityId,
           item: payload.item,
         }),
       );
-      handleAddDiagnosticsFilter([payload.item], this.store);
-      handleAddUpFilter([payload.item], this.store);
     } catch (e) {
       console.log(e.message);
     }

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

@@ -9,6 +9,8 @@ export class AddHistoryItemsHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemsPayload) {
     try {
       const validItems = validateAndFilterBasicItems(payload.items);
+      handleAddDiagnosticsFilter(validItems, this.store);
+      handleAddUpFilter(validItems, this.store);
       this.store.dispatch(
         addActivityHistoryItems({
           id: payload.entityId,
@@ -17,8 +19,6 @@ export class AddHistoryItemsHandler extends StoreBaseHandler {
           searchPredicate: payload.searchPredicate,
         }),
       );
-      handleAddDiagnosticsFilter(validItems, this.store);
-      handleAddUpFilter(validItems, this.store);
     } catch (e) {
       console.log(e.message);
     }

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/component.ts

@@ -0,0 +1,15 @@
+import { LitElement, html, css, unsafeCSS } from "lit";
+import { customElement } from "lit/decorators.js";
+import styles from "./styles.css?inline";
+import { template } from "./template";
+
+@customElement("activity-history-is-grouping-busy")
+export class ActivityHistoryIsGroupingBusy extends LitElement {
+  static styles = css`
+    ${unsafeCSS(styles)}
+  `;
+
+  render() {
+    return template(this);
+  }
+} 

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/styles.css

@@ -0,0 +1,8 @@
+.grouping-busy-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 24px;
+  justify-content: center;
+  padding-top:16px
+}

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/template.ts

@@ -0,0 +1,10 @@
+import { html } from "lit";
+import { ActivityHistoryIsGroupingBusy } from "./component";
+import { translate } from "../../../../localization";
+
+export const template = (_props: ActivityHistoryIsGroupingBusy) => html`
+  <div class="grouping-busy-container">
+    <dss-spinner size="sm"></dss-spinner>
+    <div>${translate("isGrouping")}</div>
+  </div>
+`;

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

@@ -1,5 +1,5 @@
 import { LitElement, PropertyValues, css, html, unsafeCSS } from "lit";
-import { customElement, query } from "lit/decorators.js";
+import { customElement, query, state } from "lit/decorators.js";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import { IActivityHistoryGroup } from "../../../domain/model";
 import { activityHistorySearchStringSelector } from "../../../search/selectors";
@@ -52,11 +52,18 @@ export class ActivityHistoryTimeline extends LitElement {
 
   @query(".virtualizer") private _virtualizer!: HTMLElement;
 
-  _hasUpdatedOnce = false;
+  @state()
+  renderGroupsControlTimeExpired = false;
 
-  firstUpdated(_changeProps: PropertyValues) {
-    super.firstUpdated(_changeProps);
-    this._hasUpdatedOnce = true;
+  connectedCallback(): void {
+    super.connectedCallback();
+    setTimeout(() => {
+      this.renderGroupsControlTimeExpired = true;
+    }, 8000);
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback();
   }
 
   async updated(changedProperties) {

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

@@ -9,7 +9,6 @@ import {
   IActivityHistoryGroup,
   IActivityHistoryItem,
   IActivityHistoryItemWithComponent,
-  IActivityHistorySubGroup,
 } from "../../../domain/model";
 import { translate } from "../../../../localization";
 import { hasItemDivider, shouldShowRole } from "../../../domain/business-rules";
@@ -17,11 +16,9 @@ import {
   ActivityHistoryEntry,
   mergeHistoryItemsAndSubgroups,
 } from "../../merge-history-items-and-subgroups/merge-history-items-and-subgroups";
+import "../../../add/handle-busy/is-grouping-busy/component";
 
 export const template = (props: ActivityHistoryTimeline) => {
-  if (!props._hasUpdatedOnce) {
-    return html`<div class="container"></div>`;
-  }
   return html`
     <div class="container">
       <activity-history-full-data-error></activity-history-full-data-error>
@@ -78,20 +75,30 @@ export const template = (props: ActivityHistoryTimeline) => {
               `}
             ></lit-virtualizer>
           `
-          : !props.isCollectionInitialState && !props.isSomeCollectionLoadedAndOtherLoading
-            ? html`
-              <dss-user-feedback
-                class="feedback"
-                imagesrc=${notFound}
-                title=${translate("noResults")}>
-              </dss-user-feedback>
-            `
-            : nothing
+          : noGroupsTemplate(props)
       }
     </div>
   `;
 };
 
+const noGroupsTemplate = (props: ActivityHistoryTimeline)=> html `
+${props.searchString?.length > 1
+      ? html`
+          <dss-user-feedback
+            class="feedback"
+            imagesrc=${notFound}
+            title=${translate("noResults")}>
+          </dss-user-feedback>
+        `
+      : props.renderGroupsControlTimeExpired
+      ? html`<dss-user-feedback
+            class="feedback"
+            imagesrc=${notFound}
+            title=${translate("noData.title")}
+            description=${translate("noData.description")}>
+          </dss-user-feedback>`
+      : html`<activity-history-is-grouping-busy></activity-history-is-grouping-busy>`}`;
+
 const visitHeaderTemplate = (props: ActivityHistoryTimeline, item: IActivityHistoryItem | undefined) => {
   if (!item) return nothing;
   return html`  

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

@@ -32,6 +32,11 @@ export const locales = {
       goToDate: "Anar a data",
       busyEntriesLoading: "Carregant totes les entrades",
       noResults: "Sense resultats. Modifica la cerca",
+      noData: {
+        title: "Sense dades",
+        description: "No existeix informació per a mostrar"
+      },
+      isGrouping: "Creant agrupacions i preparant les dades...",
       searchBarResults: "Resultats per",
       actions: {
         cronogram: "Cronograma",