@simplysm/angular 14.0.19 → 14.0.22

package/src/features/data-view/useDataSheetModalEditManager.ts

@@ -0,0 +1,76 @@
+import {
+  type OutputEmitterRef,
+  type Signal,
+  type WritableSignal,
+  inject,
+} from "@angular/core";
+import { SdToastProvider } from "../../core/providers/sd-toast.provider";
+import { withBusy } from "../../core/utils/withBusy";
+import type { ISelectModalOutputResult } from "../../core/types/select-modal-output-result";
+
+export function useDataSheetModalEditManager<TItem, TKey>(options: {
+  busyCount: WritableSignal<number>;
+  canEdit: () => boolean;
+  selectedItemKeys: Signal<TKey[]>;
+  selectedItems: Signal<TItem[]>;
+  close: OutputEmitterRef<ISelectModalOutputResult<TItem>>;
+  refresh: () => Promise<void>;
+  getEditItemFn: () =>
+    | ((item?: TItem) => Promise<boolean | undefined> | boolean | undefined)
+    | undefined;
+  getToggleDeleteItemsFn: () =>
+    | ((del: boolean) => Promise<boolean>)
+    | undefined;
+  errorMessageFn: (err: unknown) => string;
+}) {
+  const sdToast = inject(SdToastProvider);
+
+  async function doEditItem(item?: TItem): Promise<void> {
+    const editItemFn = options.getEditItemFn();
+    if (!editItemFn) return;
+
+    const result = await editItemFn(item);
+    if (!result) return;
+
+    await withBusy(options.busyCount, () =>
+      sdToast.try(async () => {
+        await options.refresh();
+      }),
+    );
+  }
+
+  async function doToggleDeleteItems(del: boolean): Promise<void> {
+    if (!options.canEdit()) return;
+    const toggleDeleteItemsFn = options.getToggleDeleteItemsFn();
+    if (!toggleDeleteItemsFn) return;
+
+    await withBusy(options.busyCount, () =>
+      sdToast.try(
+        async () => {
+          const result = await toggleDeleteItemsFn(del);
+          if (!result) return;
+
+          await options.refresh();
+          sdToast.success(`${del ? "삭제" : "복구"} 되었습니다.`);
+        },
+        (err) => options.errorMessageFn(err),
+      ),
+    );
+  }
+
+  function doModalConfirm(): void {
+    options.close.emit({
+      selectedItemKeys: options.selectedItemKeys(),
+      selectedItems: options.selectedItems(),
+    });
+  }
+
+  function doModalCancel(): void {
+    options.close.emit({
+      selectedItemKeys: [],
+      selectedItems: [],
+    });
+  }
+
+  return { doEditItem, doToggleDeleteItems, doModalConfirm, doModalCancel };
+}

package/src/features/data-view/useDataSheetRefreshManager.ts

@@ -0,0 +1,90 @@
+import { type Signal, type WritableSignal, effect, inject } from "@angular/core";
+import { type ArrayOneWayDiffResult, obj } from "@simplysm/core-common";
+import { SdToastProvider } from "../../core/providers/sd-toast.provider";
+import { SdSharedDataProvider } from "../../core/providers/sd-shared-data.provider";
+import { withBusy } from "../../core/utils/withBusy";
+import type { ISdDataSheetSearchResult } from "./sd-data-sheet.types";
+
+export function useDataSheetRefreshManager<
+  TItem,
+  TKey extends string | number | undefined,
+>(options: {
+  busyCount: WritableSignal<number>;
+  initialized: WritableSignal<boolean>;
+  canUse: () => boolean;
+  items: WritableSignal<TItem[]>;
+  selectedItems: WritableSignal<TItem[]>;
+  pageLength: WritableSignal<number>;
+  summaryData: WritableSignal<Partial<TItem>>;
+  page: Signal<number>;
+  lastFilter: Signal<unknown>;
+  sortingDefs: Signal<unknown[]>;
+  getItemInfoFn: (item: TItem) => { key: TKey };
+  search: (
+    usePagination: boolean,
+  ) => Promise<ISdDataSheetSearchResult<TItem>> | ISdDataSheetSearchResult<TItem>;
+  prepareRefreshEffect?: () => void;
+  getDiffsExcludes: () => string[] | undefined;
+}) {
+  const sdToast = inject(SdToastProvider);
+  const sdSharedData = inject(SdSharedDataProvider);
+  let itemsSnapshot: TItem[] = [];
+
+  async function refresh(): Promise<void> {
+    const result = await options.search(true);
+    options.items.set(result.items);
+    itemsSnapshot = obj.clone(result.items);
+
+    options.pageLength.set(result.pageLength ?? 0);
+    options.summaryData.set(result.summary ?? {});
+
+    const selectedKeySet = new Set(
+      options.selectedItems().map((sel) => options.getItemInfoFn(sel).key),
+    );
+    options.selectedItems.set(
+      options.items().filter((item) => selectedKeySet.has(options.getItemInfoFn(item).key)),
+    );
+  }
+
+  function getDiffs(): ArrayOneWayDiffResult<TItem>[] {
+    const diffsExcludes = options.getDiffsExcludes();
+    return options
+      .items()
+      .oneWayDiffs(
+        itemsSnapshot,
+        (item) => options.getItemInfoFn(item).key,
+        diffsExcludes ? { excludes: diffsExcludes } : undefined,
+      )
+      .filter((d) => d.type !== "same");
+  }
+
+  effect((onCleanup) => {
+    options.page();
+    options.lastFilter();
+    options.sortingDefs();
+    options.prepareRefreshEffect?.();
+
+    let cancelled = false;
+    onCleanup(() => {
+      cancelled = true;
+    });
+
+    queueMicrotask(async () => {
+      if (cancelled) return;
+      if (!options.canUse()) {
+        options.initialized.set(true);
+        return;
+      }
+
+      await withBusy(options.busyCount, () =>
+        sdToast.try(async () => {
+          await sdSharedData.wait();
+          await refresh();
+        }),
+      );
+      options.initialized.set(true);
+    });
+  });
+
+  return { refresh, getDiffs };
+}

package/src/features/permission-table/sd-permission-table.control.ts

@@ -10,7 +10,7 @@ import {
   ViewEncapsulation,
 } from "@angular/core";
 import { obj } from "@simplysm/core-common";
-import type { ISdPermission } from "../../core/providers/sd-app-structure.provider";
+import type { ISdPermission } from "../../core/providers/sd-app-structure.types";
 import { SdCheckboxControl } from "../../ui/form/checkbox/sd-checkbox.control";
 import { SdCollapseIconControl } from "../../ui/navigation/collapse/sd-collapse-icon.control";
 import { SdTypedTemplateDirective } from "../../core/directives/sd-typed-template.directive";

package/src/index.ts

@@ -32,14 +32,16 @@ export { SdAngularConfigProvider } from "./core/providers/sd-angular-config.prov
 export { SdSystemLogProvider } from "./core/providers/sd-system-log.provider";
 export {
   SdAppStructureProvider,
-  SdAppStructureUtils,
   usePermsSignal,
-  type TSdAppStructureItem,
-  type ISdMenu,
-  type ISdFlatMenu,
-  type ISdPermission,
-  type ISdFlatPermission,
 } from "./core/providers/sd-app-structure.provider";
+export { SdAppStructureUtils } from "./core/providers/sd-app-structure.utils";
+export type {
+  TSdAppStructureItem,
+  ISdMenu,
+  ISdFlatMenu,
+  ISdPermission,
+  ISdFlatPermission,
+} from "./core/providers/sd-app-structure.types";
 export { SdFileDialogProvider } from "./core/providers/sd-file-dialog.provider";
 export { SdLocalStorageProvider } from "./core/providers/sd-local-storage.provider";
 export { SdSystemConfigProvider } from "./core/providers/sd-system-config.provider";
@@ -58,7 +60,7 @@ export { useViewTitleSignal } from "./core/utils/useViewTitleSignal";
 export { useViewTypeSignal, type TSdViewType } from "./core/utils/useViewTypeSignal";
 export { setupCanDeactivate } from "./core/utils/setups/setupCanDeactivate";
 export { setupCumulateSelectedKeys } from "./core/utils/setups/setupCumulateSelectedKeys";
-export { setupCloserWhenSingleSelectionChange } from "./core/utils/setups/setupCloserWhenSingleSelectionChange";
+export { setupCloserWhenSingleSelectionChange } from "./features/data-view/setupCloserWhenSingleSelectionChange";
 export {
   useExpandingManager,
   type IExpandItemDef,
@@ -100,6 +102,7 @@ export {
 export { SdSharedDataSelectControl } from "./features/shared-data/sd-shared-data-select.control";
 export { SdSharedDataSelectButtonControl } from "./features/shared-data/sd-shared-data-select-button.control";
 export { SdSharedDataSelectListControl } from "./features/shared-data/sd-shared-data-select-list.control";
+export { matchesSearchText } from "./features/shared-data/matchesSearchText";
 
 // ui/layout
 export { SdDockContainerControl } from "./ui/layout/dock/sd-dock-container.control";
@@ -125,9 +128,9 @@ export { SdAdditionalButtonControl } from "./ui/form/button/sd-additional-button
 export {
   SdModalSelectButtonControl,
   type ISdSelectModal,
-  type ISelectModalOutputResult,
   type TSdSelectModalInfo,
 } from "./ui/form/button/sd-modal-select-button.control";
+export type { ISelectModalOutputResult } from "./core/types/select-modal-output-result";
 
 // ui/form/input
 export { SdTextfieldControl } from "./ui/form/input/sd-textfield.control";
@@ -170,6 +173,9 @@ export { SdTabItemControl } from "./ui/navigation/tab/sd-tab-item.control";
 export { SdTabviewControl } from "./ui/navigation/tab/sd-tabview.control";
 export { SdTabviewItemControl } from "./ui/navigation/tab/sd-tabview-item.control";
 
+// ui/navigation/menu
+export { getMenuRouterLinkOption, getIsMenuSelected } from "./ui/navigation/menu-utils";
+
 // ui/navigation/pagination
 export { SdPaginationControl } from "./ui/navigation/pagination/sd-pagination.control";
 
@@ -223,11 +229,11 @@ export { SdDropdownPopupControl } from "./ui/overlay/dropdown/sd-dropdown-popup.
 export { SdModalControl } from "./ui/overlay/modal/sd-modal.control";
 export {
   SdModalProvider,
-  SdActivatedModalProvider,
   type ISdModal,
   type ISdModalInfo,
   type ISdModalOptions,
 } from "./ui/overlay/modal/sd-modal.provider";
+export { SdActivatedModalProvider } from "./core/providers/sd-activated-modal.provider";
 export { SdPromptModalControl } from "./ui/overlay/modal/sd-prompt-modal.control";
 export { SdConfirmModalControl } from "./ui/overlay/modal/sd-confirm-modal.control";
 
@@ -240,14 +246,14 @@ export {
   type TSdToastTheme,
   type ISdToast,
   type ISdToastInput,
-} from "./ui/overlay/toast/sd-toast.provider";
+} from "./core/providers/sd-toast.provider";
 
 // ui/overlay/busy
 export { SdBusyContainerControl } from "./ui/overlay/busy/sd-busy-container.control";
 export {
   SdBusyProvider,
   type TSdBusyType,
-} from "./ui/overlay/busy/sd-busy.provider";
+} from "./core/providers/sd-busy.provider";
 
 // core/providers (integration)
 export {

package/src/ui/data/sheet/sd-sheet-config.modal.ts

@@ -3,6 +3,7 @@ import {
   Component,
   computed,
   input,
+  linkedSignal,
   output,
   signal,
   ViewEncapsulation,
@@ -28,7 +29,6 @@ interface IConfigItem {
   selector: "sd-sheet-config-modal",
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  standalone: true,
   imports: [SdButtonControl, SdCheckboxControl, NgIcon],
   template: `
     <div class="_sd-sheet-config-modal">
@@ -168,29 +168,25 @@ export class SdSheetConfigModal implements ISdModal<ISdSheetConfig | undefined>
       .sort((a, b) => a.ordering - b.ordering);
   });
 
-  private readonly _editItems = signal<IConfigItem[] | undefined>(undefined);
-
-  _items = computed((): IConfigItem[] => {
-    return this._editItems() ?? this._initialItems();
-  });
+  _items = linkedSignal<IConfigItem[]>(() => this._initialItems());
 
   onFixedToggle(idx: number): void {
     const items = [...this._items()];
     items[idx] = { ...items[idx], fixed: !items[idx].fixed };
-    this._editItems.set(items);
+    this._items.set(items);
   }
 
   onHiddenToggle(idx: number): void {
     const items = [...this._items()];
     items[idx] = { ...items[idx], hidden: !items[idx].hidden };
-    this._editItems.set(items);
+    this._items.set(items);
   }
 
   onWidthChange(idx: number, event: Event): void {
     const inputEl = event.target as HTMLInputElement;
     const items = [...this._items()];
     items[idx] = { ...items[idx], width: inputEl.value };
-    this._editItems.set(items);
+    this._items.set(items);
   }
 
   canMoveUp(idx: number): boolean {
@@ -217,14 +213,14 @@ export class SdSheetConfigModal implements ISdModal<ISdSheetConfig | undefined>
     if (!this.canMoveUp(idx)) return;
     const items = [...this._items()];
     [items[idx - 1], items[idx]] = [items[idx], items[idx - 1]];
-    this._editItems.set(items);
+    this._items.set(items);
   }
 
   onMoveDown(idx: number): void {
     if (!this.canMoveDown(idx)) return;
     const items = [...this._items()];
     [items[idx], items[idx + 1]] = [items[idx + 1], items[idx]];
-    this._editItems.set(items);
+    this._items.set(items);
   }
 
   onOk(): void {