This commit is contained in:
crusader 2018-05-24 15:44:13 +09:00
parent b69539d368
commit d59d9379f9
514 changed files with 4868 additions and 8262 deletions

View File

@ -1,73 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "overflow-member-webapp"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"upload.php"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "of",
"styles": [
"../node_modules/primeng/resources/primeng.min.css",
"../node_modules/fullcalendar/dist/fullcalendar.min.css",
"../node_modules/quill/dist/quill.snow.css",
"styles.scss"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/moment/moment.js",
"../node_modules/chart.js/dist/Chart.js",
"../node_modules/fullcalendar/dist/fullcalendar.js",
"../node_modules/quill/dist/quill.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {},
"serve": {
"host": "0.0.0.0",
"port": 4200
}
}
}

View File

@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
// import { InputChipModule } from 'packages/commons/component/input-chip/input-chip.module';
// import { InputChipModule } from '@overflow/commons/component/input-chip/input-chip.module';
// import { DiscoveryStoreModule } from './discovery-store.module';
// import { DiscoveryRPCModule } from './discovery-rpc.module';
@ -11,7 +11,7 @@ import { AlertLoggerModule } from './alert-logger.module';
import { COMPONENTS } from './component';
// import { SERVICES } from './service';
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
@NgModule({
imports: [

View File

@ -1,8 +1,8 @@
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import * as ListStore from 'packages/meta/crawler/store/list';
import { ReadAllCrawlerSelector } from 'packages/meta/crawler/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';

View File

@ -3,12 +3,12 @@ import {
EventEmitter, OnDestroy, OnChanges, SimpleChanges, ViewChild
} from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import * as ListStore from 'packages/probe/store/list';
import { ListSelector } from 'packages/probe/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 'packages/member/store';
import { AuthSelector } from '@overflow/member/store';
import { Domain } from '@overflow/commons-typescript/model/domain';
import { Dropdown } from 'primeng/primeng';

View File

@ -1,13 +1,13 @@
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { Subscription } from 'rxjs/Subscription';
import { TreeNode } from 'primeng/primeng';
import * as DiscoveredStore from 'packages/discovery/store/setting';
import { SettingSelector, DiscoverSelector } from 'packages/discovery/store';
import * as DiscoverStore from 'packages/discovery/store/discover';
import * as RegistStore from 'packages/discovery/store/regist';
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';

View File

@ -1,7 +1,7 @@
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/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import {
DiscoveryStartInfo,
DiscoverZone,
@ -17,12 +17,12 @@ 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 'packages/probe/store';
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 'packages/probe/store';
import * as ProbeListStore from 'packages/probe/store/list';
import { AuthSelector } from 'packages/member/store';
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';

View File

@ -1,8 +1,8 @@
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import * as ListStore from 'packages/meta/crawler/store/list';
import { ReadAllCrawlerSelector } from 'packages/meta/crawler/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';

View File

@ -3,12 +3,12 @@ import {
EventEmitter, OnDestroy, ViewChild
} from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import * as ListStore from 'packages/probe/store/list';
import { ListSelector } from 'packages/probe/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 'packages/member/store';
import { AuthSelector } from '@overflow/member/store';
import { Domain } from '@overflow/commons-typescript/model/domain';
import { Dropdown } from 'primeng/primeng';

View File

@ -1,13 +1,13 @@
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { Subscription } from 'rxjs/Subscription';
import { TreeNode } from 'primeng/primeng';
import * as DiscoveredStore from 'packages/discovery/store/setting';
import { SettingSelector, DiscoverSelector } from 'packages/discovery/store';
import * as DiscoverStore from 'packages/discovery/store/discover';
import * as RegistStore from 'packages/discovery/store/regist';
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';

View File

@ -1,13 +1,13 @@
import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy, OnChanges, SimpleChanges } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { Subscription } from 'rxjs/Subscription';
import { TreeNode } from 'primeng/primeng';
import * as DiscoveredStore from 'packages/discovery/store/setting';
import { SettingSelector, DiscoverSelector } from 'packages/discovery/store';
import * as DiscoverStore from 'packages/discovery/store/discover';
import * as RegistStore from 'packages/discovery/store/regist';
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';

View File

@ -13,7 +13,7 @@ import { ResultComponent } from './result/result.component';
import { ProbeSelectorComponent } from './probe-selector/probe-selector.component';
import { FilterComponent } from './filter/filter.component';
import { trigger, state, transition, style, animate } from '@angular/core';
import { trigger, state, transition, style, animate } from '@angular/animations';
@Component({
selector: 'of-discovery-setting',

View File

@ -1,6 +1,6 @@
import { Component, OnInit, AfterContentInit, Output, EventEmitter, Input, OnDestroy } from '@angular/core';
import { Store, select, StateObservable } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import {
DiscoveryStartInfo,
DiscoverZone,
@ -16,12 +16,12 @@ 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 'packages/probe/store';
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 'packages/probe/store';
import * as ProbeListStore from 'packages/probe/store/list';
import { AuthSelector } from 'packages/member/store';
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';

View File

@ -7,7 +7,7 @@ import {
@NgModule({
imports: [
RPCModule.forFeature({subscribers: SUBSCRIBERS}),
RPCModule.forFeature(SUBSCRIBERS),
],
})
export class DiscoveryRPCModule { }

View File

@ -8,8 +8,7 @@ import { DiscoveryLoggerModule } from './discovery-logger.module';
import { COMPONENTS } from './component';
import { SERVICES } from './service';
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
import { KeyValueModule } from 'app/commons/component/key-value/key-value.module';
import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
import { BrowserModule } from '@angular/platform-browser';
@NgModule({
@ -21,7 +20,6 @@ import { BrowserModule } from '@angular/platform-browser';
DiscoveryStoreModule,
DiscoveryRPCModule,
DiscoveryLoggerModule,
KeyValueModule,
],
declarations: [
COMPONENTS

View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { RPCService } from '@loafer/ng-rpc/service';
import { RPCService } from '@loafer/ng-rpc';
import {
DiscoveryStartInfo,
DiscoverZone as MDDiscoverZone,

View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { RPCService } from '@loafer/ng-rpc/service';
import { RPCService } from '@loafer/ng-rpc';
import {
DiscoveryStartInfo,
DiscoverZone as MDDiscoverZone,

View File

@ -1,4 +1,4 @@
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { Zone } from '@overflow/commons-typescript/model/discovery';

View File

@ -5,7 +5,7 @@ import {
Selector,
} from '@ngrx/store';
import { StateSelector } from 'packages/core/ngrx/store';
import { StateSelector } from '@overflow/core/ngrx/store';
import { MODULE } from '../discovery.constant';

View File

@ -1,6 +1,6 @@
import { Action } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import {
Zone,

View File

@ -14,7 +14,7 @@ import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/take';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { DiscoveryStartInfo } from '@overflow/commons-typescript/model/discovery';
import { TargetDiscoveryService } from '../../service/target-discovery.service';

View File

@ -1,4 +1,4 @@
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { DiscoveryStartInfo } from '@overflow/commons-typescript/model/discovery';

View File

@ -1,6 +1,6 @@
import { Action } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { DiscoveryStartInfo } from '@overflow/commons-typescript/model/discovery';

View File

@ -14,7 +14,7 @@ import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/take';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { DiscoveryStartInfo } from '@overflow/commons-typescript/model/discovery';
import { DiscoveryService } from '../../service/discovery.service';

View File

@ -1,4 +1,4 @@
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import { DiscoveryStartInfo } from '@overflow/commons-typescript/model/discovery';

View File

@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { Store, select } from '@ngrx/store';
import { RPCSubscriber } from '@loafer/ng-rpc/decorator';
import { LoggerService } from '@loafer/ng-logger/service';
import { RPCSubscriber } from '@loafer/ng-rpc';
import { LoggerService } from '@loafer/ng-logger';
import * as DiscoverStore from '../store/discover';

View File

@ -10,16 +10,16 @@ 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/protocol';
// 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 { Domain } from '@overflow/commons-typescript/model/domain';
import { AuthSelector } from 'packages/member/store';
import { AuthSelector } from '@overflow/member/store';
import { sensorListSelector } from 'packages/sensor/store';
import { sensorListSelector } from '@overflow/sensor/store';
import * as SensorListStore from 'packages/sensor/store/list';
import * as SensorListStore from '@overflow/sensor/store/list';
import { Sensor } from '@overflow/commons-typescript/model/sensor';
import * as _ from 'lodash';
@ -75,14 +75,14 @@ export class MapComponent implements OnInit, AfterContentInit {
this.listStore.select(AuthSelector.select('domain')).subscribe(
(domain: Domain) => {
const pageParams: PageParams = {
pageNo: '0',
countPerPage: '99999',
sortCol: 'id',
sortDirection: 'descending'
};
// const pageParams: PageParams = {
// pageNo: '0',
// countPerPage: '99999',
// sortCol: 'id',
// sortDirection: 'descending'
// };
this.listStore.dispatch(new ListStore.ReadAllByDomain({ domain: domain, pageParams: pageParams }));
// this.listStore.dispatch(new ListStore.ReadAllByDomain({ domain: domain, pageParams: pageParams }));
},
(error) => {
console.log(error);
@ -91,28 +91,28 @@ export class MapComponent implements OnInit, AfterContentInit {
}
ngOnInit() {
this.infras$.subscribe(
(page: Page) => {
if (page !== null) {
this.totalList = page.content;
this.infraTree = this.generateInfraHostData();
}
},
(error: RPCClientError) => {
console.log(error.response.message);
});
// this.infras$.subscribe(
// (page: Page) => {
// if (page !== null) {
// this.totalList = page.content;
// this.infraTree = this.generateInfraHostData();
// }
// },
// (error: RPCClientError) => {
// console.log(error.response.message);
// });
this.sensors$.subscribe(
(page: Page) => {
if (page !== null) {
const sensorList = page.content;
this.addTreeForSensor(sensorList);
}
},
(error: RPCClientError) => {
console.log(error.response.message);
}
);
// this.sensors$.subscribe(
// (page: Page) => {
// if (page !== null) {
// const sensorList = page.content;
// this.addTreeForSensor(sensorList);
// }
// },
// (error: RPCClientError) => {
// console.log(error.response.message);
// }
// );
this.initContextMenu();
}
@ -357,14 +357,14 @@ export class MapComponent implements OnInit, AfterContentInit {
getSensorByInfra(infra: Infra) {
const pageParams: PageParams = {
pageNo: '0',
countPerPage: '10',
sortCol: 'id',
sortDirection: 'descending'
};
// const pageParams: PageParams = {
// pageNo: '0',
// countPerPage: '10',
// sortCol: 'id',
// sortDirection: 'descending'
// };
this.sensorListStore.dispatch(new SensorListStore.ReadAllByInfra({ id: String(infra.id), pageParams: pageParams }));
// this.sensorListStore.dispatch(new SensorListStore.ReadAllByInfra({ id: String(infra.id), pageParams: pageParams }));
}

View File

@ -1,9 +1,9 @@
import { Component, OnInit, AfterContentInit, Input, OnChanges } from '@angular/core';
import { Store, select } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc/protocol';
import { RPCClientError } from '@loafer/ng-rpc';
import * as DetailStore from 'packages/probe/store/probe-host';
import { ProbeHostSelector } from 'packages/probe/store';
import * as DetailStore from '@overflow/probe/store/probe-host';
import { ProbeHostSelector } from '@overflow/probe/store';
import { Probe, ProbeHost } from '@overflow/commons-typescript/model/probe';

Some files were not shown because too many files have changed in this diff Show More