oip-common 0.2.0 → 0.2.2

package/index.d.ts

@@ -190,6 +190,7 @@ interface LanguageDto {
  */
 declare class L10nService {
     private loadedTranslations;
+    private loadingTranslations;
     private httpClient;
     private translateService;
     private readonly primeNg;
@@ -199,12 +200,12 @@ declare class L10nService {
      * Loads translations for a specific component
      * @param component - Name of the component to load translations for
      */
-    loadComponentTranslations(component: string): void;
+    loadComponentTranslations(component: string): Observable<unknown>;
     /**
      * Gets the translated value of a key (or an array of keys)
      * @returns the translated key, or an object of translated keys
      */
-    get(key: string): rxjs.Observable<any>;
+    get(key: string): Observable<any>;
     /**
      * Internal method to load translations from JSON files
      * @param component - Component or translation namespace
@@ -241,6 +242,9 @@ declare class SecurityDataService extends BaseDataService {
     static ɵprov: i0.ɵɵInjectableDeclaration<SecurityDataService>;
 }
 
+type RefreshCustomParams = {
+    [key: string]: string | number | boolean;
+};
 declare abstract class SecurityService {
     abstract auth(): void;
     abstract logout(): void;
@@ -249,7 +253,7 @@ declare abstract class SecurityService {
     abstract isTokenExpired(): Observable<boolean>;
     abstract getCurrentUser(): any;
     abstract getCurrentUser$(): Observable<any>;
-    abstract forceRefreshSession(): Observable<LoginResponse>;
+    abstract forceRefreshSession(customParams?: RefreshCustomParams, configId?: string): Observable<LoginResponse>;
     abstract isAdmin(): boolean;
     abstract authorize(configId?: string, authOptions?: AuthOptions): void;
     abstract payload: BehaviorSubject<any>;
@@ -262,6 +266,12 @@ declare abstract class SecurityService {
  * determining user roles, and performing logout and refresh operations.
  */
 declare class KeycloakSecurityService extends OidcSecurityService implements OnDestroy, SecurityService {
+    private readonly refreshLockKeyPrefix;
+    private readonly refreshResultKeyPrefix;
+    private readonly refreshLockTtlMs;
+    private readonly refreshWaitTimeoutMs;
+    private readonly refreshTabId;
+    private refreshSession$?;
     /**
      * Handles angular OIDC events.
      */
@@ -295,6 +305,7 @@ declare class KeycloakSecurityService extends OidcSecurityService implements OnD
      * @returns A string with the id token.
      */
     getAccessToken(configId?: string): Observable<string>;
+    forceRefreshSession(customParams?: RefreshCustomParams, configId?: string): Observable<LoginResponse>;
     /**
      * Indicates whether the current user has the 'admin' role.
      *
@@ -323,6 +334,23 @@ declare class KeycloakSecurityService extends OidcSecurityService implements OnD
      * @returns {Observable<boolean>} Observable that emits true if the token is expired.
      */
     isTokenExpired(): Observable<boolean>;
+    private runSynchronizedRefresh;
+    private runSynchronizedRefreshWithStorageLock;
+    private refreshAsLockOwner;
+    private syncAuthState;
+    private applyLoginResponse;
+    private isCurrentAccessTokenExpired;
+    private tryAcquireRefreshLock;
+    private releaseRefreshLock;
+    private waitForRefreshResult;
+    private tryResolveRefreshResult;
+    private publishRefreshResult;
+    private readRefreshLock;
+    private readRefreshResult;
+    private getRefreshLockKey;
+    private getRefreshResultKey;
+    private getWebLocks;
+    private createRefreshTabId;
     static ɵfac: i0.ɵɵFactoryDeclaration<KeycloakSecurityService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<KeycloakSecurityService>;
 }
@@ -584,137 +612,58 @@ declare class FooterComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<FooterComponent, "app-footer", never, {}, {}, never, never, true, never>;
 }
 
-/** Data Transfer Object for creating a new module instance */
 interface AddModuleInstanceDto {
-    /**
-     * The identifier of the module to create an instance of
-     * @format int32
-     */
     moduleId?: number;
-    /** The display label for the module instance */
     label?: string | null;
-    /** The icon identifier for the module instance (optional) */
     icon?: string | null;
-    /**
-     * The parent module instance identifier (optional)
-     * @format int32
-     */
     parentId?: number | null;
-    /** Array of role identifiers that can view this module instance (optional) */
     viewRoles?: string[] | null;
 }
-/** Data Transfer Object for editing an existing module instance */
 interface EditModuleInstanceDto {
-    /**
-     * The identifier of the module instance to edit
-     * @format int32
-     */
     moduleInstanceId?: number;
-    /** The updated display label for the module instance */
     label?: string | null;
-    /** The updated icon identifier for the module instance (optional) */
     icon?: string | null;
-    /**
-     * The updated parent module instance identifier (optional)
-     * @format int32
-     */
     parentId?: number | null;
-    /** Updated array of role identifiers that can view this module instance (optional) */
     viewRoles?: string[] | null;
-    /**
-     * For front compatibility
-     * @format int32
-     */
     moduleId?: number | null;
 }
 interface IframeModuleSettings {
     url?: string | null;
 }
-/** Represents a key-value pair where the key is an integer and the value is a string. */
 interface IntKeyValueDto {
-    /** @format int32 */
     key?: number;
     value?: string | null;
 }
-/** It module in app */
 interface ModuleDto {
-    /**
-     * Id
-     * @format int32
-     */
     moduleId?: number;
-    /** Name */
     name?: string | null;
-    /** Settings */
     settings?: string | null;
-    /** Securities */
     moduleSecurities?: ModuleSecurityDto[] | null;
 }
-/** Module Instance Dto */
 interface ModuleInstanceDto {
-    /**
-     * Unique identifier for the module instance.
-     * @format int32
-     */
     moduleInstanceId?: number;
-    /**
-     * Identifier for the module.
-     * @format int32
-     */
     moduleId?: number;
-    /** The label for the module instance. */
     label?: string | null;
-    /** Icon associated with the module instance. see https://primeng.org/icons */
     icon?: string | null;
-    /** Route link. */
     routerLink?: string[] | null;
-    /** URL for the module instance. */
     url?: string | null;
-    /** The target. */
     target?: string | null;
-    /** Configuration settings for the module instance. */
     settings?: string | null;
-    /** Child module instances. */
     items?: ModuleInstanceDto[] | null;
-    /** Securities */
     securities?: string[] | null;
-    /**
-     * Identifier for the parent module instance.
-     * @format int32
-     */
     parentId?: number | null;
-    /**
-     * Sort order position for the module instance.
-     * @format int32
-     */
     order?: number;
-    /** Indicates whether this module instance should be displayed as a separator. */
     separator?: boolean;
 }
-/** Module security DTO */
 interface ModuleSecurityDto {
-    /** Right */
     right: string | null;
-    /** Role */
     role: string | null;
 }
 interface DeleteModuleInstanceParams {
-    /**
-     * The unique identifier of the module instance to delete.
-     * @format int32
-     */
     id?: number;
 }
 interface ChangeOrderParams {
-    /**
-     * The identifier of the first module to swap.
-     * @format int32
-     */
     firstModuleId?: number;
-    /**
-     * The identifier of the second module to swap with.
-     * @format int32
-     */
     secondModuleId?: number;
 }
 
@@ -853,100 +802,33 @@ declare class HttpClient<SecurityDataType = unknown> {
 }
 
 declare class MenuApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
-    /**
-     * @description Retrieves the menu available to the current authenticated user.
-     *
-     * @tags Menu
-     * @name get
-     * @summary Retrieves the menu available to the current authenticated user.
-     * @request GET:/api/menu/get
-     * @secure
-     * @response `200` `(ModuleInstanceDto)[]` OK
-     */
     get: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
-    /**
-     * @description Retrieves the admin-specific menu.
-     *
-     * @tags Menu
-     * @name getAdminMenu
-     * @summary Retrieves the admin-specific menu.
-     * @request GET:/api/menu/get-admin-menu
-     * @secure
-     * @response `200` `(ModuleInstanceDto)[]` OK
-     */
     getAdminMenu: (params?: RequestParams) => Promise<ModuleInstanceDto[]>;
-    /**
-     * @description Retrieves all available modules in the system.
-     *
-     * @tags Menu
-     * @name getModules
-     * @summary Retrieves all available modules in the system.
-     * @request GET:/api/menu/get-modules
-     * @secure
-     * @response `200` `(IntKeyValueDto)[]` OK
-     */
     getModules: (params?: RequestParams) => Promise<IntKeyValueDto[]>;
-    /**
-     * @description Adds a new module instance to the system.
-     *
-     * @tags Menu
-     * @name addModuleInstance
-     * @summary Adds a new module instance to the system.
-     * @request POST:/api/menu/add-module-instance
-     * @secure
-     * @response `200` `void` OK
-     * @response `500` `ApiExceptionResponse` Internal Server Error
-     */
     addModuleInstance: (data: AddModuleInstanceDto, params?: RequestParams) => Promise<void>;
-    /**
-     * @description Edits an existing module instance.
-     *
-     * @tags Menu
-     * @name editModuleInstance
-     * @summary Edits an existing module instance.
-     * @request POST:/api/menu/edit-module-instance
-     * @secure
-     * @response `200` `void` OK
-     * @response `500` `ApiExceptionResponse` Internal Server Error
-     */
     editModuleInstance: (data: EditModuleInstanceDto, params?: RequestParams) => Promise<void>;
-    /**
-     * @description Deletes a module instance by its identifier.
-     *
-     * @tags Menu
-     * @name deleteModuleInstance
-     * @summary Deletes a module instance by its identifier.
-     * @request DELETE:/api/menu/delete-module-instance
-     * @secure
-     * @response `200` `void` OK
-     * @response `500` `ApiExceptionResponse` Internal Server Error
-     */
     deleteModuleInstance: (query: DeleteModuleInstanceParams, params?: RequestParams) => Promise<void>;
-    /**
-     * @description Swaps the order positions of two modules in the menu structure.
-     *
-     * @tags Menu
-     * @name changeOrder
-     * @summary Swaps the order positions of two modules in the menu structure.
-     * @request POST:/api/menu/change-order
-     * @secure
-     * @response `200` `void` OK
-     * @response `500` `ApiExceptionResponse` Internal Server Error
-     */
     changeOrder: (query: ChangeOrderParams, params?: RequestParams) => Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuApi<any>, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuApi<any>>;
 }
 
+type PrimeIconOption$1 = {
+    label: string;
+    value: string;
+};
 declare class MenuItemCreateDialogComponent implements OnInit {
     protected readonly menuService: MenuService;
     protected readonly menu: MenuApi<any>;
+    private readonly msgService;
     visible: boolean;
     visibleChange: EventEmitter<boolean>;
     modules: IntKeyValueDto[];
+    iconOptions: PrimeIconOption$1[];
     selectModule: any;
     label: string;
     selectIcon: string;
+    saving: boolean;
     ngOnInit(): Promise<void>;
     changeVisible(): void;
     save(): Promise<void>;
@@ -956,14 +838,21 @@ declare class MenuItemCreateDialogComponent implements OnInit {
     static ɵcmp: i0.ɵɵComponentDeclaration<MenuItemCreateDialogComponent, "menu-item-create-dialog", never, { "visible": { "alias": "visible"; "required": false; }; }, { "visibleChange": "visibleChange"; }, never, never, true, never>;
 }
 
+type PrimeIconOption = {
+    label: string;
+    value: string;
+};
 declare class MenuItemEditDialogComponent {
     private readonly menuService;
     private readonly securityDataService;
+    private readonly msgService;
     visible: boolean;
     visibleChange: EventEmitter<boolean>;
     modules: any[];
     roles: string[];
+    iconOptions: PrimeIconOption[];
     item: EditModuleInstanceDto;
+    saving: boolean;
     changeVisible(): void;
     save(): Promise<void>;
     hide(): void;
@@ -1050,7 +939,7 @@ declare class ProfileComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<ProfileComponent, "user-profile", never, {}, {}, never, never, true, never>;
 }
 
-interface L10n$1 {
+interface L10n {
     menu: string;
     all: string;
     profile: string;
@@ -1067,7 +956,7 @@ declare class ConfigComponent {
     protected readonly userService: UserService;
     protected readonly securityService: SecurityService;
     protected readonly menuService: MenuService;
-    protected l10n: L10n$1;
+    protected l10n: L10n;
     protected readonly dateFormats: string[];
     protected readonly timeFormats: string[];
     protected readonly allTimeZones: any[];
@@ -1108,39 +997,20 @@ declare class DbMigrationComponent extends BaseModuleComponent<NoSettingsDto, No
     static ɵcmp: i0.ɵɵComponentDeclaration<DbMigrationComponent, "db-migration", never, {}, {}, never, never, true, never>;
 }
 
-interface L10n {
-    confirm: {
-        header: string;
-        message: string;
-        cancel: string;
-        delete: string;
-    };
-    title: string;
-    messages: {
-        deleteSuccess: string;
-    };
-    table: {
-        deleteTooltip: string;
-        currentlyLoaded: string;
-        yes: string;
-        no: string;
-        name: string;
-        moduleId: string;
-    };
-    refreshTooltip: string;
-}
 declare class AppModulesComponent implements OnInit {
     protected dataService: BaseDataService;
     protected modules: ModuleDto[];
     protected msgService: MsgService;
     protected confirmationService: ConfirmationService;
     protected l10nService: L10nService;
-    protected l10n: L10n;
     protected titleService: AppTitleService;
     private moduleService;
+    private translationsReady;
+    constructor();
     ngOnInit(): Promise<void>;
     refreshAction(): Promise<void>;
-    deleteModule(module: ModuleDto): void;
+    deleteModule(module: ModuleDto): Promise<void>;
+    t(key: string): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<AppModulesComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<AppModulesComponent, "app-modules", never, {}, {}, never, never, true, never>;
 }

package/package.json

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

package/scripts/generate-api.mjs

@@ -12,22 +12,23 @@ 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("--disable-jsdoc", { action: "store_true", help: "Disable JSDoc generation" });
 
 let a = parser.parse_args();
 a.data_contract_prefix ??= "";
 
-console.log(a);
 /* NOTE: all fields are optional expect one of `input`, `url`, `spec` */
 
 let config = {
   input: path.resolve(process.cwd(), a.input),
   templates: path.resolve(process.cwd(), a.templates),
-  httpClientType: "fetch", // or "fetch"
+  httpClientType: "fetch",
   defaultResponseAsSuccess: false,
   generateClient: true,
   useCommonClient: a.use_common_client,
   generateRouteTypes: false,
   generateResponses: true,
+  generateJSDoc: !a.disable_jsdoc,
   toJS: false,
   extractRequestParams: true,
   extractRequestBody: true,

package/templates/data-contract-jsdoc.ejs

@@ -2,6 +2,8 @@
 const { data, utils } = it;
 const { formatDescription, escapeJSDocContent, require, _ } = utils;
 
+if (it.config.generateJSDoc === false) return "";
+
 const stringify = (value) => _.isObject(value) ? JSON.stringify(value) : _.isString(value) ? `"${value}"` : value;
 
 const jsDocLines = _.compact([

package/templates/object-field-jsdoc.ejs

@@ -2,6 +2,8 @@
 const { field, utils } = it;
 const { formatDescription, escapeJSDocContent, require, _ } = utils;
 
+if (it.config.generateJSDoc === false) return "";
+
 const comments = _.uniq(
     _.compact([
         field.title && formatDescription(field.title),

package/templates/procedure-call.ejs

@@ -5,7 +5,8 @@ const { _, getInlineParseContent, getParseContent, parseSchema, getComponentByRe
 const { parameters, path, method, payload, query, formData, security, requestParams } = route.request;
 const { type, errorType, contentTypes } = route.response;
 const { HTTP_CLIENT, RESERVED_REQ_PARAMS_ARG_NAMES } = config.constants;
-const routeDocs = includeFile("./route-docs", { config, route, utils });
+const shouldGenerateJSDoc = config.generateJSDoc !== false;
+const routeDocs = shouldGenerateJSDoc ? includeFile("./route-docs", { config, route, utils }) : null;
 const queryName = (query && query.name) || "query";
 const pathParams = _.values(parameters);
 const pathParamsNames = _.map(pathParams, "name");
@@ -82,6 +83,7 @@ const describeReturnType = () => {
 const isValidIdentifier = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
 
 %>
+<% if (shouldGenerateJSDoc) { %>
 /**
 <%~ routeDocs.description %>
 
@@ -90,6 +92,7 @@ const isValidIdentifier = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
 <%~ routeDocs.lines %>
 
  */
+<% } %>
 <% if (isValidIdentifier(route.routeName.usage)) { %><%~ route.routeName.usage %><% } else { %>"<%~ route.routeName.usage %>"<% } %> = (<%~ wrapperArgs %>)<%~ config.toJS ? `: ${describeReturnType()}` : "" %> =>
     <%~ config.singleHttpClient ? 'this.http.request' : 'this.request' %><<%~ type %>, <%~ errorType %>>({
         path: `<%~ path %>`,

package/templates/route-type.ejs

@@ -3,18 +3,21 @@ const { route, utils, config } = it;
 const { _, pascalCase, require } = utils;
 const { query, payload, pathParams, headers } = route.request;
 
-const routeDocs = includeFile("./route-docs", { config, route, utils });
+const shouldGenerateJSDoc = config.generateJSDoc !== false;
+const routeDocs = shouldGenerateJSDoc ? includeFile("./route-docs", { config, route, utils }) : null;
 const isValidIdentifier = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
 const routeNamespace = pascalCase(route.routeName.usage);
 
 %>
 
+<% if (shouldGenerateJSDoc) { %>
 /**
 <%~ routeDocs.description %>
 
 <%~ routeDocs.lines %>
 
 */
+<% } %>
 export namespace <% if (isValidIdentifier(routeNamespace)) { %><%~ routeNamespace %><% } else { %>"<%~ routeNamespace %>"<% } %> {
   export type RequestParams = <%~ (pathParams && pathParams.type) || '{}' %>;
   export type RequestQuery = <%~ (query && query.type) || '{}' %>;