tnx-shared 5.0.28 → 5.0.29

package/assets/angular-schema-template.json

@@ -12,7 +12,7 @@
         "depend-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateDepdendServiceToLatest --serviceName tnx-{{serviceName}} --env init",
         "ref-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js copyRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",
         "ref-update-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",
-        "build-ci-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod",
+        "build-ci-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod --base-href /{{projectName}}/",
         "reset-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js reset --reset-flag true",
         "start-quick-template": "node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng serve --project {{projectName}} --configuration={{environmentName}} --port={{port}} --open {{additionalParams}}",
         "update-assets-tnx-shared-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateAssetsTnxshared --env init --isUpdateAssetsTnxshared true",
@@ -46,11 +46,6 @@
                                 "input": "{{sharedDirectory}}/shared-assets",
                                 "output": "./assets"
                             },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/ngx-extended-pdf-viewer/assets/",
-                                "output": "/assets/"
-                            },
                             "projects/{{projectName}}/src/silent-refresh.html"
                         ],
                         "styles": [
@@ -82,9 +77,7 @@
                             "{{sharedDirectory}}/shared-assets/vendor/tinymce/tinymce.min.js",
                             "node_modules/chart.js/dist/Chart.js",
                             "node_modules/jquery.tabbable/jquery.tabbable.min.js",
-                            "node_modules/signalr/jquery.signalR.js",
-                            "../../commonworkspacev5/App/shared/shared-assets/vendor/vgcaservices/vgcaplugin.js",
-                            "../../commonworkspacev5/App/shared/shared-assets/vendor/signatures/interact.min.js"
+                            "node_modules/signalr/jquery.signalR.js"
                         ]
                     },
                     "configurations": {

package/assets/docker/Dockerfile

@@ -3,5 +3,5 @@ FROM euniversitytnapi/tn.clientbase.angular
 RUN rm -rf /usr/share/nginx/html/*
 COPY ./dist/build /usr/share/nginx/html
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+
 CMD ["nginx", "-g", "daemon off;"]

package/assets/gulpfile.js

@@ -802,13 +802,26 @@ function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
     }, function (error, response, body) {
         let versionStr;
         if (body) {
-            const bodyObj = JSON.parse(body).versions;
-            const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
-            versionStr = pkgVersions[pkgVersions.length - 1];
+            const bodyParsed = JSON.parse(body);
+            if (!bodyParsed.error) {
+                const bodyObj = bodyParsed.versions;
+                const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
+                if (pkgVersions.length == 0) {
+                    versionStr = `${angularSchemaObj.clientVersion}.0`;
+                    console.log(`${packageName} duoc phat hanh lan dau, version se la ${versionStr}`);
+                }
+                else {
+                    versionStr = pkgVersions[pkgVersions.length - 1];
+                }
+            }
+            else {
+                versionStr = `${angularSchemaObj.clientVersion}.0`;
+                console.log(`Khong lay duoc thong tin package tren npm, package ${packageName} lay version mac dinh ${versionStr}`);
+            }
         }
         else {
             console.warn('cannot get latest version, get from local instead', body);
-            versionStr = pkgObj.version;
+            versionStr = null;
         }
 
         if (versionStr) {

package/classes/public-function.d.ts

@@ -43,7 +43,7 @@ export declare class PublicFunction {
     static getSignalrConfig(environment: any): import("ng2-signalr").SignalRConfiguration;
     static registerLocaleData(locale?: any, language?: any): void;
     static importRootModule(environment: any): (typeof FormsModule | typeof BrowserModule | import("@angular/core").ModuleWithProviders<TranslateModule>)[];
-    static useRootProvider(enviromment: any): (typeof DecimalPipe | typeof DatePipe | typeof ConfirmationService | typeof MessageService | typeof TranslateService | typeof NotifierService | typeof EntityWorkflowHistoryService | typeof EntityWorkflowSettingService | typeof EntityPermissionService | typeof SafeHtmlPipe | typeof UserFormatPipe | typeof UsersFormatPipe | typeof HtmlFormatPipe | typeof MasterDataPipe | typeof OrganizationFormatPipe | typeof OrganizationsFormatPipe | {
+    static useRootProvider(enviromment: any): (typeof DatePipe | typeof DecimalPipe | typeof ConfirmationService | typeof MessageService | typeof TranslateService | typeof NotifierService | typeof EntityWorkflowHistoryService | typeof EntityWorkflowSettingService | typeof EntityPermissionService | typeof SafeHtmlPipe | typeof UserFormatPipe | typeof UsersFormatPipe | typeof HtmlFormatPipe | typeof MasterDataPipe | typeof OrganizationFormatPipe | typeof OrganizationsFormatPipe | {
         provide: import("@angular/core").InjectionToken<import("@angular/common/http").HttpInterceptor[]>;
         useClass: typeof SendAccessTokenInterceptor;
         multi: boolean;

package/components/crud/crud-form/crud-form.component.d.ts

@@ -115,8 +115,8 @@ export declare class CrudFormComponent extends ComponentBase implements OnInit,
     triggerChange(fieldPath: any): void;
     ngAfterViewInit(): void;
     setIsLoadedDataEdit(value: boolean): void;
-    getControlType(control: any): "custom" | "address" | "button" | "label" | "table" | "template" | "textarea" | "title" | "mask" | "switch" | "text" | "autocomplete" | "dropdown" | "datetime" | "money" | "container" | "autocomplete-picker" | "entity-picker" | "spanControl" | "numberrange" | "phoneOrfax" | "datetimerange" | "editor" | "common-picker" | "user-picker" | "organization-picker" | "cocautochuc-picker" | "cocautochuc" | "checkbox" | "checkboxlist" | "radiobuttonlist" | "fileUpload" | "serviceFileUpload" | "fileManager" | "colorPicker" | "colorControl" | "vanban" | "congviec";
-    getViewModeDataType(control: any): "user" | "address" | "html" | "label" | "table" | "title" | "mask" | "string" | "date" | "boolean" | "datetime" | "money" | "container" | "fileUpload" | "fileManager" | "colorPicker" | "colorControl" | "hasDataSource" | "fileServiceUpload" | "app-key-value";
+    getControlType(control: any): "custom" | "address" | "button" | "label" | "table" | "template" | "textarea" | "title" | "mask" | "switch" | "text" | "datetime" | "money" | "container" | "autocomplete-picker" | "entity-picker" | "spanControl" | "numberrange" | "phoneOrfax" | "datetimerange" | "dropdown" | "editor" | "common-picker" | "user-picker" | "organization-picker" | "cocautochuc-picker" | "cocautochuc" | "autocomplete" | "checkbox" | "checkboxlist" | "radiobuttonlist" | "fileUpload" | "serviceFileUpload" | "fileManager" | "colorPicker" | "colorControl" | "vanban" | "congviec";
+    getViewModeDataType(control: any): "user" | "address" | "html" | "label" | "table" | "title" | "mask" | "string" | "boolean" | "date" | "datetime" | "money" | "container" | "fileUpload" | "fileManager" | "colorPicker" | "colorControl" | "hasDataSource" | "fileServiceUpload" | "app-key-value";
     validateForm(): Promise<boolean>;
     private validateModel;
     validateFormControl(fieldPath: any): Promise<boolean>;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "tnx-shared",
-  "version": "5.0.28",
+  "version": "5.0.29",
   "clientVersion": "5.0",
-  "versionPrev": "5.0.27",
+  "versionPrev": "5.0.28",
   "version5.0": "5.0.11",
   "version5.1": "5.1.13",
   "description": "",

package/assets/docker/docker-entrypoint.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-# Inject environment variables into NGINX configuration
-# List all variables to be substituted to avoid clashing with
-# NGINX own variables: https://serverfault.com/questions/577370
-envsubst \
-    '${BASE_HREF}' \
-    </etc/nginx/nginx.conf.template \
-    >/etc/nginx/nginx.conf
-cat /etc/nginx/nginx.conf
-
-# Set correct HTML base tag, so static resources are fetched
-# from the right path instead of the root path.
-# NOTE: Trailing and leading slashes in base href are important!
-# Using `~` separator to avoid problems with forward slashes
-sed --in-place \
-    's~<base href="/">~<base href="'$BASE_HREF'/"><script type="text/javascript"> window.baseHref = "'$BASE_HREF'";</script>~' \
-    /usr/share/nginx/html/index.html
-
-cat /usr/share/nginx/html/index.html
-exec "$@"