tnx-shared 5.0.24 → 5.0.28

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 --base-href /{{projectName}}/",
+        "build-ci-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod",
         "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,6 +46,11 @@
                                 "input": "{{sharedDirectory}}/shared-assets",
                                 "output": "./assets"
                             },
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/ngx-extended-pdf-viewer/assets/",
+                                "output": "/assets/"
+                            },
                             "projects/{{projectName}}/src/silent-refresh.html"
                         ],
                         "styles": [
@@ -77,7 +82,9 @@
                             "{{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"
+                            "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"
                         ]
                     },
                     "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/docker/docker-entrypoint.sh

@@ -0,0 +1,22 @@
+#!/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 "$@"

package/assets/gulpfile.js

@@ -802,19 +802,13 @@ function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
     }, function (error, response, body) {
         let versionStr;
         if (body) {
-            const bodyParsed = JSON.parse(body);
-            if (!bodyParsed.error) {
-                const bodyObj = bodyParsed.versions;
-                const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
-                versionStr = pkgVersions[pkgVersions.length - 1];
-            }
-            else {
-                versionStr = null;
-            }
+            const bodyObj = JSON.parse(body).versions;
+            const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
+            versionStr = pkgVersions[pkgVersions.length - 1];
         }
         else {
             console.warn('cannot get latest version, get from local instead', body);
-            versionStr = null;
+            versionStr = pkgObj.version;
         }
 
         if (versionStr) {