tnx-shared 5.0.28 → 5.0.30

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) {