From af47aad1fccc10b4be1d1a6178ce4549b049ca22 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Fri, 22 Jul 2022 12:51:17 +0530 Subject: [PATCH 01/10] working on plugin data view Signed-off-by: Mohd. Shariq --- .../config-children.component.css | 1 + .../config-children.component.html | 12 +- .../config-children.component.ts | 14 +- .../plugin-data.service.spec.ts | 16 ++ .../plugin-dev-data/plugin-data.service.ts | 33 ++++ .../plugin-dev-data.component.css | 12 ++ .../plugin-dev-data.component.html | 71 +++++++++ .../plugin-dev-data.component.spec.ts | 25 +++ .../plugin-dev-data.component.ts | 145 ++++++++++++++++++ .../north-task-modal.component.html | 3 +- src/app/shared.module.ts | 3 + 11 files changed, 328 insertions(+), 7 deletions(-) create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts create mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.css b/src/app/components/core/configuration-manager/config-children/config-children.component.css index 785b172a6..7569147bb 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.css +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.css @@ -21,6 +21,7 @@ border-top-right-radius: 0 !important; position: relative; padding: 1rem; + overflow: visible; } .tabs { diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.html b/src/app/components/core/configuration-manager/config-children/config-children.component.html index e6d47b972..01d9e52b1 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.html +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.html @@ -13,10 +13,17 @@
+ +
  • +
    + Developer +
    +
    • -

    +

    @@ -30,5 +37,8 @@

    [categoryConfigurationData]="securityConfiguration" [useChildrenProxy]="useCategoryChildrenProxy" formId="security"> + + +

    diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.ts b/src/app/components/core/configuration-manager/config-children/config-children.component.ts index 7d83e89a7..57646b8b0 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.ts +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.ts @@ -1,6 +1,8 @@ import { Component, Input } from '@angular/core'; import { ConfigurationService } from '../../../../services'; +import { DeveloperFeaturesService } from '../../../../services/developer-features.service'; + @Component({ selector: 'app-config-children', @@ -9,16 +11,18 @@ import { ConfigurationService } from '../../../../services'; }) export class ConfigChildrenComponent { seletedTab = ''; - useCategoryChildrenProxy = 'true' - categoryKey = '' + useCategoryChildrenProxy = 'true'; + categoryKey = ''; advanceConfiguration: any; securityConfiguration: any; - categoryChildren = [] - @Input() category + categoryChildren = []; + @Input() category; + @Input() plugin; constructor( - private configService: ConfigurationService + private configService: ConfigurationService, + public developerFeaturesService: DeveloperFeaturesService, ) { } ngOnInit() { diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts new file mode 100644 index 000000000..5443363de --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PluginDataService } from './plugin-data.service'; + +describe('PluginDataService', () => { + let service: PluginDataService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PluginDataService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts new file mode 100644 index 000000000..f5ae9d6d9 --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts @@ -0,0 +1,33 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { throwError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; + +import { environment } from '../../../../../environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class PluginDataService { + private SERVICE_URL = environment.BASE_URL + 'service'; + constructor(private http: HttpClient) { } + + public getData(serviceName: string, pluginName: string) { + return this.http.get(`${this.SERVICE_URL}/${encodeURIComponent(serviceName)}/plugin/${encodeURIComponent(pluginName)}/data`).pipe( + map(response => response), + catchError(error => throwError(error))); + } + + public importData(serviceName: string, pluginName: string, payload: any) { + return this.http.post(`${this.SERVICE_URL}/${encodeURIComponent(serviceName)}/plugin/${encodeURIComponent(pluginName)}/data`, payload).pipe( + map(response => response), + catchError(error => throwError(error))); + } + + public deleteData(serviceName: string, pluginName: string) { + return this.http.delete(`${this.SERVICE_URL}/${encodeURIComponent(serviceName)}/plugin/${encodeURIComponent(pluginName)}/data`).pipe( + map(response => response), + catchError(error => throwError(error))); + } + +} diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css new file mode 100644 index 000000000..17202862c --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css @@ -0,0 +1,12 @@ +.context-menu { + border: none; +} + +.dropdown-content { + width: 80% !important; +} + +.is-disable{ + pointer-events: none; + opacity: .65; + } diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html new file mode 100644 index 000000000..478c9d9cb --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html @@ -0,0 +1,71 @@ +
    +
    +
    + 
    {{pluginData | json}}
    +
    +
    +
    +
    + + + + + +
    + +
    +
    +
    +
    + + + +
    + {{pluginName}} + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +     diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts new file mode 100644 index 000000000..6f38a784f --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PluginDevDataComponent } from './plugin-dev-data.component'; + +describe('PluginDevDataComponent', () => { + let component: PluginDevDataComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PluginDevDataComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PluginDevDataComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts new file mode 100644 index 000000000..147f98af0 --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts @@ -0,0 +1,145 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { DialogService } from '../../../common/confirmation-dialog/dialog.service'; +import { AlertService, ProgressBarService } from '../../../../services'; +import { PluginDataService } from './plugin-data.service'; + +@Component({ + selector: 'app-plugin-dev-data', + templateUrl: './plugin-dev-data.component.html', + styleUrls: ['./plugin-dev-data.component.css'] +}) +export class PluginDevDataComponent implements OnInit { + @Input() serviceName; + @Input() pluginName; + public pluginData; + public isJsonExtension = true; + public selectedTheme = 'default'; + + constructor( + public pluginDataService: PluginDataService, + private alertService: AlertService, + private dialogService: DialogService, + public ngProgress: ProgressBarService) { } + + ngOnInit(): void { + console.log('serviceName', this.serviceName); + console.log('pluginName', this.pluginName); + this.getData(); + } + + getData() { + /** request started */ + this.ngProgress.start(); + this.pluginDataService.getData(this.serviceName, this.pluginName) + .subscribe( + (res: any) => { + console.log('data', res.data); + this.pluginData = res.data; + /** request completed */ + this.ngProgress.done(); + }, + error => { + /** request completed but error */ + this.ngProgress.done(); + if (error.status === 0) { + console.log('service down ', error); + } else { + this.alertService.error(error.statusText); + } + }); + } + + openModal(id: string) { + this.dialogService.open(id); + } + + closeModal(id: string) { + this.dialogService.close(id); + } + + onPluginDataFileChange(event: any) { + this.pluginData = ''; + if (event.target.files.length !== 0) { + const fileName = event.target.files[0].name; + const ext = fileName.substr(fileName.lastIndexOf('.') + 1); + if (ext !== 'json') { + this.isJsonExtension = false; + return; + } + this.isJsonExtension = true; + if (event.target.files.length > 0) { + const file = event.target.files[0]; + const fileReader = new FileReader(); + fileReader.readAsText(file); + fileReader.onload = () => { + this.pluginData = fileReader.result; + }; + } + } + } + + + exportPluginData(pluginData: any) { + const str = JSON.stringify(pluginData); + const bytes = new TextEncoder().encode(str); + const blob = new Blob([bytes], { + type: "application/json;charset=utf-8" + }); + const url = window.URL.createObjectURL(blob); + // create a custom anchor tag + const a = document.createElement('a'); + a.href = url; + a.download = `${this.serviceName}_${this.pluginName}_data`; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); + } + + importPluginData() { + const payload = { data: JSON.parse(JSON.stringify(this.pluginData)) }; + console.log('plugin data', payload); + /** request started */ + this.ngProgress.start(); + this.pluginDataService.importData(this.serviceName, this.pluginName, payload) + .subscribe( + (data: any) => { + this.pluginData = data.result; + this.alertService.success(data.result); + /** request completed */ + this.ngProgress.done(); + this.closeModal('import-plugin-data-dialog') + }, + error => { + /** request completed but error */ + this.ngProgress.done(); + if (error.status === 0) { + console.log('service down ', error); + } else { + this.alertService.error(error.statusText); + } + }); + } + + deleteData() { + /** request started */ + this.ngProgress.start(); + this.pluginDataService.deleteData(this.serviceName, this.pluginName) + .subscribe( + (data: any) => { + console.log('data', data); + this.alertService.success(data.result); + /** request completed */ + this.ngProgress.done(); + }, + error => { + /** request completed but error */ + this.ngProgress.done(); + if (error.status === 0) { + console.log('service down ', error); + } else { + this.alertService.error(error.statusText); + } + }); + } + +} diff --git a/src/app/components/core/north/north-task-modal/north-task-modal.component.html b/src/app/components/core/north/north-task-modal/north-task-modal.component.html index 0886bd126..cadc74b14 100644 --- a/src/app/components/core/north/north-task-modal/north-task-modal.component.html +++ b/src/app/components/core/north/north-task-modal/north-task-modal.component.html @@ -18,7 +18,8 @@
    - +
    diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index a773a3667..5ae219c18 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -8,6 +8,7 @@ import { ConfirmationDialogComponent } from './components/common/confirmation-di import { RangeSliderComponent } from './components/common/range-slider/range-slider.component'; import { TimeDropdownComponent } from './components/common/time-dropdown/time-dropdown.component'; import { ConfigChildrenComponent } from './components/core/configuration-manager/config-children/config-children.component'; +import { PluginDevDataComponent } from './components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component'; import { ViewConfigItemComponent } from './components/core/configuration-manager/view-config-item/view-config-item.component'; @@ -31,6 +32,7 @@ import { PipesModule } from './pipes/pipes.module'; declarations: [ ViewConfigItemComponent, ConfigChildrenComponent, + PluginDevDataComponent, PluginModalComponent, ViewLogsComponent, TimeDropdownComponent, @@ -40,6 +42,7 @@ import { PipesModule } from './pipes/pipes.module'; exports: [ ViewConfigItemComponent, ConfigChildrenComponent, + PluginDevDataComponent, PluginModalComponent, ViewLogsComponent, TimeDropdownComponent, From e2c7025c83526a407d9410bc9ff9dc62051bb535 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Fri, 22 Jul 2022 18:58:53 +0530 Subject: [PATCH 02/10] added Developer tab for showing plugins persistent data and import, export and delete data options Signed-off-by: Mohd. Shariq --- .../config-children.component.html | 5 +- .../config-children.component.ts | 1 + .../plugin-data.service.spec.ts | 16 --- .../plugin-dev-data.component.html | 71 ---------- .../plugin-dev-data.component.spec.ts | 25 ---- .../plugin-persist-data.component.css} | 6 +- .../plugin-persist-data.component.html | 125 ++++++++++++++++++ .../plugin-persist-data.component.spec.ts | 25 ++++ .../plugin-persist-data.component.ts} | 51 ++++--- .../plugin-persist-data.service.spec.ts | 16 +++ .../plugin-persist-data.service.ts} | 2 +- .../north-task-modal.component.html | 6 +- .../components/core/north/north.component.ts | 8 +- .../south-service-modal.component.html | 3 +- src/app/shared.module.ts | 6 +- 15 files changed, 223 insertions(+), 143 deletions(-) delete mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts delete mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html delete mode 100644 src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts rename src/app/components/core/configuration-manager/{plugin-dev-data/plugin-dev-data.component.css => plugin-persist-data/plugin-persist-data.component.css} (58%) create mode 100644 src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html create mode 100644 src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.spec.ts rename src/app/components/core/configuration-manager/{plugin-dev-data/plugin-dev-data.component.ts => plugin-persist-data/plugin-persist-data.component.ts} (70%) create mode 100644 src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.spec.ts rename src/app/components/core/configuration-manager/{plugin-dev-data/plugin-data.service.ts => plugin-persist-data/plugin-persist-data.service.ts} (96%) diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.html b/src/app/components/core/configuration-manager/config-children/config-children.component.html index 01d9e52b1..2de79b7ff 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.html +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.html @@ -38,7 +38,8 @@
    formId="security"> - - + +

    diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.ts b/src/app/components/core/configuration-manager/config-children/config-children.component.ts index 57646b8b0..e3b98ea54 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.ts +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.ts @@ -19,6 +19,7 @@ export class ConfigChildrenComponent { categoryChildren = []; @Input() category; @Input() plugin; + @Input() serviceStatus = false; constructor( private configService: ConfigurationService, diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts deleted file mode 100644 index 5443363de..000000000 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PluginDataService } from './plugin-data.service'; - -describe('PluginDataService', () => { - let service: PluginDataService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PluginDataService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html deleted file mode 100644 index 478c9d9cb..000000000 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.html +++ /dev/null @@ -1,71 +0,0 @@ -
    -
    -
    - 
    {{pluginData | json}}
    -
    -
    -
    -
    - - - - - -
    - -
    -
    -
    -
    - - - -
    - {{pluginName}} - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -     diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts b/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts deleted file mode 100644 index 6f38a784f..000000000 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PluginDevDataComponent } from './plugin-dev-data.component'; - -describe('PluginDevDataComponent', () => { - let component: PluginDevDataComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ PluginDevDataComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PluginDevDataComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css similarity index 58% rename from src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css rename to src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css index 17202862c..e4c61887c 100644 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.css +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css @@ -3,10 +3,14 @@ } .dropdown-content { - width: 80% !important; + max-width: max-content !important; } .is-disable{ pointer-events: none; opacity: .65; } + + .dropdown { + width: auto !important; + } diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html new file mode 100644 index 000000000..56bda5db9 --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html @@ -0,0 +1,125 @@ +
    +
    +
    +
    +
    + + {{selectedPlugin}} + + + + +
    + +
    +
    +
    +
    +
    + + + + + +
    + +
    +
    +
    +
    +
    +
    + 
    {{pluginData | json}}
    +
    + +
    + {{noPersistDataMessage}} +
    +     +
    +
    +
    + + + +
    + {{pluginName}} + +
    +
    +
    +
    + + {{serviceName}} must be shut down to allow import the plugin data. + + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +     +
    +
    +
    +
    + + +
    +     + + + +
    + Delete {{pluginName}} data + +
    +
    + Are you sure, You want to delete the plugin data? + + {{serviceName}} must be shut down to allow delete the plugin data. + +
    +
    + + +
    +     diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.spec.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.spec.ts new file mode 100644 index 000000000..9498c8a0d --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PluginPersistDataComponent } from './plugin-persist-data.component'; + +describe('PluginPersistDataComponent', () => { + let component: PluginPersistDataComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PluginPersistDataComponent] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PluginPersistDataComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts similarity index 70% rename from src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts rename to src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index 147f98af0..5c98257f3 100644 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -1,39 +1,48 @@ import { Component, Input, OnInit } from '@angular/core'; import { DialogService } from '../../../common/confirmation-dialog/dialog.service'; import { AlertService, ProgressBarService } from '../../../../services'; -import { PluginDataService } from './plugin-data.service'; +import { PluginPersistDataService } from './plugin-persist-data.service'; @Component({ - selector: 'app-plugin-dev-data', - templateUrl: './plugin-dev-data.component.html', - styleUrls: ['./plugin-dev-data.component.css'] + selector: 'app-plugin-persist-data', + templateUrl: './plugin-persist-data.component.html', + styleUrls: ['./plugin-persist-data.component.css'] }) -export class PluginDevDataComponent implements OnInit { +export class PluginPersistDataComponent implements OnInit { @Input() serviceName; @Input() pluginName; - public pluginData; + @Input() serviceStaus = false; + public pluginData = ''; public isJsonExtension = true; - public selectedTheme = 'default'; + // TODO: FOGL-6693 + public plugins = [] // add plugins for testing + public selectedPlugin = ''; + noPersistDataMessage = ''; constructor( - public pluginDataService: PluginDataService, + public pluginDataService: PluginPersistDataService, private alertService: AlertService, private dialogService: DialogService, public ngProgress: ProgressBarService) { } ngOnInit(): void { + // add first plugin in plugins array + this.plugins.unshift(this.pluginName) + console.log('plugins', this.plugins); console.log('serviceName', this.serviceName); console.log('pluginName', this.pluginName); - this.getData(); + this.getData(this.plugins[0]); // show data of the first plugin in the list } - getData() { + getData(pluginName: string) { + this.pluginData = ''; + this.noPersistDataMessage = ''; + this.selectedPlugin = pluginName; /** request started */ this.ngProgress.start(); - this.pluginDataService.getData(this.serviceName, this.pluginName) + this.pluginDataService.getData(this.serviceName, pluginName) .subscribe( (res: any) => { - console.log('data', res.data); this.pluginData = res.data; /** request completed */ this.ngProgress.done(); @@ -43,6 +52,9 @@ export class PluginDevDataComponent implements OnInit { this.ngProgress.done(); if (error.status === 0) { console.log('service down ', error); + } else if (error.status == 404) { + console.log('err', error); + this.noPersistDataMessage = error.statusText; } else { this.alertService.error(error.statusText); } @@ -72,14 +84,16 @@ export class PluginDevDataComponent implements OnInit { const fileReader = new FileReader(); fileReader.readAsText(file); fileReader.onload = () => { - this.pluginData = fileReader.result; + this.pluginData = JSON.parse(JSON.stringify(fileReader.result)); + console.log('file', this.pluginData); + }; } } } - exportPluginData(pluginData: any) { + exportPluginData(pluginData) { const str = JSON.stringify(pluginData); const bytes = new TextEncoder().encode(str); const blob = new Blob([bytes], { @@ -96,18 +110,17 @@ export class PluginDevDataComponent implements OnInit { } importPluginData() { - const payload = { data: JSON.parse(JSON.stringify(this.pluginData)) }; - console.log('plugin data', payload); + const payload = { data: JSON.parse(this.pluginData) }; /** request started */ this.ngProgress.start(); this.pluginDataService.importData(this.serviceName, this.pluginName, payload) .subscribe( (data: any) => { - this.pluginData = data.result; this.alertService.success(data.result); /** request completed */ this.ngProgress.done(); - this.closeModal('import-plugin-data-dialog') + this.closeModal('import-plugin-data-dialog'); + this.getData(this.pluginName); }, error => { /** request completed but error */ @@ -126,10 +139,10 @@ export class PluginDevDataComponent implements OnInit { this.pluginDataService.deleteData(this.serviceName, this.pluginName) .subscribe( (data: any) => { - console.log('data', data); this.alertService.success(data.result); /** request completed */ this.ngProgress.done(); + this.closeModal('delete-plugin-data-confirmation-dialog') }, error => { /** request completed but error */ diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.spec.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.spec.ts new file mode 100644 index 000000000..b52220dd0 --- /dev/null +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PluginPersistDataService } from './plugin-persist-data.service'; + +describe('PluginPersistDataService', () => { + let service: PluginPersistDataService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PluginPersistDataService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.ts similarity index 96% rename from src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts rename to src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.ts index f5ae9d6d9..f6254e6fe 100644 --- a/src/app/components/core/configuration-manager/plugin-dev-data/plugin-data.service.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.service.ts @@ -8,7 +8,7 @@ import { environment } from '../../../../../environments/environment'; @Injectable({ providedIn: 'root' }) -export class PluginDataService { +export class PluginPersistDataService { private SERVICE_URL = environment.BASE_URL + 'service'; constructor(private http: HttpClient) { } diff --git a/src/app/components/core/north/north-task-modal/north-task-modal.component.html b/src/app/components/core/north/north-task-modal/north-task-modal.component.html index cadc74b14..16e021cff 100644 --- a/src/app/components/core/north/north-task-modal/north-task-modal.component.html +++ b/src/app/components/core/north/north-task-modal/north-task-modal.component.html @@ -18,10 +18,10 @@
    - + - +
    diff --git a/src/app/components/core/north/north.component.ts b/src/app/components/core/north/north.component.ts index 1a5e591cc..652b20449 100644 --- a/src/app/components/core/north/north.component.ts +++ b/src/app/components/core/north/north.component.ts @@ -4,7 +4,7 @@ import { sortBy } from 'lodash'; import { takeWhile, takeUntil } from 'rxjs/operators'; import { interval, Subscription, Subject } from 'rxjs'; -import { AlertService, NorthService, PingService, SharedService } from '../../../services'; +import { AlertService, NorthService, PingService, ProgressBarService, SharedService } from '../../../services'; import { POLLING_INTERVAL } from '../../../utils'; import { NorthTaskModalComponent } from './north-task-modal/north-task-modal.component'; import { ViewLogsComponent } from '../packages-log/view-logs/view-logs.component'; @@ -30,6 +30,7 @@ export class NorthComponent implements OnInit, OnDestroy { private ping: PingService, private alertService: AlertService, private router: Router, + public ngProgress: ProgressBarService, private sharedService: SharedService) { this.isAlive = true; this.ping.pingIntervalChanged @@ -73,10 +74,14 @@ export class NorthComponent implements OnInit, OnDestroy { } public getNorthTasks(caching: boolean): void { + if (!this.isAlive) { + this.ngProgress.start(); + } this.northService.getNorthTasks(caching) .pipe(takeUntil(this.destroy$)) .subscribe( (data) => { + this.ngProgress.done(); this.tasks = data; this.tasks = sortBy(this.tasks, function (obj) { return !obj.enabled + obj.name.toLowerCase(); @@ -84,6 +89,7 @@ export class NorthComponent implements OnInit, OnDestroy { this.hideLoadingSpinner(); }, error => { + this.ngProgress.done(); this.hideLoadingSpinner(); if (error.status === 0) { console.log('service down ', error); diff --git a/src/app/components/core/south/south-service-modal/south-service-modal.component.html b/src/app/components/core/south/south-service-modal/south-service-modal.component.html index fb7b9c14f..e0ee7f930 100644 --- a/src/app/components/core/south/south-service-modal/south-service-modal.component.html +++ b/src/app/components/core/south/south-service-modal/south-service-modal.component.html @@ -12,7 +12,8 @@
    - +
    diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index 5ae219c18..75478622b 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -8,7 +8,7 @@ import { ConfirmationDialogComponent } from './components/common/confirmation-di import { RangeSliderComponent } from './components/common/range-slider/range-slider.component'; import { TimeDropdownComponent } from './components/common/time-dropdown/time-dropdown.component'; import { ConfigChildrenComponent } from './components/core/configuration-manager/config-children/config-children.component'; -import { PluginDevDataComponent } from './components/core/configuration-manager/plugin-dev-data/plugin-dev-data.component'; +import { PluginPersistDataComponent } from './components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component'; import { ViewConfigItemComponent } from './components/core/configuration-manager/view-config-item/view-config-item.component'; @@ -32,7 +32,7 @@ import { PipesModule } from './pipes/pipes.module'; declarations: [ ViewConfigItemComponent, ConfigChildrenComponent, - PluginDevDataComponent, + PluginPersistDataComponent, PluginModalComponent, ViewLogsComponent, TimeDropdownComponent, @@ -42,7 +42,7 @@ import { PipesModule } from './pipes/pipes.module'; exports: [ ViewConfigItemComponent, ConfigChildrenComponent, - PluginDevDataComponent, + PluginPersistDataComponent, PluginModalComponent, ViewLogsComponent, TimeDropdownComponent, From 61147d2f0136ad0fbbc3ace367a86854db4e1797 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Fri, 22 Jul 2022 19:53:35 +0530 Subject: [PATCH 03/10] fixed import form --- .../plugin-persist-data.component.html | 13 +++++----- .../plugin-persist-data.component.ts | 25 +++++++++++++------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html index 56bda5db9..5666c25c8 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html @@ -65,8 +65,9 @@
    - {{pluginName}} - + {{pluginName}} Data +
    @@ -88,11 +89,10 @@ - Not a 'json' - file.
    + *json file.
    @@ -101,8 +101,9 @@
    - - + +
    diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index 5c98257f3..cde2ede87 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { DialogService } from '../../../common/confirmation-dialog/dialog.service'; import { AlertService, ProgressBarService } from '../../../../services'; import { PluginPersistDataService } from './plugin-persist-data.service'; @@ -13,12 +13,15 @@ export class PluginPersistDataComponent implements OnInit { @Input() pluginName; @Input() serviceStaus = false; public pluginData = ''; - public isJsonExtension = true; + public pluginDataToImport = ''; + public isJsonExtension; // TODO: FOGL-6693 public plugins = [] // add plugins for testing public selectedPlugin = ''; noPersistDataMessage = ''; + @ViewChild('fileInput') fileInput: ElementRef; + constructor( public pluginDataService: PluginPersistDataService, private alertService: AlertService, @@ -43,6 +46,7 @@ export class PluginPersistDataComponent implements OnInit { this.pluginDataService.getData(this.serviceName, pluginName) .subscribe( (res: any) => { + console.log('res', res); this.pluginData = res.data; /** request completed */ this.ngProgress.done(); @@ -70,7 +74,7 @@ export class PluginPersistDataComponent implements OnInit { } onPluginDataFileChange(event: any) { - this.pluginData = ''; + this.pluginDataToImport = ''; if (event.target.files.length !== 0) { const fileName = event.target.files[0].name; const ext = fileName.substr(fileName.lastIndexOf('.') + 1); @@ -84,15 +88,13 @@ export class PluginPersistDataComponent implements OnInit { const fileReader = new FileReader(); fileReader.readAsText(file); fileReader.onload = () => { - this.pluginData = JSON.parse(JSON.stringify(fileReader.result)); + this.pluginDataToImport = JSON.parse(JSON.stringify(fileReader.result)); console.log('file', this.pluginData); - }; } } } - exportPluginData(pluginData) { const str = JSON.stringify(pluginData); const bytes = new TextEncoder().encode(str); @@ -110,7 +112,7 @@ export class PluginPersistDataComponent implements OnInit { } importPluginData() { - const payload = { data: JSON.parse(this.pluginData) }; + const payload = { data: JSON.parse(this.pluginDataToImport) }; /** request started */ this.ngProgress.start(); this.pluginDataService.importData(this.serviceName, this.pluginName, payload) @@ -142,7 +144,8 @@ export class PluginPersistDataComponent implements OnInit { this.alertService.success(data.result); /** request completed */ this.ngProgress.done(); - this.closeModal('delete-plugin-data-confirmation-dialog') + this.closeModal('delete-plugin-data-confirmation-dialog'); + this.getData(this.pluginName); }, error => { /** request completed but error */ @@ -155,4 +158,10 @@ export class PluginPersistDataComponent implements OnInit { }); } + resetFileControl() { + this.fileInput.nativeElement.value = ""; + this.pluginDataToImport = ''; + this.isJsonExtension = false; + } + } From 600ae514ad5df49e34fec0106cfaabcc4cd72424 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Mon, 25 Jul 2022 12:53:54 +0530 Subject: [PATCH 04/10] minor fix Signed-off-by: Mohd. Shariq --- .../plugin-persist-data/plugin-persist-data.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html index 5666c25c8..104cec92d 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html @@ -88,11 +88,12 @@ - +
    - *json file. + *.json file From 0c29d0dd90d99d66857b1cac7b296cdef00ec7a6 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Mon, 25 Jul 2022 17:16:35 +0530 Subject: [PATCH 05/10] hide developer tab on notification and fixed service enable issue Signed-off-by: Mohd. Shariq --- .../config-children/config-children.component.html | 4 ++-- .../config-children/config-children.component.ts | 3 +++ .../plugin-persist-data.component.ts | 14 +++++--------- .../north-task-modal.component.html | 2 +- .../notification-service-modal.component.html | 3 ++- .../south-service-modal.component.html | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.html b/src/app/components/core/configuration-manager/config-children/config-children.component.html index 2de79b7ff..f3693ea6d 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.html +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.html @@ -15,7 +15,7 @@
  • + *ngIf="developerFeaturesService.getDeveloperFeatureControl() && pages.includes(from)">
    Developer
    @@ -38,7 +38,7 @@
    formId="security"> -

    diff --git a/src/app/components/core/configuration-manager/config-children/config-children.component.ts b/src/app/components/core/configuration-manager/config-children/config-children.component.ts index e3b98ea54..9ac238c39 100644 --- a/src/app/components/core/configuration-manager/config-children/config-children.component.ts +++ b/src/app/components/core/configuration-manager/config-children/config-children.component.ts @@ -20,6 +20,9 @@ export class ConfigChildrenComponent { @Input() category; @Input() plugin; @Input() serviceStatus = false; + @Input() from; + + pages = ['south', 'north'] constructor( private configService: ConfigurationService, diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index cde2ede87..c84ba747e 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -31,9 +31,6 @@ export class PluginPersistDataComponent implements OnInit { ngOnInit(): void { // add first plugin in plugins array this.plugins.unshift(this.pluginName) - console.log('plugins', this.plugins); - console.log('serviceName', this.serviceName); - console.log('pluginName', this.pluginName); this.getData(this.plugins[0]); // show data of the first plugin in the list } @@ -46,7 +43,6 @@ export class PluginPersistDataComponent implements OnInit { this.pluginDataService.getData(this.serviceName, pluginName) .subscribe( (res: any) => { - console.log('res', res); this.pluginData = res.data; /** request completed */ this.ngProgress.done(); @@ -57,7 +53,6 @@ export class PluginPersistDataComponent implements OnInit { if (error.status === 0) { console.log('service down ', error); } else if (error.status == 404) { - console.log('err', error); this.noPersistDataMessage = error.statusText; } else { this.alertService.error(error.statusText); @@ -159,9 +154,10 @@ export class PluginPersistDataComponent implements OnInit { } resetFileControl() { - this.fileInput.nativeElement.value = ""; - this.pluginDataToImport = ''; - this.isJsonExtension = false; + if (this.fileInput) { + this.fileInput.nativeElement.value = ""; + this.pluginDataToImport = ''; + this.isJsonExtension = false; + } } - } diff --git a/src/app/components/core/north/north-task-modal/north-task-modal.component.html b/src/app/components/core/north/north-task-modal/north-task-modal.component.html index 16e021cff..4de2ae3b5 100644 --- a/src/app/components/core/north/north-task-modal/north-task-modal.component.html +++ b/src/app/components/core/north/north-task-modal/north-task-modal.component.html @@ -19,7 +19,7 @@
    + [serviceStatus]="task['enabled']" [from]="'north'">
    diff --git a/src/app/components/core/notifications/notification-service-modal/notification-service-modal.component.html b/src/app/components/core/notifications/notification-service-modal/notification-service-modal.component.html index dc4d5a56e..faed2a89f 100644 --- a/src/app/components/core/notifications/notification-service-modal/notification-service-modal.component.html +++ b/src/app/components/core/notifications/notification-service-modal/notification-service-modal.component.html @@ -35,7 +35,8 @@
    - + +
    diff --git a/src/app/components/core/south/south-service-modal/south-service-modal.component.html b/src/app/components/core/south/south-service-modal/south-service-modal.component.html index e0ee7f930..cab766b42 100644 --- a/src/app/components/core/south/south-service-modal/south-service-modal.component.html +++ b/src/app/components/core/south/south-service-modal/south-service-modal.component.html @@ -13,7 +13,7 @@
    + [plugin]="service?.plugin.name" [serviceStatus]="service['schedule_enabled']" [from]="'south'">
    From 8bbbe87e42b8feb4450494e2b3554ce63a05685a Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Mon, 25 Jul 2022 19:18:36 +0530 Subject: [PATCH 06/10] pre wrap text to fix overflow issue Signed-off-by: Mohd. Shariq --- .../plugin-persist-data/plugin-persist-data.component.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css index e4c61887c..77b5af68a 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css @@ -14,3 +14,7 @@ .dropdown { width: auto !important; } + + pre { + white-space: pre-wrap; + } From 0141d1b32d93ee3e3a267e45d91cc3b10af79bcd Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Tue, 26 Jul 2022 17:51:50 +0530 Subject: [PATCH 07/10] fixed space issue in exported file name --- .../plugin-persist-data/plugin-persist-data.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index c84ba747e..6de13d1a1 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -97,10 +97,11 @@ export class PluginPersistDataComponent implements OnInit { type: "application/json;charset=utf-8" }); const url = window.URL.createObjectURL(blob); + const fileName = `${this.serviceName.replaceAll(' ', '_')}_${this.pluginName.replaceAll(' ', '_')}_data`; // create a custom anchor tag const a = document.createElement('a'); a.href = url; - a.download = `${this.serviceName}_${this.pluginName}_data`; + a.download = fileName; //`${this.serviceName}_${this.pluginName}_data`; document.body.appendChild(a); a.click(); document.body.removeChild(a); From d8032fdc66d2d16eb4b9e9f018bb1d7b95a260b1 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Tue, 26 Jul 2022 18:06:15 +0530 Subject: [PATCH 08/10] invalid json error handling Signed-off-by: Mohd. Shariq --- .../plugin-persist-data.component.html | 3 +- .../plugin-persist-data.component.ts | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html index 104cec92d..ecedc5197 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.html @@ -94,6 +94,7 @@
    *.json file + Invalid json file
    @@ -103,7 +104,7 @@
    • -
    diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index 6de13d1a1..4bbd341b4 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -15,6 +15,7 @@ export class PluginPersistDataComponent implements OnInit { public pluginData = ''; public pluginDataToImport = ''; public isJsonExtension; + public jsonParseError = false; // TODO: FOGL-6693 public plugins = [] // add plugins for testing public selectedPlugin = ''; @@ -84,7 +85,6 @@ export class PluginPersistDataComponent implements OnInit { fileReader.readAsText(file); fileReader.onload = () => { this.pluginDataToImport = JSON.parse(JSON.stringify(fileReader.result)); - console.log('file', this.pluginData); }; } } @@ -108,27 +108,33 @@ export class PluginPersistDataComponent implements OnInit { } importPluginData() { - const payload = { data: JSON.parse(this.pluginDataToImport) }; - /** request started */ - this.ngProgress.start(); - this.pluginDataService.importData(this.serviceName, this.pluginName, payload) - .subscribe( - (data: any) => { - this.alertService.success(data.result); - /** request completed */ - this.ngProgress.done(); - this.closeModal('import-plugin-data-dialog'); - this.getData(this.pluginName); - }, - error => { - /** request completed but error */ - this.ngProgress.done(); - if (error.status === 0) { - console.log('service down ', error); - } else { - this.alertService.error(error.statusText); - } - }); + try { + const jsonValue = JSON.parse(this.pluginDataToImport); + const payload = { data: jsonValue }; + this.jsonParseError = false; + /** request started */ + this.ngProgress.start(); + this.pluginDataService.importData(this.serviceName, this.pluginName, payload) + .subscribe( + (data: any) => { + this.alertService.success(data.result); + /** request completed */ + this.ngProgress.done(); + this.closeModal('import-plugin-data-dialog'); + this.getData(this.pluginName); + }, + error => { + /** request completed but error */ + this.ngProgress.done(); + if (error.status === 0) { + console.log('service down ', error); + } else { + this.alertService.error(error.statusText); + } + }); + } catch (ex) { + this.jsonParseError = true; + } } deleteData() { @@ -159,6 +165,7 @@ export class PluginPersistDataComponent implements OnInit { this.fileInput.nativeElement.value = ""; this.pluginDataToImport = ''; this.isJsonExtension = false; + this.jsonParseError = false; } } } From 96e47036c09038b9d3a687fb7609bcdf00e92681 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Tue, 26 Jul 2022 18:16:53 +0530 Subject: [PATCH 09/10] fixed file name issue in file control Signed-off-by: Mohd. Shariq --- .../plugin-persist-data/plugin-persist-data.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts index 4bbd341b4..2e63b03ab 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.ts @@ -148,6 +148,7 @@ export class PluginPersistDataComponent implements OnInit { this.ngProgress.done(); this.closeModal('delete-plugin-data-confirmation-dialog'); this.getData(this.pluginName); + this.resetFileControl(); }, error => { /** request completed but error */ From 7e6736e9523db363c90585de5678ee0e0ca33654 Mon Sep 17 00:00:00 2001 From: "Mohd. Shariq" Date: Tue, 26 Jul 2022 18:38:03 +0530 Subject: [PATCH 10/10] fixed hover issue on dropdown Signed-off-by: Mohd. Shariq --- .../plugin-persist-data/plugin-persist-data.component.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css index 77b5af68a..4599b3397 100644 --- a/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css +++ b/src/app/components/core/configuration-manager/plugin-persist-data/plugin-persist-data.component.css @@ -18,3 +18,7 @@ pre { white-space: pre-wrap; } + + .dropdown-menu { + padding-left: 25px !important; + }