oip-common 0.0.33 → 0.0.37

package/index.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { OnInit, OnDestroy, WritableSignal, Type, Provider, InjectionToken, EventEmitter, Renderer2, PipeTransform } from '@angular/core';
+import { OnInit, OnDestroy, WritableSignal, Type, Provider, InjectionToken, EventEmitter, Renderer2, OnChanges, SimpleChanges, PipeTransform } from '@angular/core';
 import { MessageService, ToastMessageOptions, MenuItem, ConfirmationService, FilterMetadata } from 'primeng/api';
 import { ActivatedRoute, QueryParamsHandling, IsActiveMatchOptions, Params, Router, UrlTree } from '@angular/router';
 import { TranslateService, InterpolationParameters, Translation, TranslationObject } from '@ngx-translate/core';
@@ -43,6 +43,8 @@ declare class MsgService {
     info(detail: any, summary?: any, life?: number): void;
     warn(detail: any, summary?: any, life?: number): void;
     error(detail: any, summary?: any, life?: number): void;
+    extractErrorMessage(error: unknown, fallback: string): string;
+    errorFromException(error: unknown, fallback: string, summary?: string, life?: number): void;
     contrast(detail: any, summary?: any, life?: number): void;
     secondary(detail: any, summary?: any, life?: number): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MsgService, never>;
@@ -1163,6 +1165,241 @@ declare class AppFloatingConfiguratorComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<AppFloatingConfiguratorComponent, "app-floating-configurator", never, {}, {}, never, never, true, never>;
 }
 
+/** Attachment response DTO. */
+interface AttachmentDto {
+    /**
+     * Attachment identifier.
+     * @format int64
+     */
+    attachmentId?: number;
+    /** Original file name. */
+    fileName?: string | null;
+    /** MIME type of the file. */
+    fileType?: string | null;
+    /**
+     * File size in bytes.
+     * @format int64
+     */
+    fileSize?: number;
+    /**
+     * Upload timestamp.
+     * @format date-time
+     */
+    uploadedAt?: Date;
+    /**
+     * File storage identifier.
+     * @format uuid
+     */
+    storageFileId?: string;
+    /** Download URL for the file. */
+    downloadUrl?: string | null;
+}
+/** Comment response DTO. */
+interface CommentDto {
+    /**
+     * Comment identifier.
+     * @format int64
+     */
+    commentId?: number;
+    /**
+     * Related entity type identifier.
+     * @format int64
+     */
+    objectTypeId?: number;
+    /**
+     * Related entity identifier.
+     * @format int64
+     */
+    objectId?: number;
+    /** Raw markdown comment content. */
+    content?: string | null;
+    /**
+     * Author identifier.
+     * @format int64
+     */
+    userId?: number;
+    /** Author display name. */
+    authorDisplayName?: string | null;
+    /** Author e-mail. */
+    authorEmail?: string | null;
+    /**
+     * Comment creation time.
+     * @format date-time
+     */
+    createdAt?: Date;
+    /**
+     * Comment last update time.
+     * @format date-time
+     */
+    updatedAt?: Date | null;
+    /** Whether the comment was edited. */
+    isEdited?: boolean;
+    /**
+     * Number of edit history entries.
+     * @format int32
+     */
+    historyCount?: number;
+    /** Whether the current user can edit this comment. */
+    canEdit?: boolean;
+    /** Whether the current user can delete this comment. */
+    canDelete?: boolean;
+    /** Attachments for the comment. */
+    attachments?: AttachmentDto[] | null;
+    /** Reactions aggregated for the comment. */
+    reactions?: CommentReactionDto[] | null;
+    /** Mentions for the comment. */
+    mentions?: CommentMentionDto[] | null;
+}
+/** Comment edit history response DTO. */
+interface CommentHistoryDto {
+    /**
+     * History entry identifier.
+     * @format int64
+     */
+    commentEditHistoryId?: number;
+    /** Previous comment content. */
+    oldContent?: string | null;
+    /** Updated comment content. */
+    newContent?: string | null;
+    /**
+     * Editor identifier.
+     * @format int64
+     */
+    editedByUserId?: number;
+    /** Editor display name. */
+    editedByDisplayName?: string | null;
+    /**
+     * Time of edit.
+     * @format date-time
+     */
+    editedAt?: Date;
+}
+/** Mention response DTO. */
+interface CommentMentionDto {
+    /**
+     * Mentioned user identifier.
+     * @format int64
+     */
+    mentionedUserId?: number;
+    /** Display name of the mentioned user. */
+    displayName?: string | null;
+    /** E-mail of the mentioned user. */
+    email?: string | null;
+    /**
+     * Position within the markdown text.
+     * @format int32
+     */
+    position?: number;
+}
+/** Aggregated reaction response DTO. */
+interface CommentReactionDto {
+    /** Emoji code. */
+    emojiCode?: string | null;
+    /**
+     * Number of reactions with the same emoji.
+     * @format int32
+     */
+    count?: number;
+    /** Whether the current user reacted with this emoji. */
+    reactedByCurrentUser?: boolean;
+}
+/** Mention candidate response DTO. */
+interface MentionUserDto {
+    /**
+     * User identifier.
+     * @format int64
+     */
+    userId?: number;
+    /** Display name. */
+    displayName?: string | null;
+    /** E-mail. */
+    email?: string | null;
+}
+
+declare function getInitialsFromString(input: string): string;
+
+type HistoryState = {
+    loading: boolean;
+    opened: boolean;
+    items: DiscussionHistoryItem[];
+};
+type DiscussionAttachment = Required<AttachmentDto>;
+type DiscussionReaction = Required<CommentReactionDto>;
+type DiscussionMentionUser = Required<MentionUserDto>;
+type DiscussionComment = Omit<CommentDto, 'attachments' | 'reactions' | 'mentions'> & {
+    commentId: number;
+    content: string;
+    authorDisplayName: string;
+    authorEmail: string;
+    isEdited: boolean;
+    historyCount: number;
+    canEdit: boolean;
+    canDelete: boolean;
+    attachments: DiscussionAttachment[];
+    reactions: DiscussionReaction[];
+};
+type DiscussionHistoryItem = Required<CommentHistoryDto>;
+declare class DiscussionComponent implements OnChanges, OnDestroy, OnInit {
+    private readonly msgService;
+    private readonly discussionApi;
+    private readonly sanitizer;
+    private readonly translateService;
+    private readonly cdr;
+    private readonly confirmationService;
+    protected readonly layoutService: LayoutService;
+    objectTypeId: number;
+    objectId: number;
+    comments: DiscussionComment[];
+    loading: boolean;
+    submitting: boolean;
+    previewMode: boolean;
+    newComment: string;
+    editContent: string;
+    editingCommentId: number | null;
+    pendingFiles: File[];
+    mentionSuggestions: DiscussionMentionUser[];
+    historyByComment: Record<number, HistoryState>;
+    emojiPalette: string[];
+    private mentionSearchTimer;
+    ngOnChanges(changes: SimpleChanges): void;
+    ngOnInit(): Promise<void>;
+    ngOnDestroy(): void;
+    loadComments(): Promise<void>;
+    createComment(): Promise<void>;
+    startEdit(comment: DiscussionComment): void;
+    cancelEdit(): void;
+    saveEdit(comment: DiscussionComment): Promise<void>;
+    deleteComment(comment: DiscussionComment): void;
+    toggleHistory(comment: DiscussionComment): Promise<void>;
+    onFilesSelected(event: Event): void;
+    removePendingFile(file: File): void;
+    onInlineFilesSelected(comment: DiscussionComment, event: Event): Promise<void>;
+    deleteAttachment(comment: DiscussionComment, attachment: DiscussionAttachment): void;
+    private performDeleteComment;
+    private performDeleteAttachment;
+    downloadAttachment(attachment: DiscussionAttachment): Promise<void>;
+    toggleReaction(comment: DiscussionComment, reaction: DiscussionReaction): Promise<void>;
+    reactWithEmoji(comment: DiscussionComment, emojiCode: string, popover?: {
+        hide: () => void;
+    }): Promise<void>;
+    onComposerInput(): void;
+    insertMention(candidate: DiscussionMentionUser): void;
+    renderMarkdown(markdown: string): string;
+    formatBytes(value: number): string;
+    hasUserReaction(comment: DiscussionComment): boolean;
+    getReactions(comment: DiscussionComment): DiscussionReaction[];
+    private applyReactions;
+    private normalizeComment;
+    private normalizeAttachment;
+    private normalizeReaction;
+    private normalizeMentionUser;
+    private normalizeHistoryItem;
+    private extractMentionQuery;
+    protected readonly getInitialsFromString: typeof getInitialsFromString;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DiscussionComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DiscussionComponent, "discussion", never, { "objectTypeId": { "alias": "objectTypeId"; "required": true; }; "objectId": { "alias": "objectId"; "required": true; }; }, {}, never, never, true, never>;
+}
+
 interface SecurityDto {
     code: string;
     name: string;
@@ -1277,5 +1514,5 @@ declare class SecurePipe implements PipeTransform {
  */
 declare const httpLoaderAuthFactory: (httpClient: HttpClient$1) => StsConfigHttpLoader;
 
-export { AppConfiguratorComponent, AppFloatingConfiguratorComponent, AppLayoutComponent, AppModulesComponent, AppTopbar, AuthGuardService, BaseDataService, BaseModuleComponent, ConfigComponent, ContentType, DbMigrationComponent, ErrorComponent, FooterComponent, HttpClient, KeycloakSecurityService, L10nService, LOGO_COMPONENT_TOKEN, LayoutService, LogoComponent, LogoService, MenuComponent, MenuService, MsgService, NotfoundComponent, NotificationService, ProfileComponent, SecurePipe, SecurityComponent, SecurityDataService, SecurityService, SecurityStorageService, SidebarComponent, TableFilterService, TopBarService, UnauthorizedComponent, UserService, httpLoaderAuthFactory, langIntercept, provideLogoComponent };
+export { AppConfiguratorComponent, AppFloatingConfiguratorComponent, AppLayoutComponent, AppModulesComponent, AppTopbar, AuthGuardService, BaseDataService, BaseModuleComponent, ConfigComponent, ContentType, DbMigrationComponent, DiscussionComponent, ErrorComponent, FooterComponent, HttpClient, KeycloakSecurityService, L10nService, LOGO_COMPONENT_TOKEN, LayoutService, LogoComponent, LogoService, MenuComponent, MenuService, MsgService, NotfoundComponent, NotificationService, ProfileComponent, SecurePipe, SecurityComponent, SecurityDataService, SecurityService, SecurityStorageService, SidebarComponent, TableFilterService, TopBarService, UnauthorizedComponent, UserService, httpLoaderAuthFactory, langIntercept, provideLogoComponent };
 export type { AppConfig, LanguageDto, MenuChangeEvent, NoSettingsDto, PutSecurityDto, RequestParams, SecurityDto, TopBarDto };

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "oip-common",
-  "version": "0.0.33",
+  "version": "0.0.37",
   "description": "A template for cross-platform web applications based on sakai-ng and primeNG",
   "main": "index.js",
   "keywords": [
     "oip",
     "template"
   ],
-  "bin": {
-    "oip-generate-api": "./dist/oip-common/scripts/generate-api.mjs"
-  },
   "author": "Igor Tyulyakov aka g101k",
   "license": "MIT",
   "repository": {

package/scripts/generate-api.mjs

@@ -1,19 +1,17 @@
-#!/usr/bin/env node
-
 import fs from "node:fs";
 import path from "node:path";
-import {generateApi, generateTemplates} from "swagger-typescript-api";
-import {ArgumentParser} from 'argparse';
+import { generateApi, generateTemplates } from "swagger-typescript-api";
+import { ArgumentParser } from "argparse";
 
 const parser = new ArgumentParser({
-  description: 'Argparse example'
+  description: "Argparse example"
 });
 
-parser.add_argument('-o', '--output', {help: 'Output path'});
-parser.add_argument('-i', '--input', {help: 'Input swagger file path'});
-parser.add_argument('-t', '--templates', {help: 'Templates'});
-parser.add_argument('-d', '--data-contract-prefix', {help: 'Data Contract Prefix'});
-parser.add_argument('-c', '--use-common-client', {action: 'store_true', help: 'Use common http client'});
+parser.add_argument("-o", "--output", { help: "Output path" });
+parser.add_argument("-i", "--input", { help: "Input swagger file path" });
+parser.add_argument("-t", "--templates", { help: "Templates" });
+parser.add_argument("-d", "--data-contract-prefix", { help: "Data Contract Prefix" });
+parser.add_argument("-c", "--use-common-client", { action: "store_true", help: "Use common http client" });
 
 let a = parser.parse_args();
 a.data_contract_prefix ??= "";
@@ -40,7 +38,7 @@ let config = {
     printWidth: 120,
     tabWidth: 2,
     trailingComma: "all",
-    parser: "typescript",
+    parser: "typescript"
   },
   defaultResponseType: "void",
   singleHttpClient: false,
@@ -60,14 +58,7 @@ let config = {
     requestBodySuffix: ["Payload", "Body", "Input"],
     requestParamsSuffix: ["Params"],
     responseBodySuffix: ["Data", "Result", "Output"],
-    responseErrorSuffix: [
-      "Error",
-      "Fail",
-      "Fails",
-      "ErrorData",
-      "HttpError",
-      "BadResponse",
-    ],
+    responseErrorSuffix: ["Error", "Fail", "Fails", "ErrorData", "HttpError", "BadResponse"]
   },
   /** allow to generate extra files based with this extra templates, see more below */
   extraTemplates: [],
@@ -76,21 +67,18 @@ let config = {
   fixInvalidEnumKeyPrefix: "Value",
   codeGenConstructs: (constructs) => ({
     ...constructs,
-    RecordType: (key, value) => `MyRecord<key, value>`,
+    RecordType: (key, value) => `MyRecord<key, value>`
   }),
   primitiveTypeConstructs: (constructs) => ({
     ...constructs,
     string: {
-      "date-time": "Date",
-    },
+      "date-time": "Date"
+    }
   }),
   hooks: {
-    onCreateComponent: (component) => {
-    },
-    onCreateRequestParams: (rawType) => {
-    },
-    onCreateRoute: (routeData) => {
-    },
+    onCreateComponent: (component) => {},
+    onCreateRequestParams: (rawType) => {},
+    onCreateRoute: (routeData) => {},
     onCreateRouteName: (routeNameInfo, rawRouteInfo) => {
       if (routeNameInfo.usage.startsWith(rawRouteInfo.moduleName)) {
         const str = routeNameInfo.usage.substring(rawRouteInfo.moduleName.length);
@@ -99,40 +87,36 @@ let config = {
       }
       return routeNameInfo;
     },
-    onFormatRouteName: (routeInfo, templateRouteName) => {
-    },
-    onFormatTypeName: (typeName, rawTypeName, schemaType) => {
-    },
-    onInit: (configuration) => {
-    },
-    onPreParseSchema: (originalSchema, typeName, schemaType) => {
-    },
-    onParseSchema: (originalSchema, parsedSchema) => {
-    },
-    onPrepareConfig: (currentConfiguration) => {
-    },
-  },
-}
+    onFormatRouteName: (routeInfo, templateRouteName) => {},
+    onFormatTypeName: (typeName, rawTypeName, schemaType) => {},
+    onInit: (configuration) => {},
+    onPreParseSchema: (originalSchema, typeName, schemaType) => {},
+    onParseSchema: (originalSchema, parsedSchema) => {},
+    onPrepareConfig: (currentConfiguration) => {}
+  }
+};
 const toKebabCase = (str) =>
   str &&
   str
     .match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g)
-    .map(x => x.toLowerCase())
-    .join('-');
+    .map((x) => x.toLowerCase())
+    .join("-");
 
 generateApi(config)
-  .then(async ({files, configuration}) => {
+  .then(async ({ files, configuration }) => {
+    let dir = path.join(process.cwd(), a.output);
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir);
+
     for (const f of files) {
       if (f.fileContent) {
-        if (f.fileName === 'http-client')
+        if (a.use_common_client && f.fileName === "http-client") {
+          console.log("Use common http client from oip, skip generate http-client.ts");
           continue;
-        let dir = path.join(process.cwd(), a.output);
-        if (!fs.existsSync(dir))
-          fs.mkdirSync(dir);
+        }
 
-        if (f.fileName === 'data-contracts') {
+        if (f.fileName === "data-contracts") {
           f.fileName = config.dataContractPrefix + f.fileName;
-        } else if (f.fileName.endsWith('http-client')) {
+        } else if (f.fileName.endsWith("http-client")) {
           // do nothing
         } else {
           f.fileName = `${toKebabCase(f.fileName)}.api`;

package/templates/api.ejs

@@ -1,3 +1,7 @@
+/* eslint-disable */
+/* tslint:disable */
+// @ts-nocheck
+
 <%
 const { utils, route, config, modelTypes } = it;
 const { _, pascalCase, require } = utils;

package/templates/http-client.ejs

@@ -1,3 +1,7 @@
+/* eslint-disable */
+/* tslint:disable */
+// @ts-nocheck
+
 <%
 const { apiConfig, generateResponses, config } = it;
 %>
@@ -54,9 +58,21 @@ export enum ContentType {
 
 @Injectable({ providedIn: 'root' })
 export class HttpClient<SecurityDataType = unknown> {
+    protected securityService = inject(SecurityService);
+    protected layoutService = inject(LayoutService);
     public baseUrl: string = "<%~ apiConfig.baseUrl %>";
     private securityData: SecurityDataType | null = null;
-    private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
+    private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"]  =
+      (securityData) => ({
+        headers: {
+          "Accept-language": this.layoutService.language()
+            ? this.layoutService.language()
+            : 'en',
+          "X-Timezone": this.layoutService.timeZone(),
+          Authorization: `Bearer ${securityData}`,
+        },
+      });
+
     private abortControllers = new Map<CancelToken, AbortController>();
     private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
 
@@ -67,10 +83,11 @@ export class HttpClient<SecurityDataType = unknown> {
         referrerPolicy: 'no-referrer',
     }
 
-    constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
-        Object.assign(this, apiConfig);
+    constructor() {
+      this.securityService.getAccessToken().subscribe((token) => {
+        this.securityData = token;
+      });
     }
-
     public setSecurityData = (data: SecurityDataType | null) => {
         this.securityData = data;
     }
@@ -186,7 +203,7 @@ export class HttpClient<SecurityDataType = unknown> {
         const requestParams = this.mergeRequestParams(params, secureParams);
         const queryString = query && this.toQueryString(query);
         const payloadFormatter = this.contentFormatters[type || ContentType.Json];
-        const responseFormat = format || requestParams.format;
+        let responseFormat = format || requestParams.format;
 
         return this.customFetch(
         `${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`,