Added tags logic

Author: Gid733

eform-client/src/app/common/models/eforms/index.ts

@@ -4,4 +4,4 @@ export * from './template-tags-update.model';
 export * from './template-list.model';
 export * from './template-request.model';
 export * from './deploy-checkbox.model';
-
+export * from './saved-tag.model';

eform-client/src/app/common/models/eforms/saved-tag.model.ts

@@ -0,0 +1,4 @@
+export class SavedTagModel {
+  tagId: number;
+  tagName: string;
+}

…mon/services/eform/e-form-tag.service.ts …mmon/services/eform/eform-tag.service.tseform-client/src/app/common/services/eform/e-form-tag.service.ts renamed to eform-client/src/app/common/services/eform/eform-tag.service.ts eform-client/src/app/common/services/eform/e-form-tag.service.ts renamed to eform-client/src/app/common/services/eform/eform-tag.service.ts

@@ -6,19 +6,20 @@ import {Observable} from 'rxjs';
 import {
   CommonDictionaryModel,
   OperationDataResult,
-  OperationResult,
+  OperationResult, SavedTagModel,
   TemplateTagsUpdateModel
 } from 'src/app/common/models';
 import {BaseService} from 'src/app/common/services/base.service';
 
 export let TemplateTagMethods = {
   Tags: 'api/tags',
   DeleteTag: 'api/tags/delete',
-  TemplateTags: 'api/tags/template'
+  TemplateTags: 'api/tags/template',
+  SavedTags: 'api/tags/saved'
 };
 
 @Injectable()
-export class EFormTagService extends BaseService {
+export class EformTagService extends BaseService {
   constructor(private _http: HttpClient, router: Router, toastrService: ToastrService) {
     super(_http, router, toastrService);
   }
@@ -27,6 +28,18 @@ export class EFormTagService extends BaseService {
     return this.get(TemplateTagMethods.Tags);
   }
 
+  getSavedTags(): Observable<OperationDataResult<any>> {
+    return this.get(TemplateTagMethods.SavedTags);
+  }
+
+  addSavedTag(model: SavedTagModel): Observable<OperationResult> {
+    return this.put(TemplateTagMethods.SavedTags, model);
+  }
+
+  deleteSavedTag(tagId: number): Observable<OperationResult> {
+    return this.delete(TemplateTagMethods.SavedTags + '?tagId=' + tagId);
+  }
+
   deleteTag(tagId: number): Observable<OperationResult> {
     return this.get(TemplateTagMethods.DeleteTag + '?tagId=' + tagId);
   }

eform-client/src/app/common/services/eform/index.ts

@@ -1,2 +1,2 @@
 export * from './eform.service';
-export * from './e-form-tag.service';
+export * from './eform-tag.service';

eform-client/src/app/modules/eforms/components/eform-edit-tags-modal/eform-edit-tags-modal.component.ts

@@ -2,7 +2,7 @@ import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angula
 import {CommonDictionaryModel} from 'src/app/common/models/common';
 import {TemplateDto} from 'src/app/common/models/dto';
 import {TemplateTagsUpdateModel} from 'src/app/common/models/eforms';
-import {EFormTagService} from 'src/app/common/services/eform';
+import {EformTagService} from 'src/app/common/services/eform';
 
 @Component({
   selector: 'app-eform-edit-tags-modal',
@@ -20,7 +20,7 @@ export class EformEditTagsModalComponent implements OnInit {
   tagForRemoval: number;
   spinnerStatus = false;
 
-  constructor(private eFormTagService: EFormTagService) { }
+  constructor(private eFormTagService: EformTagService) { }
 
   ngOnInit() {
   }

eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html

@@ -26,7 +26,9 @@
         [placeholder]="'Tags' | translate"
         [items]="availableTags"
         [(ngModel)]="templateRequestModel.tagIds"
-        (ngModelChange)="loadAllTemplates();"
+        (add)="saveTag($event)"
+        (remove)="removeSavedTag($event)"
+        [clearable]="false"
         [bindLabel]="'name'"
         [bindValue]="'id'"
         id="tagSelector"

eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {CommonDictionaryModel} from 'src/app/common/models/common';
 import {TemplateDto} from 'src/app/common/models/dto';
-import {TemplateListModel, TemplateRequestModel} from 'src/app/common/models/eforms';
-import {EFormService, EFormTagService} from 'src/app/common/services/eform';
+import {SavedTagModel, TemplateListModel, TemplateRequestModel} from 'src/app/common/models/eforms';
+import {EFormService, EformTagService} from 'src/app/common/services/eform';
 
 @Component({
   selector: 'app-eform-page',
@@ -29,10 +29,9 @@ export class EformsPageComponent implements OnInit {
     'Test1'
   ];
 
-  constructor(private eFormService: EFormService, private eFormTagService: EFormTagService) { }
+  constructor(private eFormService: EFormService, private eFormTagService: EformTagService) { }
 
   ngOnInit() {
-    this.loadAllTemplates();
     this.loadAllTags();
   }
 
@@ -47,11 +46,54 @@ export class EformsPageComponent implements OnInit {
   }
 
   loadAllTags() {
-    this.eFormTagService.getAvailableTags().subscribe((data => {
+    this.spinnerStatus = true;
+    this.eFormTagService.getAvailableTags().subscribe((data) => {
       if (data && data.success) {
         this.availableTags = data.model;
+        this.loadSelectedUserTags();
       }
-    }));
+    }, (error) => {
+      this.spinnerStatus = false;
+    });
+  }
+
+  saveTag(e: any) {
+    const savedTagModel = new SavedTagModel();
+    savedTagModel.tagId = e.id;
+    savedTagModel.tagName = e.name;
+    this.spinnerStatus = true;
+    this.eFormTagService.addSavedTag(savedTagModel).subscribe((data) => {
+      if (data && data.success) {
+        this.templateRequestModel.tagIds.push(e.id);
+        this.loadAllTemplates();
+      }
+    }, (error) => {
+      this.spinnerStatus = false;
+    });
+  }
+
+  removeSavedTag(e: any) {
+    this.spinnerStatus = true;
+    this.eFormTagService.deleteSavedTag(e.value.id).subscribe((data) => {
+      if (data && data.success) {
+        this.templateRequestModel.tagIds = this.templateRequestModel.tagIds.filter(x => x !== e.id);
+        this.loadAllTemplates();
+      }
+    }, (error) => {
+      this.spinnerStatus = false;
+    });
+  }
+
+  loadSelectedUserTags() {
+    this.spinnerStatus = true;
+    this.eFormTagService.getSavedTags().subscribe((data) => {
+      if (data && data.success) {
+        this.templateRequestModel.tagIds = data.model.tagList.map(x => x.tagId);
+        this.loadAllTemplates();
+      }
+    }, (error) => {
+      this.spinnerStatus = false;
+    });
   }
 
   onLabelInputChanged(label: string) {
@@ -84,7 +126,7 @@ export class EformsPageComponent implements OnInit {
   }
 
   downloadItem(itemName: string, templateId: number) {
-    if (itemName == 'XML') {
+    if (itemName === 'XML') {
       window.open('/api/template-files/download-eform-xml/' + templateId, '_blank');
     } else {
       window.open('/api/template-files/csv/' + templateId, '_blank');