tnx-shared 5.1.7 → 5.1.11

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

@@ -205,30 +205,30 @@ task('updateNextVersionService', function (done) {
 });
 
 task('updateDepdendServiceToLatest', function (done) {
-        let serviceName = argv.serviceName;
-        try {
-            if (!serviceName.startsWith('tnx-')) {
-                serviceName = 'tnx-' + serviceName;
-            }
-            getCurrentVersion({}, serviceName, (version) => {
-                if (version) {
-                    console.log(`latest version of service ${serviceName} is ${version.versionString}`);
-                    modifyFile(pathPackageJson, rootProjectPath, (content) => {
-                        const json = JSON.parse(content);
-                        json.dependencies[serviceName] = version.versionString;
-                        return JSON.stringify(json);
-                    });
-                }
-                else {
-                    console.log(`cannot get version or does not existed of service ${serviceName}`);
-                }
-                done();
-            });
+    let serviceName = argv.serviceName;
+    try {
+        if (!serviceName.startsWith('tnx-')) {
+            serviceName = 'tnx-' + serviceName;
         }
-        catch (e) {
-            console.log(`error on update service to latest ${serviceName}`, e);
+        getCurrentVersion({}, serviceName, (version) => {
+            if (version) {
+                console.log(`latest version of service ${serviceName} is ${version.versionString}`);
+                modifyFile(pathPackageJson, rootProjectPath, (content) => {
+                    const json = JSON.parse(content);
+                    json.dependencies[serviceName] = version.versionString;
+                    return JSON.stringify(json);
+                });
+            }
+            else {
+                console.log(`cannot get version or does not existed of service ${serviceName}`);
+            }
             done();
-        }
+        });
+    }
+    catch (e) {
+        console.log(`error on update service to latest ${serviceName}`, e);
+        done();
+    }
 });
 
 function resetPackageJson() {
@@ -756,9 +756,10 @@ function processNextVersion(packageName, type, callback) {
                 getCurrentVersion(obj, packageName, (currentVersion) => {
                     if (currentVersion) {
                         obj.versionPrev = currentVersion.versionString;
-
                         const nextVersion = getNextVersion(currentVersion, type);
+
                         obj.version = nextVersion.versionString;
+                        obj[`version${angularSchemaObj.clientVersion}`] = obj.version;
                         console.log(`version moi cua package ${packageName} se la ${obj.version}`);
 
                         resolve(JSON.stringify(obj));
@@ -790,7 +791,7 @@ function getNextVersion(currentVersion, nextVersionType) {
     return currentVersion;
 }
 
-function getCurrentVersion(pkgObj, packageName, onGetVersion, ) {
+function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
     if (!packageName.startsWith('tnx-')) {
         packageName = 'tnx-' + packageName;
     }
@@ -802,7 +803,7 @@ function getCurrentVersion(pkgObj, packageName, onGetVersion, ) {
         if (body) {
             const bodyObj = JSON.parse(body);
             versionStr = bodyObj[`version${angularSchemaObj.clientVersion}`];
-            if (pkgObj.version) {
+            if (!versionStr && pkgObj.version) {
                 versionStr = `${angularSchemaObj.clientVersion}.0`;
             }
         }