oip-common 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oip-common",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A template for cross-platform web applications based on sakai-ng and primeNG",
   "main": "index.js",
   "scripts": {

package/src/api/http-client.ts

@@ -11,8 +11,8 @@
  */
 
 import { inject, Injectable } from "@angular/core";
-import { LayoutService, SecurityService } from "oip-common";
-
+import { LayoutService, } from "../services/app.layout.service"
+import { SecurityService } from "../services/security.service";
 export type QueryParamsType = Record<string | number, any>;
 export type ResponseFormat = keyof Omit<Body, "body" | "bodyUsed">;
 
@@ -64,7 +64,7 @@ export enum ContentType {
   Text = "text/plain",
 }
 
-@Injectable({ providedIn: "root" })
+@Injectable({providedIn: "root"})
 export class HttpClient<SecurityDataType = unknown> {
   protected securityService = inject(SecurityService);
   protected layoutService = inject(LayoutService);
@@ -202,16 +202,16 @@ export class HttpClient<SecurityDataType = unknown> {
   };
 
   public request = async <T = any, E = any>({
-    body,
-    secure,
-    path,
-    type,
-    query,
-    format,
-    baseUrl,
-    cancelToken,
-    ...params
-  }: FullRequestParams): Promise<T> => {
+                                              body,
+                                              secure,
+                                              path,
+                                              type,
+                                              query,
+                                              format,
+                                              baseUrl,
+                                              cancelToken,
+                                              ...params
+                                            }: FullRequestParams): Promise<T> => {
     const secureParams =
       ((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
         this.securityWorker &&
@@ -229,7 +229,7 @@ export class HttpClient<SecurityDataType = unknown> {
         headers: {
           ...(requestParams.headers || {}),
           ...(type && type !== ContentType.FormData
-            ? { "Content-Type": type }
+            ? {"Content-Type": type}
             : {}),
         },
         signal:
@@ -252,18 +252,18 @@ export class HttpClient<SecurityDataType = unknown> {
       const data = !responseFormat
         ? r
         : await response[responseFormat]()
-            .then((data) => {
-              if (r.ok) {
-                r.data = data;
-              } else {
-                r.error = data;
-              }
-              return r;
-            })
-            .catch((e) => {
-              r.error = e;
-              return r;
-            });
+          .then((data) => {
+            if (r.ok) {
+              r.data = data;
+            } else {
+              r.error = data;
+            }
+            return r;
+          })
+          .catch((e) => {
+            r.error = e;
+            return r;
+          });
 
       if (cancelToken) {
         this.abortControllers.delete(cancelToken);

package/src/components/db-migration/db-migration.component.ts

@@ -1,5 +1,4 @@
 import { Component, inject, OnDestroy, OnInit } from '@angular/core';
-import { BaseModuleComponent, NoSettingsDto, SecurityComponent } from 'oip-common';
 import { TagModule } from 'primeng/tag';
 import { ConfirmationService, SharedModule } from 'primeng/api';
 import { TableModule } from 'primeng/table';
@@ -11,6 +10,9 @@ import { ConfirmDialog } from 'primeng/confirmdialog';
 import { NgIf } from '@angular/common';
 import { Tooltip } from 'primeng/tooltip';
 import { ActivatedRoute } from '@angular/router';
+import { BaseModuleComponent } from "../base-module.component";
+import { NoSettingsDto } from "../../dtos/no-settings.dto";
+import { SecurityComponent } from "../security.component";
 
 export interface MigrationDto {
   name: string;

package/src/components/db-migration.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { BaseModuleComponent, NoSettingsDto, SecurityComponent } from 'oip-common';
 import { TagModule } from 'primeng/tag';
 import { ConfirmationService, SharedModule } from 'primeng/api';
 import { TableModule } from 'primeng/table';
@@ -10,6 +9,9 @@ import { FormsModule } from '@angular/forms';
 import { ConfirmDialog } from 'primeng/confirmdialog';
 import { NgIf } from '@angular/common';
 import { Tooltip } from 'primeng/tooltip';
+import { BaseModuleComponent } from "./base-module.component";
+import { NoSettingsDto } from "../dtos/no-settings.dto";
+import { SecurityComponent } from "./security.component";
 
 export interface MigrationDto {
   name: string;
@@ -39,7 +41,7 @@ export interface ApplyMigrationRequest {
   selector: 'db-migration',
   template: `
     <div *ngIf="isContent" class="card" style="height: 100%">
-      <p-confirmDialog />
+      <p-confirmDialog/>
       <div>
         <h5>Migration manager</h5>
         <div class="flex flex-row gap-2">
@@ -49,14 +51,14 @@ export interface ApplyMigrationRequest {
             severity="secondary"
             tooltipPosition="bottom"
             [outlined]="true"
-            (click)="refreshAction()" />
+            (click)="refreshAction()"/>
           <p-button
             icon="pi pi-filter-slash"
             pTooltip="Clean filter"
             severity="secondary"
             tooltipPosition="bottom"
             [outlined]="true"
-            (click)="dt.clear()" />
+            (click)="dt.clear()"/>
         </div>
         <div>
           <p-table #dt dataKey="name" editMode="row" size="small" [scrollable]="true" [value]="data">
@@ -64,7 +66,7 @@ export interface ApplyMigrationRequest {
               <tr>
                 <th pSortableColumn="name" scope="col">
                   Migration name
-                  <p-columnFilter display="menu" field="name" type="text" />
+                  <p-columnFilter display="menu" field="name" type="text"/>
                 </th>
                 <th scope="col">Applied</th>
                 <th scope="col">Exist</th>
@@ -89,7 +91,7 @@ export interface ApplyMigrationRequest {
                 </td>
                 <td>
                   @if (rowData.exist) {
-                    <p-button icon="pi pi-check" severity="success" [rounded]="true" [text]="true" />
+                    <p-button icon="pi pi-check" severity="success" [rounded]="true" [text]="true"/>
                   }
                 </td>
                 <td>
@@ -116,15 +118,14 @@ export interface ApplyMigrationRequest {
       </div>
     </div>
     @if (isSecurity) {
-      <security [controller]="controller" [id]="id" />
+      <security [controller]="controller" [id]="id"/>
     }
   `,
   providers: [ConfirmationService]
 })
 export class DbMigrationComponent
   extends BaseModuleComponent<NoSettingsDto, NoSettingsDto>
-  implements OnInit, OnDestroy
-{
+  implements OnInit, OnDestroy {
   data: MigrationDto[];
 
   async ngOnInit() {
@@ -148,7 +149,7 @@ export class DbMigrationComponent
   }
 
   async applyMigration(rowData: MigrationDto) {
-    const request = { name: rowData.name } as ApplyMigrationRequest;
+    const request = {name: rowData.name} as ApplyMigrationRequest;
     return this.baseDataService.sendRequest(`api/${this.controller}/apply-migration`, 'POST', request);
   }
 }

package/src/components/menu/menu-item-create-dialog.component.ts

@@ -4,10 +4,10 @@ import { DialogModule } from 'primeng/dialog';
 import { InputTextModule } from 'primeng/inputtext';
 import { SelectModule } from 'primeng/select';
 import { FormsModule } from '@angular/forms';
-import { MenuService } from 'oip-common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { AddModuleInstanceDto, IntKeyValueDto } from '../../api/data-contracts';
 import { Menu } from '../../api/Menu';
+import { MenuService } from "../../services/app.menu.service";
 
 @Component({
   selector: 'menu-item-create-dialog',
@@ -30,14 +30,14 @@ import { Menu } from '../../api/Menu';
             id="oip-menu-item-create-dialog-parent-input"
             pInputText
             readonly
-            [ngModel]="menuService.contextMenuItem?.label" />
+            [ngModel]="menuService.contextMenuItem?.label"/>
         </div>
       }
       <div class="flex items-center gap-4 mb-4">
         <label class="font-semibold w-1/3" for="oip-menu-item-create-label">
           {{ 'menuItemCreateDialogComponent.label' | translate }}
         </label>
-        <input autocomplete="off" class="flex-auto" id="oip-menu-item-create-label" pInputText [(ngModel)]="label" />
+        <input autocomplete="off" class="flex-auto" id="oip-menu-item-create-label" pInputText [(ngModel)]="label"/>
       </div>
       <div class="flex items-center gap-4 mb-4">
         <label class="font-semibold w-1/3" for="oip-menu-item-create-module">
@@ -51,14 +51,14 @@ import { Menu } from '../../api/Menu';
           optionValue="key"
           placeholder="{{ 'menuItemCreateDialogComponent.selectModule' | translate }}"
           [options]="modules"
-          [(ngModel)]="selectModule" />
+          [(ngModel)]="selectModule"/>
       </div>
       <div class="flex items-center gap-4 mb-4">
         <label class="font-semibold w-1/3" for="oip-menu-item-create-dialog-icon">
           {{ 'menuItemCreateDialogComponent.icon' | translate }}
         </label>
         <i class="{{ selectIcon }}"></i>
-        <input class="flex-auto" id="oip-menu-item-create-dialog-icon" pInputText [(ngModel)]="selectIcon" />
+        <input class="flex-auto" id="oip-menu-item-create-dialog-icon" pInputText [(ngModel)]="selectIcon"/>
       </div>
       <div class="flex justify-end gap-2">
         <p-button
@@ -66,12 +66,12 @@ import { Menu } from '../../api/Menu';
           label="{{ 'menuItemCreateDialogComponent.cancel' | translate }}"
           severity="secondary"
           (click)="changeVisible()"
-          (keydown)="changeVisible()" />
+          (keydown)="changeVisible()"/>
         <p-button
           id="oip-menu-item-create-save"
           label="{{ 'menuItemCreateDialogComponent.save' | translate }}"
           (click)="save()"
-          (keydown)="save()" />
+          (keydown)="save()"/>
       </div>
     </p-dialog>
   `

package/src/components/menu/menu-item-edit-dialog.component.ts

@@ -3,7 +3,8 @@ import { ButtonModule } from 'primeng/button';
 import { DialogModule } from 'primeng/dialog';
 import { InputTextModule } from 'primeng/inputtext';
 import { FormsModule } from '@angular/forms';
-import { MenuService, SecurityDataService } from 'oip-common';
+import { MenuService } from '../../services/app.menu.service'
+import { SecurityDataService, } from '../../services/security-data.service'
 import { TranslatePipe } from '@ngx-translate/core';
 import { EditModuleInstanceDto } from '../../dtos/edit-module-instance.dto';
 import { MultiSelectModule } from 'primeng/multiselect';
@@ -27,7 +28,7 @@ import { MultiSelectModule } from 'primeng/multiselect';
           class="flex-auto"
           id="oip-menu-item-edit-dialog-menu-input"
           pInputText
-          [(ngModel)]="item.label" />
+          [(ngModel)]="item.label"/>
       </div>
 
       <div class="flex items-center gap-4 mb-4">
@@ -35,7 +36,7 @@ import { MultiSelectModule } from 'primeng/multiselect';
           {{ 'menuItemEditDialogComponent.icon' | translate }}
         </label>
         <i class="{{ item.icon }}"></i>
-        <input class="flex-auto" id="oip-menu-item-edit-dialog-icon" pInputText [(ngModel)]="item.icon" />
+        <input class="flex-auto" id="oip-menu-item-edit-dialog-icon" pInputText [(ngModel)]="item.icon"/>
       </div>
 
       <div class="flex items-center gap-4 mb-4">
@@ -49,7 +50,7 @@ import { MultiSelectModule } from 'primeng/multiselect';
           placeholder="Select roles"
           [maxSelectedLabels]="10"
           [options]="roles"
-          [(ngModel)]="item.viewRoles" />
+          [(ngModel)]="item.viewRoles"/>
       </div>
 
       <div class="flex justify-end gap-2">
@@ -58,12 +59,12 @@ import { MultiSelectModule } from 'primeng/multiselect';
           label="{{ 'menuItemEditDialogComponent.cancel' | translate }}"
           severity="secondary"
           (click)="changeVisible()"
-          (keydown)="changeVisible()" />
+          (keydown)="changeVisible()"/>
         <p-button
           id="oip-menu-item-edit-dialog-save-edit-button"
           label="{{ 'menuItemEditDialogComponent.save' | translate }}"
           (click)="save()"
-          (keydown)="save()" />
+          (keydown)="save()"/>
       </div>
     </p-dialog>
   `

package/src/components/profile.component.ts

@@ -2,7 +2,8 @@ import { Component, inject } from '@angular/core';
 import { FileUploadModule } from 'primeng/fileupload';
 import { ImageModule } from 'primeng/image';
 import { AvatarModule } from 'primeng/avatar';
-import { MsgService, UserService } from 'oip-common';
+import { MsgService } from "../services/msg.service";
+import { UserService } from "../services/user.service";
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 
 @Component({
@@ -15,7 +16,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
       id="oip-user-profile-photo-avatar"
       shape="circle"
       size="xlarge"
-      [image]="userService.photoLoaded ? userService.photo : null" />
+      [image]="userService.photoLoaded ? userService.photo : null"/>
     <div class="mt-2">
       <p-fileupload
         accept="image/*"
@@ -28,7 +29,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
         url="/api/user-profile/post-user-photo"
         withCredentials="true"
         [auto]="true"
-        (onUpload)="onBasicUploadAuto($event)" />
+        (onUpload)="onBasicUploadAuto($event)"/>
     </div>
   `
 })

package/src/user-api/http-client.ts

@@ -11,7 +11,8 @@
  */
 
 import { inject, Injectable } from '@angular/core';
-import { LayoutService, SecurityService } from 'oip-common';
+import { LayoutService } from '../services/app.layout.service';
+import { SecurityService } from '../services/security.service';
 
 export type QueryParamsType = Record<string | number, any>;
 export type ResponseFormat = keyof Omit<Body, 'body' | 'bodyUsed'>;
@@ -58,7 +59,7 @@ export enum ContentType {
   Text = 'text/plain'
 }
 
-@Injectable({ providedIn: 'root' })
+@Injectable({providedIn: 'root'})
 export class HttpClient<SecurityDataType = unknown> {
   protected securityService = inject(SecurityService);
   public baseUrl: string = '';
@@ -75,6 +76,7 @@ export class HttpClient<SecurityDataType = unknown> {
     const storageData = localStorage.getItem('0-oip-client');
     return JSON.parse(storageData)?.authnResult?.access_token;
   }
+
   private getLanguage(): string {
     // Получаем язык из localStorage или используем значение по умолчанию
     return localStorage.getItem('user-language') || 'en';
@@ -189,16 +191,16 @@ export class HttpClient<SecurityDataType = unknown> {
   };
 
   public request = async <T = any, E = any>({
-    body,
-    secure,
-    path,
-    type,
-    query,
-    format,
-    baseUrl,
-    cancelToken,
-    ...params
-  }: FullRequestParams): Promise<T> => {
+                                              body,
+                                              secure,
+                                              path,
+                                              type,
+                                              query,
+                                              format,
+                                              baseUrl,
+                                              cancelToken,
+                                              ...params
+                                            }: FullRequestParams): Promise<T> => {
     const secureParams =
       ((typeof secure === 'boolean' ? secure : this.baseApiParams.secure) &&
         this.securityWorker &&
@@ -213,7 +215,7 @@ export class HttpClient<SecurityDataType = unknown> {
       ...requestParams,
       headers: {
         ...(requestParams.headers || {}),
-        ...(type && type !== ContentType.FormData ? { 'Content-Type': type } : {})
+        ...(type && type !== ContentType.FormData ? {'Content-Type': type} : {})
       },
       signal: (cancelToken ? this.createAbortSignal(cancelToken) : requestParams.signal) || null,
       body: typeof body === 'undefined' || body === null ? null : payloadFormatter(body)
@@ -227,18 +229,18 @@ export class HttpClient<SecurityDataType = unknown> {
       const data = !responseFormat
         ? r
         : await response[responseFormat]()
-            .then((data) => {
-              if (r.ok) {
-                r.data = data;
-              } else {
-                r.error = data;
-              }
-              return r;
-            })
-            .catch((e) => {
-              r.error = e;
-              return r;
-            });
+          .then((data) => {
+            if (r.ok) {
+              r.data = data;
+            } else {
+              r.error = data;
+            }
+            return r;
+          })
+          .catch((e) => {
+            r.error = e;
+            return r;
+          });
 
       if (cancelToken) {
         this.abortControllers.delete(cancelToken);