Added loader to xosTable
diff --git a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/table/table.component.js b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/table/table.component.js
index 04671ba..54f58e9 100644
--- a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/table/table.component.js
+++ b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/table/table.component.js
@@ -338,7 +338,7 @@
config: '='
},
template: `
- <div ng-show="vm.data.length > 0">
+ <div ng-show="vm.data.length > 0 && vm.loader == false">
<div class="row" ng-if="vm.config.filter == 'fulltext'">
<div class="col-xs-12">
<input
@@ -437,15 +437,27 @@
change="vm.goToPage">
</xos-pagination>
</div>
- <div ng-show="vm.data.length == 0 || !vm.data">
+ <div ng-show="(vm.data.length == 0 || !vm.data) && vm.loader == false">
<xos-alert config="{type: 'info'}">
No data to show.
</xos-alert>
</div>
+ <div ng-show="vm.loader == true">
+ <div class="loader"></div>
+ </div>
+ <pre>{{vm.loader | json}}</pre>
`,
bindToController: true,
controllerAs: 'vm',
- controller: function(_){
+ controller: function(_, $scope){
+
+ this.loader = true;
+
+ $scope.$watch(() => this.data, data => {
+ if(angular.isDefined(data)){
+ this.loader = false;
+ }
+ });
if(!this.config){
throw new Error('[xosTable] Please provide a configuration via the "config" attribute');
diff --git a/views/ngXosLib/xosHelpers/src/ui_components/smartComponents/smartTable/smartTable.component.js b/views/ngXosLib/xosHelpers/src/ui_components/smartComponents/smartTable/smartTable.component.js
index 27b1ef6..5334716 100644
--- a/views/ngXosLib/xosHelpers/src/ui_components/smartComponents/smartTable/smartTable.component.js
+++ b/views/ngXosLib/xosHelpers/src/ui_components/smartComponents/smartTable/smartTable.component.js
@@ -54,7 +54,7 @@
return [204];
});
- $httpBackend.whenGET('/test').respond(200, datas)
+ $httpBackend.whenGET('/test').respond(200, [])
$httpBackend.whenPOST('/test').respond((method, url, data) => {
data = angular.fromJson(data);
data.id = ++count;
@@ -218,6 +218,7 @@
.then((res) => {
if(!res[0]){
+ this.data = res;
return;
}