@kigi/components 1.26.2-alpha → 1.27.1-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kigi/components",
-  "version": "1.26.2-alpha",
+  "version": "1.27.1-alpha",
   "description": "@kigi/components",
   "main": "src/components/index.ts",
   "scripts": {

package/src/components/mbg-address/mbg-address.ts

@@ -42,6 +42,7 @@ class MbgAddressController {
   private GOOGLE_API_KEY = 'AIzaSyB0aH7e6XjWJ-xViji3CuXHBbLuWRALC78'
   private notFoundPremisse
   private capitalize
+  private onSinceUpdate: Function
 
   constructor(
     public $scope,
@@ -50,7 +51,7 @@ class MbgAddressController {
     public $timeout,
     public mbgAddressService: MbgAddressService,
     public $uibModal,
-  ) { }
+  ) {}
 
   $onInit() {
     if (this.capitalize && this.address) {
@@ -59,6 +60,7 @@ class MbgAddressController {
     if (this.capitalize && this.fullAddress) {
       this.fullAddress = this.capitalizeBool(this.fullAddress || '')
     }
+
     this.checkScript()
     this.navigatorData = detect()
     this.navigatorData.currentVersion = Number(
@@ -93,8 +95,8 @@ class MbgAddressController {
             state: this.address.state
               ? this.address.state
               : this.address.uf && this.address.uf.initial
-                ? this.address.uf.initial
-                : '',
+              ? this.address.uf.initial
+              : '',
           }
           if (this.ngModel) {
             this.ngModel.EX = (this.ngModel.country || '').toLowerCase() !== 'brasil'
@@ -221,6 +223,7 @@ class MbgAddressController {
     this.fullAddress = ''
     this.resetAddress()
     this.updateSteps()
+    this.$timeout(() => this.onSinceUpdate())
   }
 
   checkModel() {
@@ -236,10 +239,13 @@ class MbgAddressController {
 
   createFullName() {
     if (this.address.premisse) {
-      this.fullAddress = `${this.address.premisse ? this.address.premisse : this.ngModel.premisse
-        } - ${this.address.neighbourhood ? this.address.neighbourhood : this.ngModel.neighbourhood
-        }, ${this.address.localization ? this.address.localization : this.ngModel.localization} - ${this.ngModel.state
-        }, ${this.ngModel.country}`
+      this.fullAddress = `${
+        this.address.premisse ? this.address.premisse : this.ngModel.premisse
+      } - ${
+        this.address.neighbourhood ? this.address.neighbourhood : this.ngModel.neighbourhood
+      }, ${this.address.localization ? this.address.localization : this.ngModel.localization} - ${
+        this.ngModel.state
+      }, ${this.ngModel.country}`
     }
   }
 
@@ -342,24 +348,28 @@ class MbgAddressController {
 
   async searchAddressByCEP() {
     if (this.address && this.address.zipCode) {
-      const response = await this.mbgAddressService.getCep(this.address.zipCode);
+      const response = await this.mbgAddressService.getCep(this.address.zipCode)
 
       if (response && response.data && response.data.cep) {
-        let street, neighborhood, city, state, ibgeCode = '';
+        let street,
+          neighborhood,
+          city,
+          state,
+          ibgeCode = ''
 
         if (response.key == 'viacep') {
-          street = response.data.logradouro;
-          neighborhood = response.data.bairro;
-          city = response.data.localization;
-          state = response.data.uf;
-          ibgeCode = response.data.ibge;
+          street = response.data.logradouro
+          neighborhood = response.data.bairro
+          city = response.data.localization
+          state = response.data.uf
+          ibgeCode = response.data.ibge
         } else if (response.key == 'brasilApi') {
-          street = response.data.street;
-          neighborhood = response.data.neighborhood;
-          city = response.data.city;
-          state = response.data.state;
+          street = response.data.street
+          neighborhood = response.data.neighborhood
+          city = response.data.city
+          state = response.data.state
           const responseIbge = await this.mbgAddressService.getIbgeCode(response.data.city)
-          ibgeCode = (responseIbge && responseIbge.data) && responseIbge.data.id.toString();
+          ibgeCode = responseIbge && responseIbge.data && responseIbge.data.id.toString()
         }
 
         const uf = getStatesBR().filter((state) => state.initial === response.data.uf)[0]
@@ -369,9 +379,7 @@ class MbgAddressController {
         this.address = {
           zipCode: this.address.zipCode.replace('-', ''),
           neighbourhood: neighborhood ? neighborhood.trim() : 'Centro',
-          localization: city
-            ? city
-            : (response.data.localidade || '').trim(),
+          localization: city ? city : (response.data.localidade || '').trim(),
           premisse: premisse || 'CEP Único',
           number: this.address.number || '',
           information: this.address.information || '',
@@ -587,6 +595,10 @@ class MbgAddressController {
       },
     })
     modal.result.then((response) => {
+      this.$timeout(() => {
+        this.onSinceUpdate()
+      })
+
       if (response) {
         response.zipCode = response.zipCode || ''
         this.address.country = response.country || 'Brasil'
@@ -601,7 +613,7 @@ class MbgAddressController {
   }
 }
 
-MbgAddressController.$inject = [
+MbgAddressController['$inject'] = [
   '$scope',
   '$element',
   '$attrs',
@@ -619,6 +631,7 @@ const mbgAddress = {
     manualLabel: '@?',
     notFoundPremisse: '&?',
     capitalize: '=?',
+    onSinceUpdate: '&?',
   },
   template,
   controller: MbgAddressController,

package/src/components/mbg-list/components/mbg-list-column/mbg-list-column.ts

@@ -14,6 +14,7 @@ export class MbgListColumnController {
   private hidden: boolean
   private columnSort
   private dinamic
+  public markAsLastColumn
 
   constructor(public $scope, public $element, public $attrs, public $timeout, public $transclude) {}
 
@@ -23,6 +24,7 @@ export class MbgListColumnController {
     this.alignRow = this.alignRow || 'left'
     this.sortable = this.sortable !== undefined ? this.sortable : false
     this.dinamic = this.dinamic !== undefined ? this.dinamic : false
+    this.markAsLastColumn = this.markAsLastColumn !== undefined ? this.markAsLastColumn : false
     this.mbgList.registerColumn(this)
     this.generateTemplateColumn()
     this.generateTemplateRow()
@@ -79,7 +81,7 @@ export class MbgListColumnController {
   }
 }
 
-MbgListColumnController.$inject = ['$scope', '$element', '$attrs', '$timeout', '$transclude']
+MbgListColumnController['$inject'] = ['$scope', '$element', '$attrs', '$timeout', '$transclude']
 
 const mbgListColumn = {
   transclude: true,
@@ -96,6 +98,7 @@ const mbgListColumn = {
     hidden: '=?',
     sortable: '=?',
     dinamic: '=?',
+    markAsLastColumn: '=?',
   },
   template: '',
   controller: MbgListColumnController,

package/src/components/mbg-list/mbg-list.ts

@@ -24,8 +24,10 @@ export class MbgListController {
   public columnSort
   public dinamic
   public dinamicColumns
+  public staticColumns: Array<any>
+  public indexToPush
 
-  constructor(public $scope, public $element, public $attrs, public $timeout, public $transclude) { }
+  constructor(public $scope, public $element, public $attrs, public $timeout, public $transclude) {}
 
   $onInit() {
     this.enableOnSelectByRow =
@@ -35,6 +37,8 @@ export class MbgListController {
     this.columns = []
     this.mbgRows = []
     this.selectedMap = {}
+    this.staticColumns = []
+
     this.$scope.$watch(
       '$ctrl.list',
       (list) => {
@@ -42,6 +46,7 @@ export class MbgListController {
         this.rows.forEach((row) => {
           row.$json = row.$json ? row.$json : JSON.stringify(row)
         })
+
         try {
           this.checkAll = this.isAllSelected()
         } catch (e) {
@@ -52,17 +57,34 @@ export class MbgListController {
     )
     this.observeOpenedRows()
     this.observeSelectedValues()
+
     if (this.dinamic) {
       this.$scope.$watch(
         '$ctrl.dinamicColumns',
         () => {
-          const columnsNames = this.dinamicColumns.map((column) => column.name)
-          this.columns = this.columns.filter((c: any) => {
-            if (!c.dinamic) {
-              return true
+          if (this.staticColumns.length == 0) {
+            this.staticColumns = this.columns
+          }
+
+          this.indexToPush = this.columns.findIndex((col) => col.markAsLastColumn)
+
+          let lastColumnItem = this.indexToPush > 0 && this.columns.splice(this.indexToPush, 1)[0]
+
+          if (this.dinamicColumns.length > 0) {
+            const newColumns = this.columns.filter(
+              (c: any) => c.dinamic && this.dinamicColumns.some((item) => item.id == c.name),
+            )
+
+            if (lastColumnItem) {
+              newColumns.push(lastColumnItem)
+            }
+            this.columns = this.staticColumns.concat(newColumns)
+          } else {
+            if (lastColumnItem) {
+              this.staticColumns.push(lastColumnItem)
             }
-            return columnsNames.includes(c.name)
-          })
+            this.columns = this.staticColumns
+          }
         },
         true,
       )
@@ -152,7 +174,14 @@ export class MbgListController {
   }
 
   registerColumn(column: MbgListColumnController) {
-    this.columns.push(column)
+    if (!this.indexToPush || this.indexToPush < 0) return this.columns.push(column)
+
+    this.columns.splice(this.indexToPush, 0, column)
+    this.indexToPush++
+
+    if (column.markAsLastColumn) {
+      this.indexToPush = this.columns.length - 1
+    }
   }
 
   registerRow(row: MbgListRowController) {
@@ -264,7 +293,7 @@ export class MbgListController {
           )
         }) %
           2 ===
-          0
+        0
           ? '#eaeaea'
           : '#F5F5F5',
     }