oip-common 0.0.27 → 0.0.29

package/assets/i18n/ru.json

@@ -43,7 +43,8 @@
     "label": "Имя",
     "icon": "Иконка",
     "cancel": "Отмена",
-    "save": "Сохранить"
+    "save": "Сохранить",
+    "security": "Доступ на чтение"
   },
   "menuItemCreateDialogComponent": {
     "header": "Новый элемент меню",

package/fesm2022/oip-common.mjs

@@ -18,7 +18,7 @@ import { ButtonModule, Button } from 'primeng/button';
 import * as i5 from '@angular/forms';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i2$1 from '@angular/common';
-import { isPlatformBrowser, CommonModule, NgComponentOutlet, NgIf, NgClass, NgFor } from '@angular/common';
+import { isPlatformBrowser, CommonModule, NgComponentOutlet, NgClass } from '@angular/common';
 import * as i3$1 from 'primeng/styleclass';
 import { StyleClassModule } from 'primeng/styleclass';
 import { updatePreset, updateSurfacePalette, $t } from '@primeng/themes';
@@ -2179,6 +2179,21 @@ class Menu extends HttpClient {
             secure: true,
             ...params,
         });
+        /**
+         * @description Swaps the order positions of two modules in the menu structure.
+         *
+         * @tags Menu
+         * @name menuChangeOrder
+         * @request POST:/api/menu/change-order
+         * @secure
+         */
+        this.menuChangeOrder = (query, params = {}) => this.request({
+            path: `/api/menu/change-order`,
+            method: "POST",
+            query: query,
+            secure: true,
+            ...params,
+        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: Menu, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: Menu }); }
@@ -2342,6 +2357,27 @@ class MenuItemComponent {
                 label: this.localization.delete,
                 icon: PrimeIcons.TRASH,
                 command: (event) => this.deleteItem(event)
+            },
+            { separator: true, visible: this.hasVisibleNext(item) || this.hasVisiblePrev(item) },
+            {
+                label: 'Up',
+                icon: PrimeIcons.ANGLE_UP,
+                command: (event) => {
+                    this.moveUp(item);
+                    $event.stopPropagation();
+                    $event.preventDefault();
+                },
+                visible: this.hasVisiblePrev(item)
+            },
+            {
+                label: 'Down',
+                icon: PrimeIcons.ANGLE_DOWN,
+                command: (event) => {
+                    this.moveDown(item);
+                    $event.stopPropagation();
+                    $event.preventDefault();
+                },
+                visible: this.hasVisibleNext(item)
             }
         ];
         this.contextMenu.show($event);
@@ -2372,76 +2408,147 @@ class MenuItemComponent {
     editClick(event) {
         this.menuItemEditDialogComponent.showDialog().then();
     }
+    moveUp(currentItem) {
+        const items = this.getItems(currentItem);
+        const currentIndex = items.findIndex((item) => item.moduleInstanceId === currentItem.moduleInstanceId);
+        if (currentIndex > 0) {
+            const prevVisibleItem = this.findPrevVisibleItem(items, currentIndex);
+            if (prevVisibleItem !== null) {
+                this.swapItems(items[currentIndex], items[prevVisibleItem]);
+            }
+        }
+    }
+    moveDown(currentItem) {
+        const items = this.getItems(currentItem);
+        const currentIndex = items.findIndex((item) => item.moduleInstanceId === currentItem.moduleInstanceId);
+        if (currentIndex < items.length - 1) {
+            const nextVisibleIndex = this.findNextVisibleIndex(items, currentIndex);
+            if (nextVisibleIndex !== -1) {
+                this.swapItems(items[currentIndex], items[nextVisibleIndex]);
+            }
+        }
+    }
+    findPrevVisibleItem(items, currentIndex) {
+        for (let i = currentIndex - 1; i >= 0; i--) {
+            if (items[i].visible !== false) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    findNextVisibleIndex(items, currentIndex) {
+        for (let i = currentIndex + 1; i < items.length; i++) {
+            if (items[i].visible !== false) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    swapItems(firstModule, secondModule) {
+        const items = this.getItems(firstModule);
+        const firstIndex = items.findIndex((item) => item.moduleInstanceId === firstModule.moduleInstanceId);
+        const secondIndex = items.findIndex((item) => item.moduleInstanceId === secondModule.moduleInstanceId);
+        [items[firstIndex], items[secondIndex]] = [items[secondIndex], items[firstIndex]];
+        this.menuDataService.menuChangeOrder({
+            firstModuleId: firstModule.moduleInstanceId,
+            secondModuleId: secondModule.moduleInstanceId
+        }).then();
+    }
+    hasVisiblePrev(currentItem) {
+        const items = this.getItems(currentItem);
+        const currentIndex = items.findIndex((item) => item.moduleInstanceId == currentItem.moduleInstanceId);
+        return currentIndex > 0;
+    }
+    getItems(currentItem) {
+        return !currentItem.parentId
+            ? this.menuService.menu
+            : this.menuService.menu.find((m) => m.moduleInstanceId == currentItem.parentId).items;
+    }
+    hasVisibleNext(currentItem) {
+        const items = this.getItems(currentItem);
+        const currentIndex = items.findIndex((item) => item.moduleInstanceId == currentItem.moduleInstanceId);
+        return currentIndex < items.length - 1;
+    }
+    swapModulesInBackend(firstModuleId, secondModuleId) {
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MenuItemComponent, deps: [{ token: i0.ChangeDetectorRef }, { token: i1$2.Router }, { token: MenuService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: MenuItemComponent, isStandalone: true, selector: "[app-menuitem]", inputs: { item: "item", index: "index", root: "root", parentKey: "parentKey", menuItemCreateDialogComponent: "menuItemCreateDialogComponent", menuItemEditDialogComponent: "menuItemEditDialogComponent", contextMenu: "contextMenu" }, host: { properties: { "class.layout-root-menuitem": "this.root", "class.active-menuitem": "this.activeClass" } }, providers: [ConfirmationService], ngImport: i0, template: `
-    <ng-container>
-      <p-confirm-dialog />
-      <div
-        *ngIf="root && item.visible !== false"
-        class="layout-menuitem-root-text"
-        (contextmenu)="onContextMenu($event, item)">
-        {{ item.label }}
-      </div>
-      <a
-        *ngIf="(!item.routerLink || item.items) && item.visible !== false"
-        pRipple
-        tabindex="0"
-        [attr.href]="item.url"
-        [attr.target]="item.target"
-        [ngClass]="item.class"
-        (click)="itemClick($event)">
-        <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
-        <span class="layout-menuitem-text">{{ item.label }}</span>
-        <i *ngIf="item.items" class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
-      </a>
-      <a
-        *ngIf="item.routerLink && !item.items && item.visible !== false"
-        pRipple
-        routerLinkActive="active-route"
-        tabindex="0"
-        [attr.target]="item.target"
-        [fragment]="item.fragment"
-        [ngClass]="item.class"
-        [preserveFragment]="item.preserveFragment"
-        [queryParams]="item.queryParams"
-        [queryParamsHandling]="item.queryParamsHandling"
-        [replaceUrl]="item.replaceUrl"
-        [routerLink]="item.routerLink"
-        [routerLinkActiveOptions]="
-          item.routerLinkActiveOptions || {
-            paths: 'exact',
-            queryParams: 'ignored',
-            matrixParams: 'ignored',
-            fragment: 'ignored'
-          }
-        "
-        [skipLocationChange]="item.skipLocationChange"
-        [state]="item.state"
-        (click)="itemClick($event)"
-        (contextmenu)="onContextMenu($event, item)">
-        <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
-        <span class="layout-menuitem-text">{{ item.label }}</span>
-        <i *ngIf="item.items" class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
-      </a>
-
-      <ul
-        *ngIf="item.items && item.visible !== false"
-        [@children]="submenuAnimation"
-        (contextmenu)="onContextMenu($event, item)">
-        <ng-template let-child let-i="index" ngFor [ngForOf]="item.items">
-          <li
-            app-menuitem
-            [class]="child.badgeClass"
-            [contextMenu]="contextMenu"
-            [index]="i"
-            [item]="child"
-            [menuItemCreateDialogComponent]="menuItemCreateDialogComponent"
-            [menuItemEditDialogComponent]="menuItemEditDialogComponent"
-            [parentKey]="key"></li>
-        </ng-template>
-      </ul>
-    </ng-container>
-  `, isInline: true, dependencies: [{ kind: "component", type: MenuItemComponent, selector: "[app-menuitem]", inputs: ["item", "index", "root", "parentKey", "menuItemCreateDialogComponent", "menuItemEditDialogComponent", "contextMenu"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: RippleModule }, { kind: "directive", type: i3$2.Ripple, selector: "[pRipple]" }, { kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: RouterLinkActive, selector: "[routerLinkActive]", inputs: ["routerLinkActiveOptions", "ariaCurrentWhenActive", "routerLinkActive"], outputs: ["isActiveChange"], exportAs: ["routerLinkActive"] }, { kind: "directive", type: RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }, { kind: "directive", type: NgFor, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "ngmodule", type: ContextMenuModule }, { kind: "component", type: ConfirmDialog, selector: "p-confirmDialog, p-confirmdialog, p-confirm-dialog", inputs: ["header", "icon", "message", "style", "styleClass", "maskStyleClass", "acceptIcon", "acceptLabel", "closeAriaLabel", "acceptAriaLabel", "acceptVisible", "rejectIcon", "rejectLabel", "rejectAriaLabel", "rejectVisible", "acceptButtonStyleClass", "rejectButtonStyleClass", "closeOnEscape", "dismissableMask", "blockScroll", "rtl", "closable", "appendTo", "key", "autoZIndex", "baseZIndex", "transitionOptions", "focusTrap", "defaultFocus", "breakpoints", "modal", "visible", "position", "draggable"], outputs: ["onHide"] }], animations: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: MenuItemComponent, isStandalone: true, selector: "[app-menuitem]", inputs: { item: "item", index: "index", root: "root", parentKey: "parentKey", menuItemCreateDialogComponent: "menuItemCreateDialogComponent", menuItemEditDialogComponent: "menuItemEditDialogComponent", contextMenu: "contextMenu" }, host: { properties: { "class.layout-root-menuitem": "this.root", "class.active-menuitem": "this.activeClass" } }, providers: [ConfirmationService], ngImport: i0, template: `
+    <ng-container>
+      <p-confirm-dialog/>
+      @if (root && item.visible !== false) {
+        <div
+          class="layout-menuitem-root-text"
+          (contextmenu)="onContextMenu($event, item)">
+          {{ item.label }}
+        </div>
+      }
+      @if ((!item.routerLink || item.items) && item.visible !== false) {
+        <a
+          pRipple
+          tabindex="0"
+          [attr.href]="item.url"
+          [attr.target]="item.target"
+          [ngClass]="item.class"
+          (click)="itemClick($event)">
+          <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
+          <span class="layout-menuitem-text">{{ item.label }}</span>
+          @if (item.items) {
+            <i class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
+          }
+        </a>
+      }
+      @if (item.routerLink && !item.items && item.visible !== false) {
+        <a
+          pRipple
+          routerLinkActive="active-route"
+          tabindex="0"
+          [attr.target]="item.target"
+          [fragment]="item.fragment"
+          [ngClass]="item.class"
+          [preserveFragment]="item.preserveFragment"
+          [queryParams]="item.queryParams"
+          [queryParamsHandling]="item.queryParamsHandling"
+          [replaceUrl]="item.replaceUrl"
+          [routerLink]="item.routerLink"
+          [routerLinkActiveOptions]="
+                item.routerLinkActiveOptions || {
+                  paths: 'exact',
+                  queryParams: 'ignored',
+                  matrixParams: 'ignored',
+                  fragment: 'ignored'
+                }
+              "
+          [skipLocationChange]="item.skipLocationChange"
+          [state]="item.state"
+          (click)="itemClick($event)"
+          (contextmenu)="onContextMenu($event, item)">
+          <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
+          <span class="layout-menuitem-text">{{ item.label }}</span>
+          @if (item.items) {
+            <i class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
+          }
+        </a>
+      }
+
+      @if (item.items && item.visible !== false) {
+        <ul
+          [@children]="submenuAnimation"
+          (contextmenu)="onContextMenu($event, item)">
+          @for (child of item.items; track child; let i = $index) {
+            <li
+              app-menuitem
+              [class]="child.badgeClass"
+              [contextMenu]="contextMenu"
+              [index]="i"
+              [item]="child"
+              [menuItemCreateDialogComponent]="menuItemCreateDialogComponent"
+              [menuItemEditDialogComponent]="menuItemEditDialogComponent"
+              [parentKey]="key"></li>
+          }
+        </ul>
+      }
+    </ng-container>
+  `, isInline: true, dependencies: [{ kind: "component", type: MenuItemComponent, selector: "[app-menuitem]", inputs: ["item", "index", "root", "parentKey", "menuItemCreateDialogComponent", "menuItemEditDialogComponent", "contextMenu"] }, { kind: "ngmodule", type: RippleModule }, { kind: "directive", type: i3$2.Ripple, selector: "[pRipple]" }, { kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: RouterLinkActive, selector: "[routerLinkActive]", inputs: ["routerLinkActiveOptions", "ariaCurrentWhenActive", "routerLinkActive"], outputs: ["isActiveChange"], exportAs: ["routerLinkActive"] }, { kind: "directive", type: RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }, { kind: "ngmodule", type: ContextMenuModule }, { kind: "component", type: ConfirmDialog, selector: "p-confirmDialog, p-confirmdialog, p-confirm-dialog", inputs: ["header", "icon", "message", "style", "styleClass", "maskStyleClass", "acceptIcon", "acceptLabel", "closeAriaLabel", "acceptAriaLabel", "acceptVisible", "rejectIcon", "rejectLabel", "rejectAriaLabel", "rejectVisible", "acceptButtonStyleClass", "rejectButtonStyleClass", "closeOnEscape", "dismissableMask", "blockScroll", "rtl", "closable", "appendTo", "key", "autoZIndex", "baseZIndex", "transitionOptions", "focusTrap", "defaultFocus", "breakpoints", "modal", "visible", "position", "draggable"], outputs: ["onHide"] }], animations: [
             trigger('children', [
                 state('collapsed', style({
                     height: '0'
@@ -2458,74 +2565,82 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             args: [{
                     // eslint-disable-next-line @angular-eslint/component-selector
                     selector: '[app-menuitem]',
-                    template: `
-    <ng-container>
-      <p-confirm-dialog />
-      <div
-        *ngIf="root && item.visible !== false"
-        class="layout-menuitem-root-text"
-        (contextmenu)="onContextMenu($event, item)">
-        {{ item.label }}
-      </div>
-      <a
-        *ngIf="(!item.routerLink || item.items) && item.visible !== false"
-        pRipple
-        tabindex="0"
-        [attr.href]="item.url"
-        [attr.target]="item.target"
-        [ngClass]="item.class"
-        (click)="itemClick($event)">
-        <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
-        <span class="layout-menuitem-text">{{ item.label }}</span>
-        <i *ngIf="item.items" class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
-      </a>
-      <a
-        *ngIf="item.routerLink && !item.items && item.visible !== false"
-        pRipple
-        routerLinkActive="active-route"
-        tabindex="0"
-        [attr.target]="item.target"
-        [fragment]="item.fragment"
-        [ngClass]="item.class"
-        [preserveFragment]="item.preserveFragment"
-        [queryParams]="item.queryParams"
-        [queryParamsHandling]="item.queryParamsHandling"
-        [replaceUrl]="item.replaceUrl"
-        [routerLink]="item.routerLink"
-        [routerLinkActiveOptions]="
-          item.routerLinkActiveOptions || {
-            paths: 'exact',
-            queryParams: 'ignored',
-            matrixParams: 'ignored',
-            fragment: 'ignored'
-          }
-        "
-        [skipLocationChange]="item.skipLocationChange"
-        [state]="item.state"
-        (click)="itemClick($event)"
-        (contextmenu)="onContextMenu($event, item)">
-        <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
-        <span class="layout-menuitem-text">{{ item.label }}</span>
-        <i *ngIf="item.items" class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
-      </a>
-
-      <ul
-        *ngIf="item.items && item.visible !== false"
-        [@children]="submenuAnimation"
-        (contextmenu)="onContextMenu($event, item)">
-        <ng-template let-child let-i="index" ngFor [ngForOf]="item.items">
-          <li
-            app-menuitem
-            [class]="child.badgeClass"
-            [contextMenu]="contextMenu"
-            [index]="i"
-            [item]="child"
-            [menuItemCreateDialogComponent]="menuItemCreateDialogComponent"
-            [menuItemEditDialogComponent]="menuItemEditDialogComponent"
-            [parentKey]="key"></li>
-        </ng-template>
-      </ul>
-    </ng-container>
+                    template: `
+    <ng-container>
+      <p-confirm-dialog/>
+      @if (root && item.visible !== false) {
+        <div
+          class="layout-menuitem-root-text"
+          (contextmenu)="onContextMenu($event, item)">
+          {{ item.label }}
+        </div>
+      }
+      @if ((!item.routerLink || item.items) && item.visible !== false) {
+        <a
+          pRipple
+          tabindex="0"
+          [attr.href]="item.url"
+          [attr.target]="item.target"
+          [ngClass]="item.class"
+          (click)="itemClick($event)">
+          <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
+          <span class="layout-menuitem-text">{{ item.label }}</span>
+          @if (item.items) {
+            <i class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
+          }
+        </a>
+      }
+      @if (item.routerLink && !item.items && item.visible !== false) {
+        <a
+          pRipple
+          routerLinkActive="active-route"
+          tabindex="0"
+          [attr.target]="item.target"
+          [fragment]="item.fragment"
+          [ngClass]="item.class"
+          [preserveFragment]="item.preserveFragment"
+          [queryParams]="item.queryParams"
+          [queryParamsHandling]="item.queryParamsHandling"
+          [replaceUrl]="item.replaceUrl"
+          [routerLink]="item.routerLink"
+          [routerLinkActiveOptions]="
+                item.routerLinkActiveOptions || {
+                  paths: 'exact',
+                  queryParams: 'ignored',
+                  matrixParams: 'ignored',
+                  fragment: 'ignored'
+                }
+              "
+          [skipLocationChange]="item.skipLocationChange"
+          [state]="item.state"
+          (click)="itemClick($event)"
+          (contextmenu)="onContextMenu($event, item)">
+          <i class="layout-menuitem-icon" [ngClass]="item.icon"></i>
+          <span class="layout-menuitem-text">{{ item.label }}</span>
+          @if (item.items) {
+            <i class="pi pi-fw pi-angle-down layout-submenu-toggler"></i>
+          }
+        </a>
+      }
+
+      @if (item.items && item.visible !== false) {
+        <ul
+          [@children]="submenuAnimation"
+          (contextmenu)="onContextMenu($event, item)">
+          @for (child of item.items; track child; let i = $index) {
+            <li
+              app-menuitem
+              [class]="child.badgeClass"
+              [contextMenu]="contextMenu"
+              [index]="i"
+              [item]="child"
+              [menuItemCreateDialogComponent]="menuItemCreateDialogComponent"
+              [menuItemEditDialogComponent]="menuItemEditDialogComponent"
+              [parentKey]="key"></li>
+          }
+        </ul>
+      }
+    </ng-container>
   `,
                     animations: [
                         trigger('children', [
@@ -2538,7 +2653,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                             transition('collapsed <=> expanded', animate('400ms cubic-bezier(0.86, 0, 0.07, 1)'))
                         ])
                     ],
-                    imports: [NgIf, RippleModule, NgClass, RouterLinkActive, RouterLink, NgFor, ContextMenuModule, ConfirmDialog],
+                    imports: [RippleModule, NgClass, RouterLinkActive, RouterLink, ContextMenuModule, ConfirmDialog],
                     providers: [ConfirmationService]
                 }]
         }], ctorParameters: () => [{ type: i0.ChangeDetectorRef }, { type: i1$2.Router }, { type: MenuService }], propDecorators: { item: [{