tnx-shared 5.1.238 → 5.1.242

package/assets/gulpfile.js

@@ -206,11 +206,8 @@ task('updateNextVersionService', function (done) {
 });
 
 task('updateDepdendServiceToLatest', function (done) {
-    let serviceName = argv.serviceName;
+    const 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}`);
@@ -403,7 +400,6 @@ function transformTsConfigJson(input) {
 function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
     const listEnvironment = angularSchema.environments;
     const scopeName = angularSchema.scopeName;
-    const clientVersion = angularSchema.clientVersion;
 
     let scriptDependAll = 'npm run depend-tnx-shared';
     Object.keys(angularSchema.projectList).filter(x => angularSchema.projectList[x].projectType == 'library').forEach(project => {
@@ -414,7 +410,7 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
         }
 
         if (prj.projectType == 'library') {
-            if (prj.refType != 'package') {
+            if (prj.refType == 'direct') {
                 // generate package function only for library
                 const nodeMaxOldSpaceSize = angularSchema.nodeMaxOldSpaceSize ? angularSchema.nodeMaxOldSpaceSize : 3072;
                 input.scripts[`build-${project}`] = angularSchemaTemplate.scripts['build-service-template']
@@ -444,15 +440,16 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
             }
             else {
                 input.scripts[`depend-${project}`] = angularSchemaTemplate.scripts[`depend-template`]
-                    .replaceAll('{{serviceName}}', project);
+                    .replaceAll('{{serviceName}}', project)
+                    .replaceAll('tnx-tnx-', 'tnx-');
                 scriptDependAll += ` && npm run depend-${project}`;
             }
         }
     });
 
     // default install latest version tnx-shared
-    input.scripts['depend-tnx-shared'] = angularSchemaTemplate.scripts[`depend-template`]
-        .replaceAll('{{serviceName}}', 'shared');
+    // input.scripts['depend-tnx-shared'] = angularSchemaTemplate.scripts[`depend-template`]
+    //     .replaceAll('{{serviceName}}', 'shared');
     input.scripts['depend-all'] = scriptDependAll;
     input.scripts['prebuild'] = angularSchemaTemplate.scripts[`prebuild-template`];
     input.scripts['update-assets-tnx-shared'] = angularSchemaTemplate.scripts['update-assets-tnx-shared-template'];
@@ -508,7 +505,7 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
 
         input.scripts[`deploy-${project}`] = angularSchemaTemplate.scripts['deploy-template']
             .replaceAll('{{projectName}}', project)
-            .replaceAll('{{clientVersion}}', clientVersion)
+            .replaceAll('{{clientVersion}}', angularSchema.projectList[project].clientVersion)
             .replaceAll('{{scopeName}}', scopeName)
             .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize)
             .replaceAll('{{baseHref}}', baseHref);
@@ -680,10 +677,8 @@ function buildTsConfigPath(paths, project) {
     const prj = getProjectInfo(project);
     const prefix = getRefPrefix();
     const refType = prj.refType ? prj.refType : 'package';
-    if (project == 'tnx-shared') {
-        if (refType != 'package') {
-            paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
-        }
+    if (project == 'tnx-shared' && refType == 'direct') {
+        paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
     }
     else {
         const pathAlias = `${prefix}${project}`;
@@ -794,17 +789,28 @@ function getNextVersion(currentVersion, nextVersionType) {
 }
 
 function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
+    let realPackageName;
+    let packageNameWithoutPrefix;
     if (!packageName.startsWith('tnx-')) {
-        packageName = 'tnx-' + packageName;
+        realPackageName = 'tnx-' + packageName;
+        packageNameWithoutPrefix = packageName;
+    } else {
+        realPackageName = packageName;
+
+        if (packageName !='tnx-shared') {
+            packageNameWithoutPrefix = packageName.replace('tnx-', '');
+        } else {
+            packageNameWithoutPrefix = packageName;
+        }
     }
 
     request({
-        url: `https://registry.npmjs.org/${packageName}`
+        url: `https://registry.npmjs.org/${realPackageName}`
     }, 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));
+            const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.projectList[packageNameWithoutPrefix].clientVersion));
             versionStr = pkgVersions[pkgVersions.length - 1];
         }
         else {

package/bundles/tnx-shared.umd.js

@@ -665,11 +665,20 @@
     var ModuleConfigService = /** @class */ (function () {
         function ModuleConfigService(moduleConfigVal) {
             if (moduleConfigVal === void 0) { moduleConfigVal = null; }
-            this._config = moduleConfigVal() ||
-                {
-                    environment: null,
-                    appCode: null
-                };
+            if (!moduleConfigVal) {
+                // get from session storage
+                var data = sessionStorage.getItem('moduleConfigVal');
+                if (data) {
+                    this._config = JSON.parse(data);
+                }
+                else {
+                    console.error('cannot find moduleConfigVal');
+                }
+            }
+            else {
+                this._config = moduleConfigVal();
+                sessionStorage.setItem('moduleConfigVal', JSON.stringify(this._config));
+            }
         }
         ModuleConfigService.prototype.getConfig = function () {
             return this._config;
@@ -18178,6 +18187,10 @@
             _this._moduleConfig = _moduleConfigService.getConfig();
             return _this;
         }
+        UserGroupRealService.prototype.getGroupIdsByUser = function (userId) {
+            var apiUrl = this.serviceUri + "/GetGroupIdsByUser?userId=" + userId;
+            return this.defaultGet(apiUrl);
+        };
         return UserGroupRealService;
     }(BaseService));
     UserGroupRealService.ɵprov = i0.ɵɵdefineInjectable({ factory: function UserGroupRealService_Factory() { return new UserGroupRealService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: UserGroupRealService, providedIn: "root" });