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

noauth

Browse Source
This commit is contained in:
insanity 2018-06-14 16:42:04 +09:00
parent cd0745c362
commit bb38d922e4
10 changed files with 77 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
@overflow/infra/component/infra-host-ips.component.html
View File

@ -8,6 +8,8 @@
<p-table *ngIf="infraHostIPs" [value]="infraHostIPs" selectionMode="single" (onRowSelect)="select.emit($event.data)" [resizableColumns]="true"> <p-table *ngIf="infraHostIPs" [value]="infraHostIPs" selectionMode="single" (onRowSelect)="select.emit($event.data)" [resizableColumns]="true">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
<tr> <tr>
<th style="width: 3.25em">
</th>
<th>Interface</th> <th>Interface</th>
<th style="width:3em">Ver.</th> <th style="width:3em">Ver.</th>
<th>Address</th> <th>Address</th>
@ -15,8 +17,11 @@
<th>Gateway</th> <th>Gateway</th>
</tr> </tr>
</ng-template> </ng-template>
<ng-template pTemplate="body" let-rowData> <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
<tr [pSelectableRow]="rowData"> <tr [pSelectableRow]="rowData">
<td>
<p-tableRadioButton [value]="rowData" [disabled]="rowData.metaIPType.key !== 'V4'"></p-tableRadioButton>
</td>
<td>{{rowData.iface}}</td> <td>{{rowData.iface}}</td>
<td>{{rowData.metaIPType.key}}</td> <td>{{rowData.metaIPType.key}}</td>
<td>{{rowData.address}}</td> <td>{{rowData.address}}</td>

7
@overflow/noauth-probe/component/noauth-probe-detail.component.html
View File

@ -9,9 +9,10 @@
<div class="ui-g" dir="rtl"> <div class="ui-g" dir="rtl">
<button class="ui-button-width-fit" [disabled]="!selectedNIC" type="button" label="Accept" icon="ui-icon-check" pButton (click)="accept()"></button> <button class="ui-button-width-fit" [disabled]="!selectedNIC || selectedNIC.metaIPType.key !== 'V4'" type="button" label="Accept"
<button class="ui-button-danger ui-button-width-fit" [disabled]="!selectedNIC" type="button" label="Deny" icon="ui-icon-close" icon="ui-icon-check" pButton (click)="accept()"></button>
pButton (click)="deny()"></button> <button class="ui-button-danger ui-button-width-fit" [disabled]="!selectedNIC || selectedNIC.metaIPType.key !== 'V4'" type="button"
label="Deny" icon="ui-icon-close" pButton (click)="deny()"></button>
</div> </div>
</p-panel> </p-panel>

40
@overflow/noauth-probe/component/noauth-probe-detail.component.ts
View File

@ -1,8 +1,6 @@
import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
import { Probe, ProbeHost } from '@overflow/commons-typescript/model/probe'; import { Observable, of } from 'rxjs';
import { Store, select } from '@ngrx/store'; import { catchError, map, tap, take } from 'rxjs/operators';
import { Observable, of, Subscription } from 'rxjs';
import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
import { NoAuthProbeService } from '../service/noauth-probe.service'; import { NoAuthProbeService } from '../service/noauth-probe.service';
import { NoAuthProbe, InfraHostIP } from '@overflow/commons-typescript'; import { NoAuthProbe, InfraHostIP } from '@overflow/commons-typescript';
import { ConfirmationService } from 'primeng/primeng'; import { ConfirmationService } from 'primeng/primeng';
@ -50,13 +48,15 @@ export class NoAuthProbeDetailComponent implements OnInit {
onNICSelect(infraHostIP: InfraHostIP) { onNICSelect(infraHostIP: InfraHostIP) {
this.selectedNIC = infraHostIP; this.selectedNIC = infraHostIP;
console.log(this.selectedNIC);
} }
accept() { accept() {
let message = 'Start collecting data as a Probe.\n';
message += this.selectedNIC.address;
this.confirmationService.confirm({ this.confirmationService.confirm({
header: 'Are you sure to accept this Probe?', header: 'Are you sure to accept this Probe?',
message: 'Start collecting data as a Probe.', message: message,
icon: 'fa-check', icon: 'fa-check',
accept: () => { accept: () => {
this.noAuthProbeService.acceptNoAuthProbe(this.id, this.selectedNIC.address) this.noAuthProbeService.acceptNoAuthProbe(this.id, this.selectedNIC.address)
@ -84,6 +84,32 @@ export class NoAuthProbeDetailComponent implements OnInit {
} }
deny() { deny() {
alert('609호에 있는 강아지 deny'); this.confirmationService.confirm({
header: 'Are you sure to deny this Probe',
message: 'It will be permanently deleted.',
icon: 'fa fa-trash',
accept: () => {
this.noAuthProbeService.denyNoauthProbe(this.id)
.pipe(
tap(() => {
this.pending$ = of(true);
}),
map((noauthProbes: NoAuthProbe[]) => {
this.back.emit();
}),
catchError(error => {
this.error$ = of(error);
return of();
}),
tap(() => {
this.pending$ = of(false);
}),
take(1),
).subscribe();
},
reject: () => {
}
});
} }
} }

2
@overflow/noauth-probe/component/noauth-probe-general.component.html
View File

@ -21,7 +21,7 @@
<of-key-value [key]="'Connection'" [value]="'Not connected.'"></of-key-value> <of-key-value [key]="'Connection'" [value]="'Not connected.'"></of-key-value>
</ng-container> </ng-container>
<ng-container *ngSwitchDefault> <ng-container *ngSwitchDefault>
<of-key-value [key]="'Connection'" [value]="noAuthProbe.connectDate | date: 'dd/MM/yyyy' (noAuthProbe.connectAddress)"></of-key-value> <of-key-value [key]="'Connection'" [value]="noAuthProbe.connectAddress"></of-key-value>
</ng-container> </ng-container>
</ng-container> </ng-container>
</div> </div>

6
@overflow/noauth-probe/component/noauth-probe-list.component.html
View File

@ -7,17 +7,17 @@
<p-table [value]="noauthProbes" selectionMode="single" dataKey="id" (onRowSelect)="select.emit($event.data)"> <p-table [value]="noauthProbes" selectionMode="single" dataKey="id" (onRowSelect)="select.emit($event.data)">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
<tr> <tr>
<th>Probe Key</th> <th style="width: 20em">Probe Key</th>
<th>Host Name</th> <th>Host Name</th>
<th>OS</th> <th>OS</th>
<th>Created at</th> <th style="width: 7em">Created at</th>
</tr> </tr>
</ng-template> </ng-template>
<ng-template pTemplate="body" let-rowData> <ng-template pTemplate="body" let-rowData>
<tr [pSelectableRow]="rowData"> <tr [pSelectableRow]="rowData">
<td>{{rowData.tempProbeKey}}</td> <td>{{rowData.tempProbeKey}}</td>
<td>{{rowData.infraHost.infraHostOS.name}}</td> <td>{{rowData.infraHost.infraHostOS.name}}</td>
<td>{{rowData.infraHost.infraHostOS.os}}</td> <td>{{getOS(rowData)}}</td>
<td>{{rowData.createDate | date: 'dd/MM/yyyy'}}</td> <td>{{rowData.createDate | date: 'dd/MM/yyyy'}}</td>
</tr> </tr>
</ng-template> </ng-template>

13
@overflow/noauth-probe/component/noauth-probe-list.component.ts
View File

@ -88,10 +88,23 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
noauthProbe.infraHost = JSON.parse(noauthProbe.infraHostMeta); noauthProbe.infraHost = JSON.parse(noauthProbe.infraHostMeta);
}); });
this.noauthProbes = noauthProbes; this.noauthProbes = noauthProbes;
console.log(this.noauthProbes);
} }
private setError$(error: any): void { private setError$(error: any): void {
this.error$ = of(error); this.error$ = of(error);
} }
getOS(noauthProbe: NoAuthProbe): string {
if (null == noauthProbe.infraHost.infraHostOS) {
return null;
}
let os = noauthProbe.infraHost.infraHostOS.os;
os += noauthProbe.infraHost.infraHostOS.platform ?
noauthProbe.infraHost.infraHostOS.platform : '';
os += noauthProbe.infraHost.infraHostOS.platformFamily ?
noauthProbe.infraHost.infraHostOS.platformFamily : '';
return os;
}
} }

97
@overflow/noauth-probe/component/old/noauth-probe-list.component.html
View File

@ -1,97 +0,0 @@
<!-- <h1>Unauthorized</h1>
<of-error-message [error]="error$ | async" [closable]="false"></of-error-message>
<of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>
<p-panel #content [showHeader]="false" class="block-panel">
<p-table #dt [value]="noauthProbes" selectionMode="single" dataKey="id">
<ng-template pTemplate="header">
<tr>
<th style="width: 3.25em" pResizableColumn></th>
<th style="width: 20em">Probe Key</th>
<th>Host Name</th>
<th>OS</th>
<th style="width: 7em">Created at</th>
</tr>
</ng-template>
<ng-template pTemplate="body" let-rowData let-expanded="expanded" let-columns="columns">
<tr [pSelectableRow]="rowData" [pRowToggler]="rowData">
<td>
<a href="#">
<i [ngClass]="expanded ? 'fa fa-fw fa-chevron-circle-down' : 'fa fa-fw fa-chevron-circle-right'"></i>
</a>
</td>
<td>{{rowData.tempProbeKey}}</td>
<td>{{rowData.infraHost.infraHostOS.name}}</td>
<td>{{rowData.infraHost.infraHostOS.os}}</td>
<td>{{rowData.createDate | date: 'dd/MM/yyyy'}}</td>
</tr>
</ng-template>
<ng-template pTemplate="rowexpansion" let-rowData let-columns="columns">
<tr>
<td [attr.colspan]="5">
<div class="ui-g ui-g-12">
<div class="ui-g-12 ui-md-6">
<div class="ui-g-12">
<b>Platform:</b> {{rowData.infraHost.infraHostOS.platform}}
</div>
<div class="ui-g-12">
<b>Platform family:</b> {{rowData.infraHost.infraHostOS.platformFamily}}
</div>
<div class="ui-g-12">
<b>Kernel:</b> {{rowData.infraHost.infraHostOS.kernelVersion}}
</div>
<div class="ui-g-12">
<b>HostID:</b> {{rowData.infraHost.infraHostOS.hostID}}
</div>
<div class="ui-g-12">
<b>Connected:</b>
<ng-container [ngSwitch]="rowData.connectDate">
<ng-container *ngSwitchCase="undefined"> Not Connected</ng-container>
<ng-container *ngSwitchDefault> {{rowData.connectDate | date: 'dd/MM/yyyy'}} ({{rowData.connectAddress}})</ng-container>
</ng-container>
</div>
</div>
<div class="ui-g-12 ui-md-6">
<div class="ui-g">
<div class="ui-g-12">
<b>NIC:</b> {{rowData.infraHost.infraHostIPs[0].iface}}
</div>
<div class="ui-g-12">
<b>Network Address:</b> {{rowData.infraHost.infraHostIPs[0].address}}
</div>
<div class="ui-g-12">
<b>Gateway:</b> {{rowData.infraHost.infraHostIPs[0].gateway}}
</div>
<div class="ui-g-12">
<b>Mac Address:</b> {{rowData.infraHost.infraHostIPs[0].mac}}
</div>
<div class="ui-g-12">
</div>
</div>
</div>
<div class="ui-g-12" dir="rtl">
<button class="ui-button-danger ui-button-width-fit" type="button" label="Deny" icon="ui-icon-close" pButton (click)="onAcceptOrDeny(false, rowData.infraHost.infraHostIPs)"></button>
<button class=" ui-button-width-fit" type="button" label="Accept" icon="fa-check" pButton (click)="onAccept(rowData.infraHost)"></button>
</div>
</div>
</td>
</tr>
</ng-template>
</p-table>
<p-dialog *ngIf="selectedInfraHost" [(visible)]="visibleNICs" [contentStyle]="{'max-height':'400px'}">
<ul>
<li *ngFor="let infraHostIP of selectedInfraHost.infraHostIPs">
<a style="cursor: pointer" (click)="onNICSelected(infraHostIP)">
{{infraHostIP.iface}} {{infraHostIP.address}} {{infraHostIP.gateway}} {{infraHostIP.mac}}
</a>
<li>
</ul>
</p-dialog>
<p-confirmDialog header="Confirmation" icon="fa ui-icon-warning" width="425"></p-confirmDialog>
</p-panel> -->

164
@overflow/noauth-probe/component/old/noauth-probe-list.component.ts
View File

@ -1,164 +0,0 @@
// import { Component, Input, Output, EventEmitter, AfterContentInit, OnInit, OnDestroy } from '@angular/core';
// import { Store, select } from '@ngrx/store';
// import { Observable, of, Subscription } from 'rxjs';
// import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
// import { ConfirmationService, Message } from 'primeng/primeng';
// import { NoAuthProbe } from '@overflow/commons-typescript/model/noauth';
// import { AuthSelector } from '@overflow/shared/auth/store';
// import { DomainMember } from '@overflow/commons-typescript/model/domain';
// import { NoAuthProbeService } from '../service/noauth-probe.service';
// import { NoAuthProbeSubscriber, NoAuthProbeNotify } from '../subscriber/noauth-probe.subscriber';
// import { InfraHostIP, InfraHost } from '@overflow/commons-typescript';
// @Component({
// selector: 'of-noauth-probe-list',
// templateUrl: './noauth-probe-list.component.html',
// providers: [ConfirmationService]
// })
// export class NoAuthProbeListComponent implements OnInit, OnDestroy {
// pending$: Observable<boolean>;
// error$: Observable<any>;
// noauthProbes: NoAuthProbe[];
// noauthProbeSubscription: Subscription;
// selectedInfraHost: InfraHost;
// visibleNICs: boolean;
// constructor(
// private confirmationService: ConfirmationService,
// private store: Store<any>,
// private noAuthProbeService: NoAuthProbeService,
// private noAuthProbeSubscriber: NoAuthProbeSubscriber,
// ) {
// this.noauthProbes = [];
// this.noauthProbeSubscription = null;
// }
// ngOnInit() {
// this.store.pipe(
// tap(() => {
// this.pending$ = of(true);
// }),
// select(AuthSelector.selectDomainMember),
// exhaustMap((domainMember: DomainMember) =>
// this.noAuthProbeService.readAllByDomainID(domainMember.domain.id)
// .pipe(
// map((noauthProbes: NoAuthProbe[]) => {
// this.setNoauthProbes(noauthProbes);
// }),
// catchError(error => {
// this.setError$(error);
// return of();
// })
// )
// ),
// tap(() => {
// this.pending$ = of(false);
// }),
// take(1),
// ).subscribe();
// this.noauthProbeSubscription = this.noAuthProbeSubscriber.observable().pipe(
// tap((noAuthProbeNotify: NoAuthProbeNotify) => {
// const noauthProbes = [];
// this.noauthProbes.forEach(noauthProbe => {
// const n = noAuthProbeNotify.params;
// if (noauthProbe.id === n.id) {
// noauthProbes.push(n);
// } else {
// noauthProbes.push(noauthProbe);
// }
// });
// this.setNoauthProbes(noauthProbes);
// }
// ),
// ).subscribe();
// }
// ngOnDestroy(): void {
// if (null !== this.noauthProbeSubscription) {
// this.noauthProbeSubscription.unsubscribe();
// }
// }
// onAccept(infraHost: InfraHost) {
// this.selectedInfraHost = infraHost;
// this.visibleNICs = true;
// }
// onAcceptOrDeny(isAccept: boolean, selected: NoAuthProbe) {
// const title = isAccept ?
// 'Are you sure to accept this Probe?' : 'Are you sure to deny this Probe';
// const message = isAccept ?
// 'Start collecting data as a Probe.' : 'It will be permanently deleted.';
// this.confirmationService.confirm({
// header: title,
// message: message,
// icon: isAccept ? 'fa-check' : 'fa fa-trash',
// accept: () => {
// if (isAccept) {
// this.noAuthProbeService.acceptNoAuthProbe(selected.id)
// .pipe(
// tap(() => {
// this.pending$ = of(true);
// }),
// map((noauthProbes: NoAuthProbe[]) => {
// this.setNoauthProbes(noauthProbes);
// }),
// catchError(error => {
// this.setError$(error);
// return of();
// }),
// tap(() => {
// this.pending$ = of(false);
// }),
// take(1),
// ).subscribe();
// } else {
// this.noAuthProbeService.denyNoauthProbe(selected.id)
// .pipe(
// tap(() => {
// this.pending$ = of(true);
// }),
// map((noauthProbes: NoAuthProbe[]) => {
// this.setNoauthProbes(noauthProbes);
// }),
// catchError(error => {
// this.setError$(error);
// return of();
// }),
// tap(() => {
// this.pending$ = of(false);
// }),
// take(1),
// ).subscribe();
// }
// },
// reject: () => {
// }
// });
// }
// private setNoauthProbes(noauthProbes: NoAuthProbe[]): void {
// if (null === noauthProbes) {
// return;
// }
// noauthProbes.forEach(noauthProbe => {
// noauthProbe.infraHost = JSON.parse(noauthProbe.infraHostMeta);
// });
// this.noauthProbes = noauthProbes;
// }
// private setError$(error: any): void {
// this.error$ = of(error);
// }
// onNICSelected(infraHostIP: InfraHostIP) {
// console.log(infraHostIP);
// }
// }

2
@overflow/shared/ui/component/key-value.component.ts
View File

@ -7,7 +7,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
export class KeyValueComponent implements OnInit { export class KeyValueComponent implements OnInit {
@Input() key: string; @Input() key: string;
@Input() value: string; @Input() value: any;
@Input() clickable = false; @Input() clickable = false;
@Output() click = new EventEmitter<string>(); @Output() click = new EventEmitter<string>();

29
src/styles.scss
View File

@ -1496,8 +1496,8 @@
transition: all 0.3s; transition: all 0.3s;
font-size: 36px; } font-size: 36px; }
.layout-container .topbar .topbar-right #menu-button i:before { .layout-container .topbar .topbar-right #menu-button i:before {
//content: "chevron_left"; //content: "chevron_left";
content: "menu" !important; content: "menu" !important;
} }
//auth style //auth style
.login-body { .login-body {
@ -1510,7 +1510,7 @@
background-size: cover !important; background-size: cover !important;
background-attachment: fixed !important; background-attachment: fixed !important;
} }
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.login-body { .login-body {
//background: url("../images/login/login2x.png") top left no-repeat #f7f7f7; //background: url("../images/login/login2x.png") top left no-repeat #f7f7f7;
//background: url("/assets/layout/images/login11.jpg") top left no-repeat #f7f7f7 !important; //background: url("/assets/layout/images/login11.jpg") top left no-repeat #f7f7f7 !important;
@ -1527,7 +1527,7 @@
min-height: 300px !important; min-height: 300px !important;
.ui-g { .ui-g {
.ui-g-12 { .ui-g-12 {
a { a {
color: #5e6166; color: #5e6166;
font-size: 0.8em; font-size: 0.8em;
} }
@ -1687,21 +1687,21 @@
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
margin: auto; margin: auto;
img { img {
object-fit: cover; object-fit: cover;
width:220px; width:220px;
height:220px; height:220px;
} }
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
} }
@media (max-width: 640px) { @media (max-width: 640px) {
} }
@ -1732,14 +1732,14 @@
of-key-value{ of-key-value{
//width: 100%; //width: 100%;
min-width: 250px; min-width: 250px;
margin: 0; margin: 0;
} }
.of-key-value-div{ .of-key-value-div{
//width: 100%; //width: 100%;
min-width: 250px; min-width: 250px;
margin: 0; margin: 0;
} }
span { span {
font-weight: bold; font-weight: bold;
@ -1899,4 +1899,7 @@ body .ui-progressbar .ui-progressbar-value {
.ui-tabview-nav > li.ui-state-active { .ui-tabview-nav > li.ui-state-active {
background-color: #f3f3f3 !important; background-color: #f3f3f3 !important;
} }
}
.ui-confirmdialog-message {
white-space: pre-line;
} }