discovery
This commit is contained in:
parent
836f9f5f52
commit
604cc8e9d5
13
package-lock.json
generated
13
package-lock.json
generated
|
@ -4634,6 +4634,11 @@
|
||||||
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
|
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"hammer": {
|
||||||
|
"version": "0.0.5",
|
||||||
|
"resolved": "https://nexus.loafle.net/repository/npm-all/hammer/-/hammer-0.0.5.tgz",
|
||||||
|
"integrity": "sha1-DqG/gc9+reY5qgQXJywnGCxeh2Q="
|
||||||
|
},
|
||||||
"handle-thing": {
|
"handle-thing": {
|
||||||
"version": "1.2.5",
|
"version": "1.2.5",
|
||||||
"resolved": "https://nexus.loafle.net/repository/npm-all/handle-thing/-/handle-thing-1.2.5.tgz",
|
"resolved": "https://nexus.loafle.net/repository/npm-all/handle-thing/-/handle-thing-1.2.5.tgz",
|
||||||
|
@ -7073,6 +7078,14 @@
|
||||||
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
|
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"ng4-loader-bar": {
|
||||||
|
"version": "1.0.3",
|
||||||
|
"resolved": "https://nexus.loafle.net/repository/npm-all/ng4-loader-bar/-/ng4-loader-bar-1.0.3.tgz",
|
||||||
|
"integrity": "sha1-4mXOirdy4HOh3E0MUCwCAOVaBoo=",
|
||||||
|
"requires": {
|
||||||
|
"hammer": "0.0.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"ngx-cookie-service": {
|
"ngx-cookie-service": {
|
||||||
"version": "1.0.10",
|
"version": "1.0.10",
|
||||||
"resolved": "https://nexus.loafle.net/repository/npm-all/ngx-cookie-service/-/ngx-cookie-service-1.0.10.tgz",
|
"resolved": "https://nexus.loafle.net/repository/npm-all/ngx-cookie-service/-/ngx-cookie-service-1.0.10.tgz",
|
||||||
|
|
|
@ -45,7 +45,7 @@ import { PanelModule } from 'primeng/primeng';
|
||||||
import { PanelMenuModule } from 'primeng/primeng';
|
import { PanelMenuModule } from 'primeng/primeng';
|
||||||
import { PasswordModule } from 'primeng/primeng';
|
import { PasswordModule } from 'primeng/primeng';
|
||||||
import { PickListModule } from 'primeng/primeng';
|
import { PickListModule } from 'primeng/primeng';
|
||||||
import { ProgressBarModule } from 'primeng/primeng';
|
import { ProgressBarModule, ProgressSpinner } from 'primeng/primeng';
|
||||||
import { RadioButtonModule } from 'primeng/primeng';
|
import { RadioButtonModule } from 'primeng/primeng';
|
||||||
import { RatingModule } from 'primeng/primeng';
|
import { RatingModule } from 'primeng/primeng';
|
||||||
import { ScheduleModule } from 'primeng/primeng';
|
import { ScheduleModule } from 'primeng/primeng';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="ui-g-12" (click)="onClick()">
|
<div *ngIf="data" class="ui-g-12" (click)="onClick()">
|
||||||
<of-key-value [key]="'Host'" [value]="hostRange"></of-key-value>
|
<of-key-value *ngIf="data.discoverHost" [key]="'Host'" [value]="hostRange"></of-key-value>
|
||||||
<of-key-value *ngIf="data.discoverHost.discoverPort" [key]="'Port'" [value]="portRange"></of-key-value>
|
<of-key-value *ngIf="data.discoverHost.discoverPort" [key]="'Port'" [value]="portRange"></of-key-value>
|
||||||
<span *ngIf="includeTCP">
|
<span *ngIf="includeTCP">
|
||||||
TCP
|
TCP
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
|
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy, OnChanges, SimpleChanges } from '@angular/core';
|
||||||
import { DiscoverZone } from '@overflow/commons-typescript/model/discovery';
|
import { DiscoverZone } from '@overflow/commons-typescript/model/discovery';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'of-discovery-filter-summary',
|
selector: 'of-discovery-filter-summary',
|
||||||
templateUrl: './filter-summary.component.html',
|
templateUrl: './filter-summary.component.html',
|
||||||
})
|
})
|
||||||
export class FilterSummaryComponent implements OnInit, AfterContentInit, OnDestroy {
|
export class FilterSummaryComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges {
|
||||||
|
|
||||||
@Output() click = new EventEmitter();
|
@Output() click = new EventEmitter();
|
||||||
@Input() data: DiscoverZone;
|
@Input() data: DiscoverZone;
|
||||||
|
@ -25,7 +25,12 @@ export class FilterSummaryComponent implements OnInit, AfterContentInit, OnDestr
|
||||||
}
|
}
|
||||||
|
|
||||||
ngAfterContentInit() {
|
ngAfterContentInit() {
|
||||||
console.log(this.data);
|
}
|
||||||
|
|
||||||
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
|
if (!this.data) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.hostRange = this.data.discoverHost.firstScanRangev4 + ' ~ ' + this.data.discoverHost.lastScanRangev4;
|
this.hostRange = this.data.discoverHost.firstScanRangev4 + ' ~ ' + this.data.discoverHost.lastScanRangev4;
|
||||||
if (this.data.discoverHost.discoverPort) {
|
if (this.data.discoverHost.discoverPort) {
|
||||||
this.portRange = this.data.discoverHost.discoverPort.firstScanRange + ' ~ ' + this.data.discoverHost.discoverPort.lastScanRange;
|
this.portRange = this.data.discoverHost.discoverPort.firstScanRange + ' ~ ' + this.data.discoverHost.discoverPort.lastScanRange;
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
<div class="ui-g-12">
|
<div class="ui-g-12">
|
||||||
result
|
|
||||||
<div *ngIf="inProgress">
|
<div *ngIf="inProgress">
|
||||||
<p-progressBar mode="indeterminate" [style]="{'height': '16px'}"></p-progressBar>
|
<p-progressBar mode="indeterminate"></p-progressBar>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p-blockUI [target]="result" [blocked]="inProgress"></p-blockUI>
|
<p-blockUI [target]="result" [blocked]="inProgress"></p-blockUI>
|
||||||
<p-panel #result [showHeader]="false">
|
<p-panel #result [showHeader]="false">
|
||||||
|
<div>
|
||||||
|
result
|
||||||
|
</div>
|
||||||
<p-tree [value]="treeNodes" selectionMode="checkbox" [(selection)]="selectedNodes"></p-tree>
|
<p-tree [value]="treeNodes" selectionMode="checkbox" [(selection)]="selectedNodes"></p-tree>
|
||||||
</p-panel>
|
</p-panel>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
|
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy, OnChanges, SimpleChanges } from '@angular/core';
|
||||||
import { Store, select, StateObservable } from '@ngrx/store';
|
import { Store, select, StateObservable } from '@ngrx/store';
|
||||||
import { RPCClientError } from '@loafer/ng-rpc/protocol';
|
import { RPCClientError } from '@loafer/ng-rpc/protocol';
|
||||||
import { Subscription } from 'rxjs/Subscription';
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
@ -18,7 +18,9 @@ import { Service } from '@overflow/commons-typescript/model/discovery';
|
||||||
selector: 'of-discovery-result',
|
selector: 'of-discovery-result',
|
||||||
templateUrl: './result.component.html',
|
templateUrl: './result.component.html',
|
||||||
})
|
})
|
||||||
export class ResultComponent implements OnInit, AfterContentInit, OnDestroy {
|
export class ResultComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges {
|
||||||
|
|
||||||
|
@Input() started: boolean;
|
||||||
|
|
||||||
treeNodes = [];
|
treeNodes = [];
|
||||||
selectedNodes = [];
|
selectedNodes = [];
|
||||||
|
@ -86,6 +88,12 @@ export class ResultComponent implements OnInit, AfterContentInit, OnDestroy {
|
||||||
ngAfterContentInit() {
|
ngAfterContentInit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
|
if (changes['started'] && !changes['started'].currentValue) {
|
||||||
|
this.inProgress = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
if (this.startedSubscription$) {
|
if (this.startedSubscription$) {
|
||||||
this.startedSubscription$.unsubscribe();
|
this.startedSubscription$.unsubscribe();
|
||||||
|
|
|
@ -4,29 +4,29 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<of-probe-selector #probeSelectorComponent [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
|
<of-probe-selector [hidden]="requestStart" #probeSelectorComponent [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
|
||||||
|
|
||||||
<p-blockUI [target]="df" [blocked]="!selectedProbe && !probe"></p-blockUI>
|
<p-blockUI [target]="df" [blocked]="!selectedProbe && !probe"></p-blockUI>
|
||||||
<p-panel #df [showHeader]="false">
|
<p-panel #df [showHeader]="false">
|
||||||
<div [@discoveryFilter]="filterExpand ? 'full' : 'summary'">
|
<div [@discoveryFilter]="!requestStart ? 'full' : 'summary'">
|
||||||
<div *ngIf="filterExpand; else filterSummary">
|
<div [hidden]="requestStart">
|
||||||
<of-discovery-filter #filterComponent [probe]="selectedProbe" [requestStart]="requestStart" (discoveryRequested)="onDiscoveryStart($event)"></of-discovery-filter>
|
<of-discovery-filter #filterComponent [probe]="selectedProbe" [requestStart]="requestStart" (discoveryRequested)="onDiscoveryStart($event)"></of-discovery-filter>
|
||||||
</div>
|
</div>
|
||||||
<ng-template #filterSummary>
|
<div [hidden]="!requestStart">
|
||||||
<of-discovery-filter-summary [data]="filterData" (click)="onSummaryClick($event)"></of-discovery-filter-summary>
|
<of-discovery-filter-summary [data]="filterData" (click)="onSummaryClick($event)"></of-discovery-filter-summary>
|
||||||
</ng-template>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p-panel>
|
</p-panel>
|
||||||
|
|
||||||
<div dir="rtl" *ngIf="filterExpand">
|
<div dir="rtl" *ngIf="!requestStart">
|
||||||
<button [disabled]="!selectedProbe && !probe" pButton type="button" label="Start" icon="fa-check" class="ui-button-width-fit"
|
<button [disabled]="!selectedProbe && !probe" pButton type="button" label="Start" icon="fa-check" class="ui-button-width-fit"
|
||||||
(click)="requestStart = true"></button>
|
(click)="requestStart = true"></button>
|
||||||
<button pButton type="button" label="Cancel" icon="fa-close" class="ui-button-secondary ui-button-width-fit" (click)="onCancel()"></button>
|
<button pButton type="button" label="Cancel" icon="fa-close" class="ui-button-secondary ui-button-width-fit" (click)="onCancel()"></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="!filterExpand" [@result]="filterExpand ? 'hidden' : 'show'">
|
<div *ngIf="requestStart" [@result]="!requestStart ? 'hidden' : 'show'">
|
||||||
<of-discovery-result (close)="onCancel()"></of-discovery-result>
|
<of-discovery-result (close)="onCancel()" [started]="started"></of-discovery-result>
|
||||||
<div dir="rtl">
|
<div dir="rtl">
|
||||||
<button [disabled]="!selectedProbe && !probe" pButton type="button" label="Save" icon="fa-check" class="ui-button-width-fit"
|
<button [disabled]="!selectedProbe && !probe" pButton type="button" label="Save" icon="fa-check" class="ui-button-width-fit"
|
||||||
(click)="onSave()"></button>
|
(click)="onSave()"></button>
|
||||||
|
|
|
@ -72,8 +72,6 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
|
||||||
private selectedProbe: Probe;
|
private selectedProbe: Probe;
|
||||||
private height: number;
|
private height: number;
|
||||||
|
|
||||||
private filterExpand = true;
|
|
||||||
|
|
||||||
@ViewChild('probeSelectorComponent') probeSelectorComponent: ProbeSelectorComponent;
|
@ViewChild('probeSelectorComponent') probeSelectorComponent: ProbeSelectorComponent;
|
||||||
@ViewChild('filterComponent') filterComponent: FilterComponent;
|
@ViewChild('filterComponent') filterComponent: FilterComponent;
|
||||||
@ViewChild('resultComponent') resultComponent: ResultComponent;
|
@ViewChild('resultComponent') resultComponent: ResultComponent;
|
||||||
|
@ -107,7 +105,6 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
|
||||||
this.started = false;
|
this.started = false;
|
||||||
this.close.emit();
|
this.close.emit();
|
||||||
this.requestStart = false;
|
this.requestStart = false;
|
||||||
this.filterExpand = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
initAll() {
|
initAll() {
|
||||||
|
@ -142,13 +139,12 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
|
||||||
|
|
||||||
onDiscoveryStart(discoverZone: DiscoverZone) {
|
onDiscoveryStart(discoverZone: DiscoverZone) {
|
||||||
this.filterData = discoverZone;
|
this.filterData = discoverZone;
|
||||||
this.filterExpand = false;
|
this.discoverStore.dispatch(new DiscoverStore.DiscoverZone(
|
||||||
// this.discoverStore.dispatch(new DiscoverStore.DiscoverZone(
|
{ probeID: this.selectedProbe.probeKey, discoverZone: discoverZone }));
|
||||||
// { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone }));
|
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.started = true;
|
this.started = true;
|
||||||
this.requestStart = false;
|
// this.requestStart = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,7 +164,7 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
|
||||||
if (this.started) {
|
if (this.started) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.filterExpand = true;
|
this.requestStart = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { COMPONENTS } from './component';
|
||||||
import { SERVICES } from './service';
|
import { SERVICES } from './service';
|
||||||
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
|
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
|
||||||
import { KeyValueModule } from 'app/commons/component/key-value/key-value.module';
|
import { KeyValueModule } from 'app/commons/component/key-value/key-value.module';
|
||||||
|
import {AngularLoadingBarModule} from 'ng4-loader-bar';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -19,7 +20,8 @@ import { KeyValueModule } from 'app/commons/component/key-value/key-value.module
|
||||||
DiscoveryStoreModule,
|
DiscoveryStoreModule,
|
||||||
DiscoveryRPCModule,
|
DiscoveryRPCModule,
|
||||||
DiscoveryLoggerModule,
|
DiscoveryLoggerModule,
|
||||||
KeyValueModule
|
KeyValueModule,
|
||||||
|
AngularLoadingBarModule.forRoot()
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
COMPONENTS
|
COMPONENTS
|
||||||
|
|
|
@ -299,3 +299,6 @@
|
||||||
.layout-container .topbar-items .profile-image{
|
.layout-container .topbar-items .profile-image{
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
body .ui-progressbar .ui-progressbar-value {
|
||||||
|
height: 0 !important;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user