From e980403faf20ccb2ca2281d32b778fc59bb93beb Mon Sep 17 00:00:00 2001 From: crusader Date: Mon, 28 May 2018 18:06:33 +0900 Subject: [PATCH] ing --- .../noauth-probe-list.component.html | 129 +++++++++--------- .../noauth-probe-list-container.component.ts | 2 +- .../noauth-probe-list.reducer.ts | 28 +++- 3 files changed, 94 insertions(+), 65 deletions(-) diff --git a/@overflow/noauth-probe/component/noauth-probe-list.component.html b/@overflow/noauth-probe/component/noauth-probe-list.component.html index 06d6b3c..b10e5ea 100644 --- a/@overflow/noauth-probe/component/noauth-probe-list.component.html +++ b/@overflow/noauth-probe/component/noauth-probe-list.component.html @@ -1,73 +1,78 @@ -

Unauthorized

+ + + - + +

Unauthorized

+ - - - Probe Key - Host Name - OS - Created at - + + + Probe Key + Host Name + OS + Created at + - - - - - - - {{rowData.tempProbeKey}} - {{rowData.descriptions.host.name}} - {{rowData.descriptions.host.os}} - {{rowData.createDate | date: 'dd/MM/yyyy'}} - + + + + + + + {{rowData.tempProbeKey}} + {{rowData.descriptions.host.name}} + {{rowData.descriptions.host.os}} + {{rowData.createDate | date: 'dd/MM/yyyy'}} + - - -
+ + +
-
-
- Platform: {{rowData.descriptions.host.platform}} -
+
+
+ Platform: {{rowData.descriptions.host.platform}} +
-
- Platform family: {{rowData.descriptions.host.platformFamily}} -
-
- Kernel: {{rowData.descriptions.host.kernelVersion}} -
-
- HostID: {{rowData.descriptions.host.hostID}} -
-
+
+ Platform family: {{rowData.descriptions.host.platformFamily}} +
+
+ Kernel: {{rowData.descriptions.host.kernelVersion}} +
+
+ HostID: {{rowData.descriptions.host.hostID}} +
+
-
-
-
- NIC: {{rowData.descriptions.network.name}} -
-
- Network Address: {{rowData.descriptions.network.address}} -
-
- Gateway: {{rowData.descriptions.network.gateway}} -
-
- Mac Address: {{rowData.descriptions.network.macAddress}} -
-
-
-
- - -
+
+
+
+ NIC: {{rowData.descriptions.network.name}}
- - +
+ Network Address: {{rowData.descriptions.network.address}} +
+
+ Gateway: {{rowData.descriptions.network.gateway}} +
+
+ Mac Address: {{rowData.descriptions.network.macAddress}} +
+
+
+
+ + +
+
+ + - - - + + + + \ No newline at end of file diff --git a/@overflow/noauth-probe/container/noauth-probe-list-container.component.ts b/@overflow/noauth-probe/container/noauth-probe-list-container.component.ts index f0f8b10..9eebb8d 100644 --- a/@overflow/noauth-probe/container/noauth-probe-list-container.component.ts +++ b/@overflow/noauth-probe/container/noauth-probe-list-container.component.ts @@ -20,7 +20,7 @@ import { RPCClientError } from '@loafer/ng-rpc'; export class NoAuthProbeListContainerComponent implements OnInit { noauthProbes$: Observable; pending$: Observable; - error$: Observable; + error$: Observable; constructor( private store: Store, diff --git a/@overflow/noauth-probe/store/container/noauth-probe-list/noauth-probe-list.reducer.ts b/@overflow/noauth-probe/store/container/noauth-probe-list/noauth-probe-list.reducer.ts index bedd119..0bfd981 100644 --- a/@overflow/noauth-probe/store/container/noauth-probe-list/noauth-probe-list.reducer.ts +++ b/@overflow/noauth-probe/store/container/noauth-probe-list/noauth-probe-list.reducer.ts @@ -15,15 +15,39 @@ export function reducer(state = initialState, action: Actions): State { pending: true, }; } - case ActionType.ReadAllByDomainIDSuccess: { return noAuthProbeListContainerAdapter.setAll(action.payload, {...state, pending: false}); } - case ActionType.ReadAllByDomainIDFailure: { return noAuthProbeListContainerAdapter.setError(action.payload, {...state, pending: false}); } + case ActionType.Accept: { + return { + ...state, + pending: true, + }; + } + case ActionType.AcceptSuccess: { + return noAuthProbeListContainerAdapter.setAll(action.payload, {...state, pending: false}); + } + case ActionType.AcceptFailure: { + return noAuthProbeListContainerAdapter.setError(action.payload, {...state, pending: false}); + } + + case ActionType.Deny: { + return { + ...state, + pending: true, + }; + } + case ActionType.DenySuccess: { + return noAuthProbeListContainerAdapter.setAll(action.payload, {...state, pending: false}); + } + case ActionType.DenyFailure: { + return noAuthProbeListContainerAdapter.setError(action.payload, {...state, pending: false}); + } + default: { return state; }