overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
insanity 2018-06-04 18:25:48 +09:00
parent 9990650925
commit a2021b84e0
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
@overflow/discovery/component/discovery.component.ts
View File

@ -55,10 +55,10 @@ export class DiscoveryComponent implements OnDestroy {
onRequestDiscovery(dz: DiscoverZone) { onRequestDiscovery(dz: DiscoverZone) {
this.requested = true; this.requested = true;
this.discoverZone = dz; this.discoverZone = dz;
// this.discoveryService.discoverZone(this.selectedProbe.probe.probeKey, dz);
this.discoveryService.discoverZone(this.selectedProbe.probe.probeKey, dz);
this.discoverySubscription = this.discoverySubscriber.observable().pipe( this.discoverySubscription = this.discoverySubscriber.observable().pipe(
tap(() => {
}),
map((discoveryNotify: DiscoveryNotify) => { map((discoveryNotify: DiscoveryNotify) => {
switch (discoveryNotify.method) { switch (discoveryNotify.method) {
case 'DiscoveryService.discoveryStart': { case 'DiscoveryService.discoveryStart': {

2
@overflow/discovery/component/search-filter.component.html
View File

@ -1,6 +1,6 @@
<div class="ui-g"> <div class="ui-g">
<input #filterWord type="text" [(ngModel)]="searchWord" pInputText (keyup)="onSearch($event)"/> <input type="text" pInputText placeholder="Search..." [(ngModel)]="searchWord" (keyup)="onSearch($event)">
<div class="ui-g" @discoveryResultAnim> <div class="ui-g" @discoveryResultAnim>
<p-toggleButton *ngFor="let service of services" offLabel="{{service.description}}" onLabel="{{service.description}}" [style]="{'width':'150px'}"></p-toggleButton> <p-toggleButton *ngFor="let service of services" offLabel="{{service.description}}" onLabel="{{service.description}}" [style]="{'width':'150px'}"></p-toggleButton>

16
@overflow/discovery/component/search-result.component.html
View File

@ -16,18 +16,26 @@
<!-- HOST node template --> <!-- HOST node template -->
<ng-template let-node pTemplate="HOST"> <ng-template let-node pTemplate="HOST">
<div @discoveryResultAnim> <div @discoveryResultAnim>
<div> <div *ngIf="checkUnhighligt(node.label) else normHost">
<div>{{node.label}}</div>
</div>
<ng-template #normHost>
<p-toggleButton onLabel="{{node.label}} {{node.data.openPorts.length}}" offLabel="{{node.label}} {{node.data.openPorts.length}}" <p-toggleButton onLabel="{{node.label}} {{node.data.openPorts.length}}" offLabel="{{node.label}} {{node.data.openPorts.length}}"
onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node.data)"></p-toggleButton> onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node.data)"></p-toggleButton>
</div> </ng-template>
</div> </div>
</ng-template> </ng-template>
<!-- SERVICE node template --> <!-- SERVICE node template -->
<ng-template let-node pTemplate="SERVICE"> <ng-template let-node pTemplate="SERVICE">
<div @discoveryResultAnim> <div @discoveryResultAnim>
<p-toggleButton onLabel="{{node.label}} {{node.data.portType}} {{node.data.portNumber}}" offLabel="{{node.label}} {{node.data.portType}} {{node.data.portNumber}}" <div *ngIf="checkUnhighligt(node.label) else normService">
onIcon="fa-check" offIcon="fa-square" [style]="{'width':'300px'}" (onChange)="onTargetSelect($event, node.data)"></p-toggleButton> <div>{{node.label}} {{node.data.portType}}</div>
</div>
<ng-template #normService>
<p-toggleButton onLabel="{{node.label}} {{node.data.portType}}" offLabel="{{node.label}} {{node.data.portType}} {{node.data.portNumber}}"
onIcon="fa-check" offIcon="fa-square" [style]="{'width':'300px'}" (onChange)="onTargetSelect($event, node.data)"></p-toggleButton>
</ng-template>
</div> </div>
</ng-template> </ng-template>

16
@overflow/discovery/component/search-result.component.ts
View File

@ -76,11 +76,12 @@ export class SearchResultComponent implements OnInit {
} }
tempService() { tempService() {
const randStr = Math.random().toString(36).substr(2, 5);
const idx = Math.floor(Math.random() * (255)); const idx = Math.floor(Math.random() * (255));
const hostId = Math.floor(Math.random() * (this.tempHostId - 1)); const hostId = Math.floor(Math.random() * (this.tempHostId - 1));
const service: Service = { const service: Service = {
id: idx, id: idx,
serviceName: 'Service', serviceName: String(randStr),
port: { port: {
portNumber: idx, portNumber: idx,
portType: idx % 2 === 0 ? 'TCP' : 'UDP', portType: idx % 2 === 0 ? 'TCP' : 'UDP',
@ -111,9 +112,10 @@ export class SearchResultComponent implements OnInit {
const idx = this.findServiceIndex(targetHostNode.children, service); const idx = this.findServiceIndex(targetHostNode.children, service);
targetHostNode.children[idx] = { targetHostNode.children[idx] = {
type: 'SERVICE', type: 'SERVICE',
label: service.serviceName, label: service.serviceName + ' (' + service.port.portNumber + ')',
data: { data: {
id: service.id, id: service.id,
name: service.serviceName,
portType: service.port.portType, portType: service.port.portType,
portNumber: service.port.portNumber, portNumber: service.port.portNumber,
}, },
@ -154,6 +156,9 @@ export class SearchResultComponent implements OnInit {
if (node.data.portNumber < service.port.portNumber) { if (node.data.portNumber < service.port.portNumber) {
index++; index++;
} }
// if (!node.data.name.toUpperCase().localeCompare(service.serviceName.toUpperCase())) {
// index++;
// }
}); });
return index; return index;
} }
@ -178,7 +183,10 @@ export class SearchResultComponent implements OnInit {
}); });
} }
checkFilter(label: string) { checkUnhighligt(label: string) {
return label.indexOf(this.filterWord) > 0 ? true : false; if (this.filterWord && label.indexOf(this.filterWord) === -1) {
return true;
}
return false;
} }
} }