From b3ad3ee57d60a770ef47d09f66cab65123e8b2a3 Mon Sep 17 00:00:00 2001 From: insanity Date: Thu, 24 May 2018 18:15:32 +0900 Subject: [PATCH] arrange --- @overflow/alert/alert.module.ts | 2 +- @overflow/commons/prime-ng/prime-ng.module.ts | 4 +- .../setting.1/filter/filter.component.html | 66 -- .../setting.1/filter/filter.component.ts | 116 --- .../service-selector.component.html | 10 - .../service-selector.component.ts | 52 -- .../probe-selector.component.html | 4 - .../probe-selector.component.ts | 82 -- .../setting.1/result/result.component.html | 11 - .../setting.1/result/result.component.ts | 191 ----- .../setting.1/setting.component.html | 30 - .../setting.1/setting.component.spec.ts | 25 - .../component/setting.1/setting.component.ts | 93 -- .../component/temp/setting.component.1.html | 124 --- .../component/temp/setting.component.1.ts | 793 ------------------ .../infra/component/map/map.component.ts | 6 +- package.json | 8 +- .../pages/account/account-page.component.ts | 3 +- .../modify-password-page.component.ts | 4 +- .../auth/signin/signin-page.component.ts | 4 +- .../auth/signup/signup-page.component.ts | 5 +- .../pages/probes/probe-tab-page.component.ts | 2 +- 22 files changed, 11 insertions(+), 1624 deletions(-) delete mode 100644 @overflow/discovery/component/setting.1/filter/filter.component.html delete mode 100644 @overflow/discovery/component/setting.1/filter/filter.component.ts delete mode 100644 @overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.html delete mode 100644 @overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.ts delete mode 100644 @overflow/discovery/component/setting.1/probe-selector/probe-selector.component.html delete mode 100644 @overflow/discovery/component/setting.1/probe-selector/probe-selector.component.ts delete mode 100644 @overflow/discovery/component/setting.1/result/result.component.html delete mode 100644 @overflow/discovery/component/setting.1/result/result.component.ts delete mode 100644 @overflow/discovery/component/setting.1/setting.component.html delete mode 100644 @overflow/discovery/component/setting.1/setting.component.spec.ts delete mode 100644 @overflow/discovery/component/setting.1/setting.component.ts delete mode 100644 @overflow/discovery/component/temp/setting.component.1.html delete mode 100644 @overflow/discovery/component/temp/setting.component.1.ts diff --git a/@overflow/alert/alert.module.ts b/@overflow/alert/alert.module.ts index 4c6ec0d..63c13a3 100644 --- a/@overflow/alert/alert.module.ts +++ b/@overflow/alert/alert.module.ts @@ -1,4 +1,4 @@ -import { NgModule, Inject } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; diff --git a/@overflow/commons/prime-ng/prime-ng.module.ts b/@overflow/commons/prime-ng/prime-ng.module.ts index 2f5ff07..f0de78f 100644 --- a/@overflow/commons/prime-ng/prime-ng.module.ts +++ b/@overflow/commons/prime-ng/prime-ng.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { AccordionModule, BlockUIModule, InplaceModule } from 'primeng/primeng'; import { AutoCompleteModule } from 'primeng/primeng'; import { BreadcrumbModule } from 'primeng/primeng'; @@ -45,7 +45,7 @@ import { PanelModule } from 'primeng/primeng'; import { PanelMenuModule } from 'primeng/primeng'; import { PasswordModule } from 'primeng/primeng'; import { PickListModule } from 'primeng/primeng'; -import { ProgressBarModule, ProgressSpinner } from 'primeng/primeng'; +import { ProgressBarModule } from 'primeng/primeng'; import { RadioButtonModule } from 'primeng/primeng'; import { RatingModule } from 'primeng/primeng'; import { ScheduleModule } from 'primeng/primeng'; diff --git a/@overflow/discovery/component/setting.1/filter/filter.component.html b/@overflow/discovery/component/setting.1/filter/filter.component.html deleted file mode 100644 index 51eb2cb..0000000 --- a/@overflow/discovery/component/setting.1/filter/filter.component.html +++ /dev/null @@ -1,66 +0,0 @@ -
-
-
-
- -
-
- -
-
- - - - -
-
- - - - -
-
- - -
-
- -
-
-
- TCP   - -
-
- UDP   - -
-
-
- -
-
- - - - -
- -
- - - - -
-
- -
-
- -
- - - -
-
-
\ No newline at end of file diff --git a/@overflow/discovery/component/setting.1/filter/filter.component.ts b/@overflow/discovery/component/setting.1/filter/filter.component.ts deleted file mode 100644 index d101bbb..0000000 --- a/@overflow/discovery/component/setting.1/filter/filter.component.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy, OnChanges, SimpleChanges } from '@angular/core'; -import * as CIDR from 'ip-cidr'; -import { Probe } from '@overflow/commons-typescript/model/probe'; -import { DiscoverZone, DiscoverPort, DiscoverService } from '@overflow/commons-typescript/model/discovery'; - -@Component({ - selector: 'of-discovery-filter', - templateUrl: './filter.component.html', -}) -export class FilterComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { - - @Input() probe: Probe; - @Input() requestStart: boolean; - @Output() discoveryRequested = new EventEmitter(); - - private startIP: string; - private endIP: string; - private startPort: string; - private endPort: string; - private includeServices = []; - - private hostChecked = true; - private portChecked = true; - private serviceChecked = true; - private tcpChecked = true; - private udpChecked = true; - - constructor( - ) { - } - - ngOnInit() { - } - - ngAfterContentInit() { - } - - ngOnDestroy() { - } - - hostRange() { - if (!this.probe || this.probe === undefined) { - return; - } - const cidr = new CIDR(this.probe.cidr); - if (!cidr.isValid()) { - alert('Invalid cidr : ' + this.probe.cidr); - return; - } - this.startIP = cidr.addressStart.address; - this.endIP = cidr.addressEnd.address; - } - - portRange() { - this.startPort = '1'; - this.endPort = '1024'; - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes['probe']) { - this.hostRange(); - this.portRange(); - } - if (changes['requestStart'] && this.requestStart) { - this.onStart(); - } - } - - onPortCheckChange(serviceCheckbox, checked) { - if (!checked) { - serviceCheckbox.checked = false; - this.serviceChecked = false; - } - } - - onServiceCheckChange(portCheckbox, checked) { - if (checked) { - portCheckbox.checked = true; - this.portChecked = true; - } - } - - onStart() { - let discoverPort: DiscoverPort = null; - let discoverService: DiscoverService = null; - - if (this.serviceChecked) { - const services = new Array(); - for (const service of this.includeServices) { - services.push(service.description); // FIXME to const name - } - discoverService = { - includeServices: services, - }; - } - if (this.portChecked) { - discoverPort = { - firstScanRange: Number(this.startPort), - lastScanRange: Number(this.endPort), - includeTCP: this.tcpChecked, - includeUDP: this.udpChecked, - excludePorts: null, - discoverService: discoverService - }; - } - const discoverZone: DiscoverZone = { - discoverHost: { - firstScanRangev4: this.startIP, - lastScanRangev4: this.endIP, - discoverPort: discoverPort - }, - }; - - this.discoveryRequested.emit(discoverZone); - } -} diff --git a/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.html b/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.html deleted file mode 100644 index 8a0623a..0000000 --- a/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
-
{{crawler.description}}
-
- - -
diff --git a/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.ts b/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.ts deleted file mode 100644 index 5274e54..0000000 --- a/@overflow/discovery/component/setting.1/filter/service-selector/service-selector.component.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core'; -import { Store, select, StateObservable } from '@ngrx/store'; -import { RPCClientError } from '@loafer/ng-rpc'; -import * as ListStore from '@overflow/meta/crawler/store/list'; -import { ReadAllCrawlerSelector } from '@overflow/meta/crawler/store'; -import { MetaCrawler } from '@overflow/commons-typescript/model/meta'; -import { Subscription } from 'rxjs/Subscription'; - -@Component({ - selector: 'of-service-selector', - templateUrl: './service-selector.component.html', -}) -export class ServiceSelectorComponent implements OnInit, AfterContentInit, OnDestroy { - - crawlersSubscription$: Subscription; - crawlers$: StateObservable; - crawlers: MetaCrawler[]; - @Output() crawlerSelected = new EventEmitter(); - @Input() includeServices; - - @Input() disabled: boolean; - - constructor( - private listStore: Store, - ) { - this.crawlers$ = listStore.pipe(select(ReadAllCrawlerSelector.select('metaCrawlerList'))); - } - - ngOnInit() { - this.crawlersSubscription$ = this.crawlers$.subscribe( - (list: MetaCrawler[]) => { - if (list !== null) { - this.crawlers = []; - this.includeServices = list; - } - }, - (error: RPCClientError) => { - console.log(error); - } - ); - } - - ngAfterContentInit() { - this.listStore.dispatch(new ListStore.ReadAll()); - } - - ngOnDestroy() { - if (this.crawlersSubscription$) { - this.crawlersSubscription$.unsubscribe(); - } - } -} diff --git a/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.html b/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.html deleted file mode 100644 index c4b990d..0000000 --- a/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.html +++ /dev/null @@ -1,4 +0,0 @@ -
- -
\ No newline at end of file diff --git a/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.ts b/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.ts deleted file mode 100644 index 8a4a96d..0000000 --- a/@overflow/discovery/component/setting.1/probe-selector/probe-selector.component.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { - Component, OnInit, Input, AfterContentInit, Output, - EventEmitter, OnDestroy, OnChanges, SimpleChanges, ViewChild -} from '@angular/core'; -import { Store, select, StateObservable } from '@ngrx/store'; -import { RPCClientError } from '@loafer/ng-rpc'; -import * as ListStore from '@overflow/probe/store/list'; -import { ListSelector } from '@overflow/probe/store'; -import { Subscription } from 'rxjs/Subscription'; -import { Probe } from '@overflow/commons-typescript/model/probe'; -import { AuthSelector } from '@overflow/member/store'; -import { Domain } from '@overflow/commons-typescript/model/domain'; -import { Dropdown } from 'primeng/primeng'; - -@Component({ - selector: 'of-probe-selector', - templateUrl: './probe-selector.component.html', -}) -export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { - - @Input() visible: boolean; - @Input() preProbe: Probe; - probesSubscription$: Subscription; - probes$: StateObservable; - probes: Probe[]; - - selected: Probe; - - @Output() probeSelected = new EventEmitter(); - - constructor( - private listStore: Store, - ) { - this.probes$ = listStore.pipe(select(ListSelector.select('probes'))); - } - - ngOnInit() { - this.probesSubscription$ = this.probes$.subscribe( - (list: Probe[]) => { - if (list !== null) { - this.probes = list; - } - }, - (error: RPCClientError) => { - console.log(error.response.message); - } - ); - } - - ngAfterContentInit() { - this.getProbes(); - } - - ngOnDestroy() { - if (this.probesSubscription$) { - this.probesSubscription$.unsubscribe(); - } - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes['visible']) { - this.selected = null; - this.getProbes(); - } - } - - getProbes() { - this.listStore.select(AuthSelector.select('domain')).subscribe( - (domain: Domain) => { - this.listStore.dispatch(new ListStore.ReadAllByDomain(domain)); - }, - (error) => { - console.log(error); - } - ); - } - - onProbeSelect(event) { - this.selected = event.value; - this.probeSelected.emit(this.selected); - } -} diff --git a/@overflow/discovery/component/setting.1/result/result.component.html b/@overflow/discovery/component/setting.1/result/result.component.html deleted file mode 100644 index f09b77c..0000000 --- a/@overflow/discovery/component/setting.1/result/result.component.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
- -
- - - - - - -
diff --git a/@overflow/discovery/component/setting.1/result/result.component.ts b/@overflow/discovery/component/setting.1/result/result.component.ts deleted file mode 100644 index d9e4a97..0000000 --- a/@overflow/discovery/component/setting.1/result/result.component.ts +++ /dev/null @@ -1,191 +0,0 @@ -import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core'; -import { Store, select, StateObservable } from '@ngrx/store'; -import { RPCClientError } from '@loafer/ng-rpc'; -import { Subscription } from 'rxjs/Subscription'; -import { TreeNode } from 'primeng/primeng'; - -import * as DiscoveredStore from '@overflow/discovery/store/setting'; -import { SettingSelector, DiscoverSelector } from '@overflow/discovery/store'; -import * as DiscoverStore from '@overflow/discovery/store/discover'; -import * as RegistStore from '@overflow/discovery/store/regist'; - -import { Zone } from '@overflow/commons-typescript/model/discovery'; -import { Host } from '@overflow/commons-typescript/model/discovery'; -import { Port } from '@overflow/commons-typescript/model/discovery'; -import { Service } from '@overflow/commons-typescript/model/discovery'; - -@Component({ - selector: 'of-discovery-result', - templateUrl: './result.component.html', -}) -export class ResultComponent implements OnInit, AfterContentInit, OnDestroy { - - treeNodes = []; - selectedNodes = []; - zones: Map = null; - checkedSet = new Set(); - - resultSubscription$: Subscription; - result$: any; - startedSubscription$: Subscription; - started$: any; - endedSubscription$: Subscription; - ended$: any; - - inProgress = false; - - - selectedDiscoveryResult: TreeNode[]; - - constructor( - private discoverdStore: Store, - private discoverStore: Store, - private registStore: Store, - ) { - this.result$ = discoverStore.pipe(select(DiscoverSelector.select('zones'))); - this.started$ = discoverStore.pipe(select(DiscoverSelector.select('isStart'))); - this.ended$ = discoverStore.pipe(select(DiscoverSelector.select('isEnd'))); - } - - ngOnInit() { - alert('init'); - this.resultSubscription$ = this.result$.subscribe( - (zones: Map) => { - if (zones !== undefined && zones !== null) { - console.log(zones); - this.treeNodes = this.convertTreeViewZone(zones); - this.zones = zones; - } - }, - (error: RPCClientError) => { - console.log(error.response.message); - } - ); - this.startedSubscription$ = this.started$.subscribe( - (isStart: boolean) => { - if (isStart !== undefined && isStart !== null && isStart) { - this.inProgress = true; - console.log('##Discovery has started.##'); - } - }, - (error: RPCClientError) => { - console.log(error.response.message); - } - ); - this.endedSubscription$ = this.ended$.subscribe( - (isEnd: boolean) => { - if (isEnd !== undefined && isEnd !== null && isEnd) { - console.log('##Discovery has done.##'); - } - }, - (error: RPCClientError) => { - console.log(error.response.message); - } - ); - } - - ngAfterContentInit() { - } - - ngOnDestroy() { - if (this.startedSubscription$) { - this.startedSubscription$.unsubscribe(); - } - if (this.endedSubscription$) { - this.endedSubscription$.unsubscribe(); - } - if (this.resultSubscription$) { - this.resultSubscription$.unsubscribe(); - } - } - - save() { - } - - convertTreeViewZone(zones: Map) { - - if (zones === undefined || zones === null) { - return; - } - - const treeNodes: any[] = []; - - zones.forEach((value: Zone, key: string, map) => { - const jZone: any = { - label: 'Zone - ' + value.iface, - // className: 'cn' + value.ip, - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jZone.obj = value; - jZone.children = this.convertViewHost(value.hosts); - treeNodes.push(jZone); - }); - - return treeNodes; - } - - convertViewHost(hosts): any[] { - if (hosts === undefined || hosts === null) { - return null; - } - const hostNodes: any[] = []; - - hosts.forEach((host, hostKey) => { - - const jHost: any = { - label: 'Host - ' + host.ipv4, - // className: 'cn' + host.ip - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jHost.obj = host; - jHost.children = this.convertViewPort(host.ports); - hostNodes.push(jHost); - - }); - - return hostNodes; - - } - - convertViewPort(ports): any[] { - if (ports === undefined || ports === null || ports.size < 0) { - return null; - } - const portChildren: any[] = []; - ports.forEach((port, portKey) => { - const jPort: any = { - label: 'Port - ' + port.portNumber, - // className: 'cn' + port.portNumber, - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jPort.obj = port; - jPort.children = this.convertViewService(port.services); - portChildren.push(jPort); - }); - - return portChildren; - } - - convertViewService(services): any[] { - if (services === undefined || services === null || services.size <= 0) { - return null; - } - const serviceChildren: any[] = []; - services.forEach((service, serviceKey) => { - const jService: any = { - label: 'Service - ' + service.serviceName, - // className: 'cn' + service.serviceName, - }; - jService.obj = service; - - serviceChildren.push(jService); - }); - - return serviceChildren; - } - - -} diff --git a/@overflow/discovery/component/setting.1/setting.component.html b/@overflow/discovery/component/setting.1/setting.component.html deleted file mode 100644 index 55844b4..0000000 --- a/@overflow/discovery/component/setting.1/setting.component.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
- -
- -
- - - - - - - -
- - -
-
- - - - -
- - -
- -
\ No newline at end of file diff --git a/@overflow/discovery/component/setting.1/setting.component.spec.ts b/@overflow/discovery/component/setting.1/setting.component.spec.ts deleted file mode 100644 index 009aeb2..0000000 --- a/@overflow/discovery/component/setting.1/setting.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SettingComponent } from './setting.component'; - -describe('SettingComponent', () => { - let component: SettingComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SettingComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SettingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/@overflow/discovery/component/setting.1/setting.component.ts b/@overflow/discovery/component/setting.1/setting.component.ts deleted file mode 100644 index dcccf61..0000000 --- a/@overflow/discovery/component/setting.1/setting.component.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { Component, OnInit, AfterContentInit, Output, EventEmitter, - Input, OnDestroy, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; -import { Store, select, StateObservable } from '@ngrx/store'; -import { RPCClientError } from '@loafer/ng-rpc'; -import { - DiscoveryStartInfo, - DiscoverZone, - Zone, - DiscoverPort, - DiscoverService -} from '@overflow/commons-typescript/model/discovery'; -import * as CIDR from 'ip-cidr'; -import * as DiscoveredStore from '../../store/setting'; -import { SettingSelector, DiscoverSelector } from '../../store'; -import * as DiscoverStore from '../../store/discover'; -import * as RegistStore from '../../store/regist'; -import { Host } from '@overflow/commons-typescript/model/discovery'; -import { Port } from '@overflow/commons-typescript/model/discovery'; -import { Service } from '@overflow/commons-typescript/model/discovery'; -import * as ProbeDetailStore from '@overflow/probe/store'; -import { Probe } from '@overflow/commons-typescript/model/probe'; -import { TreeNode } from 'primeng/primeng'; -import { ListSelector as ProbeListSelector } from '@overflow/probe/store'; -import * as ProbeListStore from '@overflow/probe/store/list'; -import { AuthSelector } from '@overflow/member/store'; -import { Domain } from '@overflow/commons-typescript/model/domain'; -import { Subscription } from 'rxjs/Subscription'; -import { ResultComponent } from './result/result.component'; - -@Component({ - selector: 'of-discovery-setting', - templateUrl: './setting.component.html', -}) -export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { - - @Input() visible: boolean; - @Input() probe: Probe; - @Output() close = new EventEmitter(); - private requestStart = false; - private started = false; - - private selectedProbe: Probe; - private height: number; - - @ViewChild('resultComponent') resultComponent: ResultComponent; - - constructor( - private discoverStore: Store, - ) { - } - - ngOnInit() { - this.height = window.innerHeight * 0.9; - } - - ngAfterContentInit() { - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes['probe'] && this.probe) { - this.selectedProbe = this.probe; - } - } - - ngOnDestroy() { - } - - onProbeSelect(probe: Probe) { - this.selectedProbe = probe; - } - - onDiscoveryStart(discoverZone: DiscoverZone) { - this.discoverStore.dispatch(new DiscoverStore.DiscoverZone( - { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone })); - - setTimeout(() => { - this.started = true; - this.requestStart = false; - }); - } - - onCancel() { - this.selectedProbe = null; - this.started = false; - this.close.emit(); - } - - onSave() { - this.resultComponent.ngOnInit(); - this.resultComponent.save(); - } - -} diff --git a/@overflow/discovery/component/temp/setting.component.1.html b/@overflow/discovery/component/temp/setting.component.1.html deleted file mode 100644 index 6e964be..0000000 --- a/@overflow/discovery/component/temp/setting.component.1.html +++ /dev/null @@ -1,124 +0,0 @@ -
- - -
- -
- {{probe.cidr}} -
- -
- -
- -
-
-
- -
-
- -
-
- - - - -
-
- - - - -
-
- - -
-
- -
-
-
- TCP   - -
-
- UDP   - -
-
-
- -
-
- - - - -
- -
- - - - -
-
- - -
-
- -
- - - -
- -
-
- - -
-
- -
-
- - - -
- - - - - -
- -
- - -
- - -
- - - - - -
\ No newline at end of file diff --git a/@overflow/discovery/component/temp/setting.component.1.ts b/@overflow/discovery/component/temp/setting.component.1.ts deleted file mode 100644 index 567522b..0000000 --- a/@overflow/discovery/component/temp/setting.component.1.ts +++ /dev/null @@ -1,793 +0,0 @@ -import { Component, OnInit, AfterContentInit, Output, EventEmitter, Input, OnDestroy } from '@angular/core'; -import { Store, select, StateObservable } from '@ngrx/store'; -import { RPCClientError } from '@loafer/ng-rpc'; -import { - DiscoveryStartInfo, - DiscoverZone, - Zone, - DiscoverPort, - DiscoverService -} from '@overflow/commons-typescript/model/discovery'; -import * as CIDR from 'ip-cidr'; -import * as DiscoveredStore from '../../store/setting'; -import { SettingSelector, DiscoverSelector } from '../../store'; -import * as DiscoverStore from '../../store/discover'; -import * as RegistStore from '../../store/regist'; -import { Host } from '@overflow/commons-typescript/model/discovery'; -import { Port } from '@overflow/commons-typescript/model/discovery'; -import { Service } from '@overflow/commons-typescript/model/discovery'; -import * as ProbeDetailStore from '@overflow/probe/store'; -import { Probe } from '@overflow/commons-typescript/model/probe'; -import { TreeNode } from 'primeng/primeng'; -import { ListSelector as ProbeListSelector } from '@overflow/probe/store'; -import * as ProbeListStore from '@overflow/probe/store/list'; -import { AuthSelector } from '@overflow/member/store'; -import { Domain } from '@overflow/commons-typescript/model/domain'; -import { Subscription } from 'rxjs/Subscription'; - -@Component({ - selector: 'of-discovery-setting', - templateUrl: './setting.component.html', -}) -export class SettingComponent implements OnInit, AfterContentInit, OnDestroy { - - @Input() probe: Probe; /* To determine valid range. */ - @Output() close = new EventEmitter(); - - settingSucceed$: any; - discoveryResult$: any; - - discoveryReq$: any; - discoveryStart$: any; - discoveryEnd$: any; - - started = false; - - startIP; - endIP; - startPort; - endPort; - hostChecked = ['host']; - portChecked = []; - serviceChecked = []; - tcpChecked = true; - udpChecked = true; - includeServices = []; - - treeNodes = []; - selectedNodes = []; - zones: Map = null; - - checkedSet = new Set(); - - testObj: any[] = testDiscovery; - selectedDiscoveryResult: TreeNode[]; - - constructor( - private discoverdstore: Store, - private discoverstore: Store, - private registStore: Store, - private probeListStore: Store - ) { - this.settingSucceed$ = discoverdstore.pipe(select(SettingSelector.select('isStart'))); - this.discoveryResult$ = discoverstore.pipe(select(DiscoverSelector.select('zones'))); - this.discoveryReq$ = discoverstore.pipe(select(DiscoverSelector.select('isReq'))); - this.discoveryStart$ = discoverstore.pipe(select(DiscoverSelector.select('isStart'))); - this.discoveryEnd$ = discoverstore.pipe(select(DiscoverSelector.select('isEnd'))); - } - - ngOnInit() { - - // this.settingSucceed$.subscribe( - // (succeed: boolean) => { - // if (succeed) { - // this.started = true; - // } - // }, - // (error: RPCClientError) => { - // console.log(error.response.message); - // } - // ); - - // this.discoveryResult$.subscribe( - // (zones: Map) => { - - // if (zones !== undefined && zones !== null) { - // console.log('ZoneZoneZoneZoneZoneZoneZone'); - // // console.log(JSON.stringify(zones)); - // this.treeNodes = this.convertTreeViewZone(zones); - // this.zones = zones; - // } - - // }, - // (error: RPCClientError) => { - // console.log(error.response.message); - // } - // ); - - // this.discoveryReq$.subscribe( - // (isReq: boolean) => { - - // if (isReq !== undefined && isReq !== null) { - // console.log('isReqisReqisReqisReq'); - // } - - // }, - // (error: RPCClientError) => { - // console.log(error.response.message); - // } - // ); - - // this.discoveryStart$.subscribe( - // (isStart: boolean) => { - - // if (isStart !== undefined && isStart !== null) { - // console.log('isStartisStartisStart'); - // } - - // }, - // (error: RPCClientError) => { - // console.log(error.response.message); - // } - // ); - - // this.discoveryEnd$.subscribe( - // (isEnd: boolean) => { - - // if (isEnd !== undefined && isEnd !== null) { - // console.log('isEndisEndisEndisEnd'); - // } - - // }, - // (error: RPCClientError) => { - // console.log(error.response.message); - // } - // ); - } - - ngAfterContentInit() { - if (this.probe === undefined || this.probe === null) { - } else { - this.hostRange(); - this.portRange(); - } - } - - ngOnDestroy() { - } - - - onProbeSelect(event) { - this.probe = event.value; - this.hostRange(); - this.portRange(); - } - - closeDialog() { - this.close.emit(); - } - - isZone(zone: Zone): boolean { - - // for (let i = 0; i < this.treeNodes.length; ++i) { - // if (zone.iface === this.treeNodes[i].iface) { - // return true; - // } - // } - - return false; - } - - - hostRange() { - const cidr = new CIDR(this.probe.cidr); - if (!cidr.isValid()) { - alert('Invalid cidr : ' + this.probe.cidr); - return; - } - this.startIP = cidr.addressStart.address; - this.endIP = cidr.addressEnd.address; - } - - portRange() { - this.startPort = '1'; - this.endPort = '1024'; - } - - handleHostCheckChange(e: any) { - this.hostChecked = ['host']; - } - - handlePortCheckChange(e: any) { - this.serviceChecked = []; - } - - handleServiceCheckChange(e: any) { - if (e) { - this.portChecked = ['port']; - } - } - - handleServiceChange(list: any) { - this.includeServices = list; - } - - discovery() { - console.log(this.startIP); - console.log(this.startPort); - console.log(this.endPort); - - let discoverPort: DiscoverPort = null; - let discoverService: DiscoverService = null; - - if (this.serviceChecked.length > 0) { - const services = new Array(); - for (const service of this.includeServices) { - services.push(service.name); - } - discoverService = { - includeServices: services, - }; - } - if (this.portChecked.length > 0) { - discoverPort = { - firstScanRange: this.startPort, - lastScanRange: this.endPort, - includeTCP: this.tcpChecked, - includeUDP: this.udpChecked, - excludePorts: null, - discoverService: discoverService - }; - } - const discoverZone: DiscoverZone = { - discoverHost: { - firstScanRangev4: this.startIP, - lastScanRangev4: this.endIP, - discoverPort: discoverPort, - }, - }; - - - console.log(discoverZone); - - // console.log('start discovery - ' + this.probe.probeKey); - this.discoverstore.dispatch(new DiscoverStore.DiscoverZone( - { probeID: this.probe.probeKey, discoverZone: discoverZone })); - - this.started = true; - } - - checkDiscoveryResult(node) { - - node.toggleActivated(true); - - if (node.isActive) { - if (node.data.obj !== undefined) { - node.data.obj.target = true; - } - } else { - if (node.data.obj !== undefined) { - node.data.obj.target = false; - } - } - - console.log(this.zones); - - } - - convertMapToList(map: Map): Array { - - if (undefined === map || null === map || map.size < 0) { - return null; - } - - const retArr = new Array(); - - map.forEach((v: any, k: any) => { - retArr.push(v); - }); - - return retArr; - } - - - discoveryResultSave() { - // console.log(this.checkedSet); - - // send discovery save this.zones; - - // this.registStore.dispatch(new DiscoverStore.DiscoverZone( - // {probeID: '52abd6fd57e511e7ac52080027658d13', discoveryZone: discoveryZone})); - - // console.log(this.zones); - // isTarget Check - - - for (const sn of this.selectedNodes) { - if (sn.obj !== undefined && sn.obj !== null) { - if (sn.obj.target !== undefined && sn.obj.target !== null) { - sn.obj.target = true; - } - } - } - - this.zones.forEach((zone: Zone, key: string) => { - if (zone.hosts !== undefined && zone.hosts !== null && zone.hosts.size > 0) { - // FIXME: getHosts - const hosts: Host[] = []; - zone.hosts.forEach((h: Host, hKey: string) => { - - h.zone = null; - if (h.ports !== undefined && h.ports !== null) { - h.portList = []; - h.ports.forEach((p: Port, pKey: number) => { - - p.host = null; - if (p.services !== undefined && p.services !== null) { - p.serviceList = []; - - p.services.forEach((s: Service, sKey: string) => { - s.port = null; - - p.serviceList.push(s); - }); - - } - - h.portList.push(p); - }); - } - - hosts.push(h); - }); - - if (hosts.length > 0) { - const sd: any = { hosts: hosts, probe: { id: 1 } }; - console.log(JSON.stringify(sd)); - console.log('--------'); - this.registStore.dispatch(new RegistStore.DiscoverySaveAllTarget(sd)); - } - - } - }); - } - - handleClick(event) { - // console.log(this.filesTree4); - - this.checkTarget(this.selectedDiscoveryResult); - - console.log(this.testObj); - - } - - checkTarget(treeList: any[]) { - - if (treeList === undefined || treeList === null) { - return; - } - - for (let i = 0; i < treeList.length; ++i) { - treeList[i].obj.target = true; - - this.checkTarget(treeList[i].children); - } - - } - - convertTreeViewZone(zones: Map) { - - if (zones === undefined || zones === null) { - return; - } - - // console.log('convertTreeViewZone'); - const treeNodes: any[] = []; - - zones.forEach((value: Zone, key: string, map) => { - if (this.isZone(value)) { - return; - } - const jZone: any = { - label: 'Zone - ' + value.iface, - // className: 'cn' + value.ip, - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jZone.obj = value; - jZone.children = this.convertViewHost(value.hosts); - treeNodes.push(jZone); - }); - - return treeNodes; - } - - convertViewHost(hosts): any[] { - - if (hosts === undefined || hosts === null) { - return null; - } - - - const hostNodes: any[] = []; - - hosts.forEach((host, hostKey) => { - - const jHost: any = { - label: 'Host - ' + host.ipv4, - // className: 'cn' + host.ip - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jHost.obj = host; - - jHost.children = this.convertViewPort(host.ports); - - hostNodes.push(jHost); - - }); - - return hostNodes; - - } - - convertViewPort(ports): any[] { - - if (ports === undefined || ports === null || ports.size < 0) { - return null; - } - - const portChildren: any[] = []; - - ports.forEach((port, portKey) => { - - const jPort: any = { - label: 'Port - ' + port.portNumber, - // className: 'cn' + port.portNumber, - expandedIcon: 'fa-folder-open', - collapsedIcon: 'fa-folder', - }; - jPort.obj = port; - - jPort.children = this.convertViewService(port.services); - - portChildren.push(jPort); - }); - - - return portChildren; - } - - convertViewService(services): any[] { - - if (services === undefined || services === null || services.size <= 0) { - return null; - } - - const serviceChildren: any[] = []; - - services.forEach((service, serviceKey) => { - const jService: any = { - label: 'Service - ' + service.serviceName, - // className: 'cn' + service.serviceName, - }; - jService.obj = service; - - serviceChildren.push(jService); - }); - - return serviceChildren; - } - -} - - -const testDiscovery: any[] = [ - { - id: 0, - ip: '192.168.1.254', - mac: '64:e5:99:63:e7:80', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'UDP', - portNumber: 53, - discoveredDate: -62135596800000, - host: null, - services: [ - { - id: 0, - cryptoType: null, - serviceName: 'DNS', - discoveredDate: -62135596800000, - port: null, - target: false - } - ] - } - ] - }, - { - id: 0, - ip: '192.168.1.99', - mac: '00:25:b3:fa:ca:9b', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'UDP', - portNumber: 161, - discoveredDate: -62135596800000, - host: null, - services: [ - { - id: 0, - cryptoType: null, - serviceName: 'SNMP_V2', - discoveredDate: -62135596800000, - port: null, - target: false - } - ] - }, - { - id: 0, - portType: 'TCP', - portNumber: 7, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.206', - mac: '30:9c:23:15:a3:09', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: null - }, - { - id: 0, - ip: '192.168.1.50', - mac: '6c:f0:49:7a:60:68', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'TCP', - portNumber: 22, - discoveredDate: -62135596800000, - host: null, - services: [ - { - id: 0, - cryptoType: 'TCP', - serviceName: 'SSH', - discoveredDate: -62135596800000, - port: null, - target: false - } - ] - } - ] - }, - { - id: 0, - ip: '192.168.1.15', - mac: '00:19:b9:35:8e:a6', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'TCP', - portNumber: 22, - discoveredDate: -62135596800000, - host: null, - services: null - }, - { - id: 0, - portType: 'TCP', - portNumber: 25, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.100', - mac: '00:17:08:8d:cf:f7', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'UDP', - portNumber: 161, - discoveredDate: -62135596800000, - host: null, - services: [ - { - id: 0, - cryptoType: null, - serviceName: 'SNMP_V2', - discoveredDate: -62135596800000, - port: null, - target: false - } - ] - }, - { - id: 0, - portType: 'TCP', - portNumber: 23, - discoveredDate: -62135596800000, - host: null, - services: null - }, - { - id: 0, - portType: 'TCP', - portNumber: 21, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.16', - mac: '00:19:b9:19:7e:c7', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'TCP', - portNumber: 22, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.106', - mac: '44:8a:5b:f1:3a:7d', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'UDP', - portNumber: 161, - discoveredDate: -62135596800000, - host: null, - services: [ - { - id: 0, - cryptoType: null, - serviceName: 'SNMP_V2', - discoveredDate: -62135596800000, - port: null, - target: false - } - ] - }, - { - id: 0, - portType: 'TCP', - portNumber: 21, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.101', - mac: '44:8a:5b:f1:f1:f3', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: null - }, - { - id: 0, - ip: '192.168.1.102', - mac: '44:8a:5b:f1:f2:d3', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: null - }, - { - id: 0, - ip: '192.168.1.205', - mac: '40:98:ad:7b:d0:43', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: null - }, - { - id: 0, - ip: '192.168.1.103', - mac: '44:8a:5b:44:8c:e8', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'TCP', - portNumber: 21, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.10', - mac: 'd0:50:99:97:5d:99', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: [ - { - id: 0, - portType: 'TCP', - portNumber: 22, - discoveredDate: -62135596800000, - host: null, - services: null - } - ] - }, - { - id: 0, - ip: '192.168.1.203', - mac: 'a8:e5:39:5b:c9:62', - os: null, - discoveredDate: -62135596800000, - target: false, - zone: null, - ports: null - } -]; - diff --git a/@overflow/infra/component/map/map.component.ts b/@overflow/infra/component/map/map.component.ts index ff1e000..5a804c6 100644 --- a/@overflow/infra/component/map/map.component.ts +++ b/@overflow/infra/component/map/map.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, - AfterViewInit, AfterContentInit, ViewChild } from '@angular/core'; @@ -10,10 +9,8 @@ import { TreeNode, MenuItem, ContextMenu } from 'primeng/primeng'; import { Store, select } from '@ngrx/store'; import * as ListStore from '../../store/list'; import { ListSelector } from '../../store'; -// import { Page, PageParams } from 'app/commons/model'; -import { RPCClientError } from '@loafer/ng-rpc'; import { Target } from '@overflow/commons-typescript/model/target'; -import { Infra, InfraHost, InfraOSApplication, InfraService } from '@overflow/commons-typescript/model/infra'; +import { Infra, InfraHost, InfraService } from '@overflow/commons-typescript/model/infra'; import { Domain } from '@overflow/commons-typescript/model/domain'; import { AuthSelector } from '@overflow/member/store'; @@ -22,7 +19,6 @@ import { sensorListSelector } from '@overflow/sensor/store'; import * as SensorListStore from '@overflow/sensor/store/list'; import { Sensor } from '@overflow/commons-typescript/model/sensor'; -import * as _ from 'lodash'; interface HostData { id: string; diff --git a/package.json b/package.json index 7daee9e..f82c95d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "@loafer/ng-rpc": "^0.0.1", "@ngrx/core": "^1.2.0", "@ngrx/effects": "^5.2.0", - "@ngrx/entity": "^5.2.0", "@ngrx/router-store": "^5.2.0", "@ngrx/store": "^5.2.0", "@ngrx/store-devtools": "^5.2.0", @@ -43,20 +42,15 @@ "angularx-qrcode": "^1.1.7", "chart.js": "^2.7.2", "core-js": "^2.5.4", - "fullcalendar": "^3.9.0", "ip-cidr": "^1.1.2", "jquery": "^3.3.1", - "moment": "^2.22.0", - "ngrx-store-logger": "^0.2.1", "ngx-cookie-service": "^1.0.10", "openssl": "^1.1.0", "primeng": "^5.2.4", - "quill": "^1.3.6", "reflect-metadata": "^0.1.12", "rxjs": "^6.0.0", "rxjs-compat": "^6.0.0", "rxjs-fetch": "^2.1.6", - "web-animations-js": "^2.3.1", "zone.js": "^0.8.26" }, "devDependencies": { @@ -80,4 +74,4 @@ "tslint": "~5.9.1", "typescript": "~2.7.2" } -} +} \ No newline at end of file diff --git a/src/app/pages/account/account-page.component.ts b/src/app/pages/account/account-page.component.ts index 5b5cc48..97ea06c 100644 --- a/src/app/pages/account/account-page.component.ts +++ b/src/app/pages/account/account-page.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; @Component({ selector: 'of-pages-account', @@ -7,7 +6,7 @@ import { Router, ActivatedRoute } from '@angular/router'; }) export class AccountPageComponent implements OnInit { - constructor(private route: ActivatedRoute, private router: Router) { + constructor() { } ngOnInit() { diff --git a/src/app/pages/auth/reset-password/modify-password-page.component.ts b/src/app/pages/auth/reset-password/modify-password-page.component.ts index d099e26..078f350 100644 --- a/src/app/pages/auth/reset-password/modify-password-page.component.ts +++ b/src/app/pages/auth/reset-password/modify-password-page.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Form, FormBuilder, FormGroup, FormGroupDirective, FormControl, NgForm, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'of-pages-modify-password', @@ -10,7 +9,6 @@ export class ModifyPasswordPageComponent implements OnInit { toenURL: string; constructor( - private router: Router, private activatedRoute: ActivatedRoute, ) { } diff --git a/src/app/pages/auth/signin/signin-page.component.ts b/src/app/pages/auth/signin/signin-page.component.ts index 21b3d16..9375181 100644 --- a/src/app/pages/auth/signin/signin-page.component.ts +++ b/src/app/pages/auth/signin/signin-page.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Form, FormBuilder, FormGroup, FormGroupDirective, FormControl, NgForm, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; @Component({ @@ -12,7 +11,6 @@ export class SigninPageComponent implements OnInit { returnURL: string; constructor( - private router: Router, private activatedRoute: ActivatedRoute, ) { } diff --git a/src/app/pages/auth/signup/signup-page.component.ts b/src/app/pages/auth/signup/signup-page.component.ts index bae282d..e0bd121 100644 --- a/src/app/pages/auth/signup/signup-page.component.ts +++ b/src/app/pages/auth/signup/signup-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Form, FormBuilder, FormGroup, FormGroupDirective, FormControl, NgForm, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; +import { FormGroup } from '@angular/forms'; @Component({ selector: 'of-pages-auth-signup', @@ -12,7 +12,6 @@ export class SignupPageComponent implements OnInit { returnURL: string; constructor( - private router: Router, private activatedRoute: ActivatedRoute, ) { } diff --git a/src/app/pages/probes/probe-tab-page.component.ts b/src/app/pages/probes/probe-tab-page.component.ts index dcb761d..4043d2d 100644 --- a/src/app/pages/probes/probe-tab-page.component.ts +++ b/src/app/pages/probes/probe-tab-page.component.ts @@ -8,7 +8,7 @@ import { Subscription } from 'rxjs/Subscription'; }) export class ProbeTabPageComponent implements OnDestroy { - private tabs = undefined; + protected tabs; private routerSubscription$: Subscription; constructor(