@zeedhi/teknisa-cli 1.58.0 → 1.60.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-cli",
-  "version": "1.58.0",
+  "version": "1.60.0",
   "description": "Teknisa CLI",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -34,5 +34,5 @@
     "/src",
     "/bin"
   ],
-  "gitHead": "708b51c2be642855478411bf14293b8049bc1b56"
+  "gitHead": "3759059ab3dadb211faea82105972ebc6421c14b"
 }

package/src/util/project/module/cliVersion.json

@@ -1 +1,3 @@
-{}
+{
+    "version": 2
+}

package/src/util/project/module/package.json

@@ -26,6 +26,7 @@
     "@zeedhi/teknisa-components-common": "*",
     "@zeedhi/teknisa-components-vuetify": "*",
     "@zeedhi/tek-lib": "*",
+    "babel-loader": "^8.2.5",
     "eslint": "^7.16.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "2.22.1",

package/src/util/project/module/src/App.vue

@@ -21,14 +21,16 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import { ZdPage } from '@zeedhi/vue';
 import { TekLibAuth } from '@zeedhi/tek-lib';
+import jsonMetadataLocal from './config/jsonMetadataLocal.json';
 
 @Component({
   components: { ZdPage },
 })
 export default class App extends Vue {
   public mainPage = {
+    local: false,
+    type: 'post',
     path: 'notfound',
-    local: true,
   };
 
   private handleMessageEvent(event: any) {
@@ -46,11 +48,34 @@ export default class App extends Vue {
     if (params) {
       const page = typeof params === 'string' ? JSON.parse(params).page : params.page;
       if (page) {
-        this.mainPage.path = `pages/${page}`;
+        const pagePath = `pages/${page}`;
+
+        const isLocal = jsonMetadataLocal.some((element: any) => element === page);
+
+        if (isLocal) {
+          this.setMainPageLocal(pagePath);
+        } else {
+          this.setMainPageBackend(pagePath);
+        }
       }
     }
   }
 
+  public setMainPageLocal(path: string) {
+    this.mainPage.local = true;
+    this.mainPage.type = 'get';
+    this.mainPage.path = path;
+  }
+
+  public setMainPageBackend(page: any) {
+    this.mainPage.local = false;
+    this.mainPage.type = 'post';
+    this.mainPage.path = '';
+    this.mainPage.params = { jsonPath: page };
+    this.mainPage.params.jsonPath = page;
+    this.mainPage.params.routePath = localStorage.getItem('MODULES_ROUTE_PATH');
+  }
+
   public created() {
     window.addEventListener('message', this.handleMessageEvent);
     if (process.env.NODE_ENV === 'production') {

package/src/util/project/module/src/config/jsonMetadataLocal.json

@@ -0,0 +1 @@
+[]

package/src/util/project/product/cliVersion.json

@@ -1 +1,3 @@
-{}
+{
+    "version": 2
+}

package/src/util/project/product/package.json

@@ -26,6 +26,8 @@
     "@zeedhi/teknisa-components-common": "*",
     "@zeedhi/teknisa-components-vuetify": "*",
     "@zeedhi/tek-lib": "*",
+    "@zeedhi/zd-avatar": "*",
+    "babel-loader": "^8.2.5",
     "eslint": "^7.16.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "2.22.1",

package/src/util/project/product/src/App.vue

@@ -97,19 +97,62 @@ export default class App extends Vue {
       ],
       rightSlot: [
         {
-          name: 'username',
-          component: 'ZdText',
-          text: '{{AppController.userName}}',
-        },
-        {
-          name: 'logout-button',
-          component: 'ZdButton',
-          icon: true,
-          iconName: 'mdi-logout',
-          events: {
-            click: () => {
-              TekLibAuth.logoutConfirm();
+          name: 'userInfo',
+          component: 'TekUserInfo',
+          minWidth: '280px',
+          showProfileChange: true,
+          user: '{{AppController.userName}}',
+          userImage: '',
+          aboutImage: '{{AppController.logo}}',
+          avatarProps: {
+            name: 'tekUserInfoAvatarProps',
+            component: 'ZdAvatar',
+            color: 'primary',
+            avatarSlot: [
+              {
+                name: 'tekUserInfoAvatarPropsTextSlot',
+                component: 'ZdText',
+                cssClass: 'white--text',
+                tag: 'h2',
+                text: '{{AppController.nameInitialLetter}}',
+              },
+            ],
+          },
+          topSlot: [
+            {
+              name: 'userInfoTopSlotList',
+              component: 'ZdList',
+              items: [
+                {
+                  name: 'item1',
+                  component: 'ZdListItem',
+                  title: 'Exemplo 1',
+                  prependIcon: 'mdi-account-convert',
+                  cssClass: 'zd-px-2',
+                },
+                {
+                  name: 'item2',
+                  component: 'ZdListItem',
+                  title: 'Exemplo 2',
+                  prependIcon: 'mdi-application-cog',
+                  cssClass: 'zd-px-2',
+                },
+              ],
             },
+            {
+              name: 'userInfoTopSlotDivider',
+              component: 'ZdDivider',
+            },
+            {
+              name: 'tekUserInfoList',
+              component: 'TekUserInfoList',
+              parentName: 'userInfo',
+            },
+          ],
+          bottomSlot: [],
+          events: {
+            onCreated: '{{AppController.userInfoOnCreated}}',
+            onLogoutClick: '{{AppController.userInfoOnLogoutClick}}',
           },
         },
       ],

package/src/util/project/product/src/controllers/AppController.ts

@@ -1,13 +1,23 @@
-import { IEventParam, Metadata, Singleton } from '@zeedhi/core';
 import {
-  Menu,
-  MenuButton,
-  AlertService,
-} from '@zeedhi/common';
+  Http,
+  IEventParam,
+  Metadata,
+  Singleton,
+} from '@zeedhi/core';
+import { Menu, MenuButton, AlertService } from '@zeedhi/common';
 import { TekLibAuth } from '@zeedhi/tek-lib';
+import { TekUserInfo } from '@zeedhi/teknisa-components-common';
 
 @Singleton
 export class AppController {
+  public hasImage: boolean = false;
+
+  get notHasImage(): boolean {
+    return !this.hasImage;
+  }
+
+  public imagePath: string = '';
+
   public microservicePage: boolean = false;
 
   public toggleMenu({ component }: IEventParam<MenuButton>) {
@@ -27,7 +37,17 @@ export class AppController {
   }
 
   get userName() {
-    return localStorage.getItem('LOGIN_USER_NAME');
+    const username = localStorage.getItem('LOGIN_USER_NAME') || '';
+    return this.getFormattedName(username);
+  }
+
+  get nameInitialLetter() {
+    const name = this.userName;
+    return name.slice(0, 1);
+  }
+
+  get logo() {
+    return '/assets/logo.png';
   }
 
   public showMessageExpiredMenu() {
@@ -44,4 +64,54 @@ export class AppController {
   public escAction() {
     AlertService.hide();
   }
+
+  public async userInfoOnCreated() {
+    const userInfoComponent = Metadata.getInstance<TekUserInfo>('userInfo');
+    const currentModule = this.getCurrentModule();
+
+    const { data } = await Http.get('/lib_generalInfo', { params: { currentModule } });
+    userInfoComponent.versionInfo = data.versionInfo;
+
+    if (data.userInfo.IMAGE) {
+      this.hasImage = true;
+      this.imagePath = data.userInfo.IMAGE;
+    } else {
+      this.hasImage = false;
+    }
+  }
+
+  public userInfoOnLogoutClick() {
+    TekLibAuth.logoutConfirm();
+  }
+
+  private getFormattedName(username: string): string {
+    const usernameLowerCase = username.toLowerCase();
+    const name = usernameLowerCase.replace(/(^\w{1})|(\s+\w{1})/g, (letter: string) => letter.toUpperCase());
+    const splitName = name.split(' ');
+    if (splitName.length > 1) {
+      const firstName = splitName.shift();
+      const lastName = splitName.pop();
+      let middleName = '';
+
+      splitName.forEach((item) => {
+        middleName += ` ${item.slice(0, 1)}. `;
+      });
+
+      return `${firstName} ${middleName} ${lastName}`;
+    }
+
+    return name;
+  }
+
+  private getCurrentModule(): string {
+    const { href } = window.location;
+    let currentModule = 'product';
+    if (href.includes('/modules/')) {
+      let auxHref = href.split('modules/');
+      auxHref = auxHref[1].split('/');
+      [currentModule] = auxHref;
+    }
+
+    return currentModule;
+  }
 }

package/src/util/project/product/src/plugins/zeedhi.ts

@@ -3,6 +3,7 @@ import Zeedhi from '@zeedhi/vue';
 import ZeedhiComponents from '@zeedhi/vuetify';
 import TeknisaComponents from '@zeedhi/teknisa-components-vuetify';
 import TekLibComponents from '@zeedhi/tek-lib';
+import { ZdAvatar } from '@zeedhi/zd-avatar';
 import { Icons } from '@zeedhi/common';
 import {
   Messages,
@@ -29,6 +30,8 @@ Vue.use(ZeedhiComponents);
 Vue.use(TeknisaComponents);
 Vue.use(TekLibComponents);
 
+Vue.component('ZdAvatar', ZdAvatar);
+
 vuetify.framework.icons.values = Icons.getIcons() as any;
 
 Messages.add({

package/src/util/project/product/src/router/index.ts

@@ -2,7 +2,6 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import { Config, Http } from '@zeedhi/core';
 import { TekLibLocalStorage } from '@zeedhi/tek-lib';
-import { LoadingService } from '@zeedhi/common';
 import routes from './routes';
 import Store from '../store';
 
@@ -34,13 +33,7 @@ const callLibStartSessionFromModule = async function callLibStartSessionFromModu
 
 router.beforeEach(async (to, from, next) => {
   if (isOpeningNewModule(to, from) && TekLibLocalStorage.getItem('IS_NEXT')) {
-    try {
-      LoadingService.show();
-      await callLibStartSessionFromModule(to);
-      LoadingService.hide();
-    } catch (e) {
-      LoadingService.hide();
-    }
+    await callLibStartSessionFromModule(to);
   }
 
   TekLibLocalStorage.setItem('IS_NEXT', true);

package/src/util/project/product/src/views/Microservice.ts

@@ -34,6 +34,8 @@ export default class Mircroservice extends Vue {
       PRODUCT_LOGO_URL: Config.env.product.logoUrl,
       PRODUCT_BACKGROUND_IMG_PATH: Config.env.loginBackgroundImgUrl,
       MODULES_THEME_COLOR: Config.env.product.modulesThemeColor.replace('#', ''),
+      MODULES_ROUTE_PATH: this.$route.path,
+      IS_NEXT: TekLibLocalStorage.getItem('IS_NEXT') !== false,
     });
 
     if (!this.page) {
@@ -50,5 +52,6 @@ export default class Mircroservice extends Vue {
     localStorage.setItem('PRODUCT_LOGO_URL', Config.env.product.logoUrl);
     localStorage.setItem('PRODUCT_BACKGROUND_IMG_PATH', Config.env.loginBackgroundImgUrl);
     localStorage.setItem('MODULES_THEME_COLOR', Config.env.product.modulesThemeColor);
+    localStorage.setItem('MODULES_ROUTE_PATH', this.$route.path);
   }
 }

package/src/util/project/run.js

@@ -1,12 +1,10 @@
 const editPackageJson = require('./editPackageJson')
 const renameGitIgnore = require('./renameGitIgnore')
-const editCliVersion = require('./editCliVersion')
 
 function run(config) {
   try {
     editPackageJson(config)
     renameGitIgnore(config)
-    editCliVersion(config)
   } catch (e) {
     console.error(e)
     process.exit(1)