Merge pull request #171 from hisptz/develop

Develop

Author: mergify[bot]

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0-alpha.15",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --port 4201 --proxy-config proxy-config.json",
+    "start": "ng serve --port 4202 --proxy-config proxy-config.json",
     "build-lib": "ng build ngx-dhis2-validation-rule-filter",
     "build": "npm run build-lib && ng build --prod --aot",
     "build-lib-dev": "npm run build-lib && cd dist/ngx-dhis2-validation-rule-filter && npm pack && cd ../../ && npm install dist/ngx-dhis2-validation-rule-filter/*.tgz",

projects/ngx-dhis2-validation-rule-filter/src/lib/containers/validation-rule-group/ngx-dhis2-validation-rule-filter.component.css

@@ -130,6 +130,16 @@
   color: #000000;
 }
 
+.no-items-found-error-message {
+  padding: 5px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  cursor: pointer;
+  font-size: 14px;
+  color: #000000;
+}
+
 .validation-rule-group-list > li > a:hover {
   background-color: #dddddd;
 }

projects/ngx-dhis2-validation-rule-filter/src/lib/containers/validation-rule-group/ngx-dhis2-validation-rule-filter.component.html

@@ -96,6 +96,18 @@
             </a>
           </li>
         </ul>
+        <ul
+          class="validation-rule-group-list"
+          *ngIf="
+            (loaded$ | async) && availableValidationRuleGroups.length === 0
+          "
+        >
+          <li class="no-items-found-error-message">
+            <i class="material-icons">
+              warning </i
+            >&nbsp; Oops! no items to select!
+          </li>
+        </ul>
         <pagination-controls
           *ngIf="availableValidationRuleGroups.length >= 4"
           style="bottom: 0; position: relative;"

projects/ngx-dhis2-validation-rule-filter/src/lib/containers/validation-rule-group/ngx-dhis2-validation-rule-filter.component.ts

@@ -13,6 +13,8 @@ import {
 
 import { Fn } from '@iapps/function-analytics';
 import { PeriodTypes } from '../../models/period-types.model';
+import { ValidationRuleGroup } from '../../models/validation-rule-group';
+
 
 @Component({
   selector: 'lib-ngx-dhis2-validation-rule-filter',
@@ -33,7 +35,7 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
   totalAvailableItems = 0;
 
   @Input() dataSelection: Array<string>;
-  @Input() selectedVRGs: Array<string>;
+  @Input() selectedVRGs: Array<ValidationRuleGroup>;
   @Output() update = new EventEmitter();
   @Output() close = new EventEmitter();
 
@@ -47,7 +49,11 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
       .select(getAllValidationRuleGroups)
       .subscribe((state: Array<{ name: string; id: string }>) => {
         state
-          ? (this.availableValidationRuleGroups = state)
+          ? (this.availableValidationRuleGroups = this.getUniqueAvailableValidationRuleGroup(
+              state,
+              this.selectedValidationRuleGroups,
+              this.selectedVRGs
+            ))
           : (this.availableValidationRuleGroups = []);
       });
     this.loaded$ = this.store.select(getValidationRuleGroupsLoaded);
@@ -57,7 +63,11 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
       this.periodTypes = periods;
     });
 
-    this.totalAvailableItems = this.availableValidationRuleGroups.length;
+    this.totalAvailableItems = this.getUniqueAvailableValidationRuleGroup(
+      this.availableValidationRuleGroups,
+      this.selectedValidationRuleGroups,
+      this.selectedVRGs
+    ).length;
 
     if (this.selectedVRGs) {
       this.selectedValidationRuleGroups = _.uniqBy(
@@ -115,12 +125,16 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
       'id'
     );
 
-    this.availableValidationRuleGroups = _.uniqBy(
-      this.popValidationRuleGroup(
-        this.availableValidationRuleGroups,
-        validationRuleGroup
+    this.availableValidationRuleGroups = this.getUniqueAvailableValidationRuleGroup(
+      _.uniqBy(
+        this.popValidationRuleGroup(
+          this.availableValidationRuleGroups,
+          validationRuleGroup
+        ),
+        'id'
       ),
-      'id'
+      this.selectedValidationRuleGroups,
+      this.selectedVRGs
     );
   }
 
@@ -135,12 +149,16 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
       'id'
     );
 
-    this.availableValidationRuleGroups = _.uniqBy(
-      this.pushValidationRuleGroup(
-        this.availableValidationRuleGroups,
-        validationRuleGroup
+    this.availableValidationRuleGroups = this.getUniqueAvailableValidationRuleGroup(
+      _.uniqBy(
+        this.pushValidationRuleGroup(
+          this.availableValidationRuleGroups,
+          validationRuleGroup
+        ),
+        'id'
       ),
-      'id'
+      this.selectedValidationRuleGroups,
+      this.selectedVRGs
     );
   }
 
@@ -233,20 +251,25 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
   onDeselectAllValidationRuleGroup = e => {
     e.stopPropagation();
     if (this.availableValidationRuleGroups.length > 0) {
-      this.availableValidationRuleGroups = _.uniqBy(
-        _.sortBy(
-          [
-            ...this.availableValidationRuleGroups,
-            ...this.selectedValidationRuleGroups,
-          ],
-          ['displayName']
+      this.availableValidationRuleGroups = this.getUniqueAvailableValidationRuleGroup(
+        _.uniqBy(
+          _.sortBy(
+            [
+              ...this.availableValidationRuleGroups,
+              ...this.selectedValidationRuleGroups,
+            ],
+            ['displayName']
+          ),
+          'id'
         ),
-        'id'
+        this.selectedValidationRuleGroups,
+        this.selectedVRGs
       );
     } else {
-      this.availableValidationRuleGroups = _.uniqBy(
+      this.availableValidationRuleGroups = this.getUniqueAvailableValidationRuleGroup(
+        _.uniqBy(this.selectedValidationRuleGroups, 'id'),
         this.selectedValidationRuleGroups,
-        'id'
+        this.selectedVRGs
       );
     }
     this.selectedValidationRuleGroups = [];
@@ -259,4 +282,12 @@ export class NgxDhis2ValidationRuleFilterComponent implements OnInit {
   onSelectedPageChanged = e => {
     e ? (this.currentPageSelected = e) : (this.currentPageSelected = 1);
   }
+
+  getUniqueAvailableValidationRuleGroup = (
+    available: Array<ValidationRuleGroup>,
+    selected: Array<ValidationRuleGroup>,
+    preSelected: Array<ValidationRuleGroup>
+  ) => {
+    return _.differenceBy(available, selected, preSelected, 'name');
+  }
 }

projects/ngx-dhis2-validation-rule-filter/src/lib/helpers/extract-validation-rule-group.helper.ts

@@ -28,7 +28,7 @@ export function getAllValidationRuleGroup(apiResult: APIResult) {
                 periodType: getSanitizePeriodType(periodType),
             };
         } else {
-            return [];
+            return { validationRuleGroup: [] };
         }
     } else if (apiResult.hasOwnProperty('validationRuleGroups')) {
         return {
@@ -44,7 +44,7 @@ export function getAllValidationRuleGroup(apiResult: APIResult) {
             ),
         };
     } else {
-        return [];
+        return { validationRuleGroup: [] };
     }
 }