From c1790d7cfb610a7da85c8f4678a5631f2227a4ff Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 11 Jan 2019 11:48:50 +0800 Subject: [PATCH 001/112] frontend:add {} to if result --- src/frontend/src/app/shared/model/v1/app.ts | 2 +- .../src/app/shared/model/v1/cronjob.ts | 112 +- .../src/app/shared/model/v1/daemonset.ts | 130 +- .../src/app/shared/model/v1/daemonsettpl.ts | 22 +- .../src/app/shared/model/v1/deployment.ts | 112 +- .../shared/model/v1/kubernetes/configmap.ts | 40 - .../app/shared/model/v1/kubernetes/cronjob.ts | 370 +---- .../shared/model/v1/kubernetes/daemonset.ts | 1208 ++++++++-------- .../shared/model/v1/kubernetes/deployment.ts | 8 +- .../shared/model/v1/kubernetes/node-list.ts | 76 +- .../app/shared/model/v1/kubernetes/node.ts | 302 ++-- .../shared/model/v1/kubernetes/statefulset.ts | 1244 ++++++++--------- .../src/app/shared/model/v1/namespace.ts | 30 +- .../src/app/shared/model/v1/permission.ts | 18 +- .../app/shared/model/v1/publish-history.ts | 2 - .../src/app/shared/model/v1/statefulset.ts | 381 ++--- .../src/app/shared/model/v1/statefulsettpl.ts | 197 +-- .../src/app/shared/model/v1/status.ts | 2 +- .../shared/navigation/navigation.component.ts | 37 +- .../src/app/shared/page/page-state.ts | 38 +- .../shared/pipe/relative-time.filter.pipe.ts | 16 +- src/frontend/src/app/shared/tabs/ListStyle.ts | 2 +- .../src/app/shared/tabs/tab/tab.component.ts | 8 +- .../src/app/shared/tabs/tabs.component.ts | 19 +- .../unauthorized/unauthorized.component.ts | 2 +- src/frontend/src/app/shared/utils.ts | 8 +- 26 files changed, 2018 insertions(+), 2368 deletions(-) diff --git a/src/frontend/src/app/shared/model/v1/app.ts b/src/frontend/src/app/shared/model/v1/app.ts index 4ad5cc5e9..2cabc7c3c 100644 --- a/src/frontend/src/app/shared/model/v1/app.ts +++ b/src/frontend/src/app/shared/model/v1/app.ts @@ -16,7 +16,7 @@ export class App { } static emptyObject(): App { - let result = new App(); + const result = new App(); result.namespace = Namespace.emptyObject(); result.createTime = null; return result; diff --git a/src/frontend/src/app/shared/model/v1/cronjob.ts b/src/frontend/src/app/shared/model/v1/cronjob.ts index e60943f8d..a61dfc0df 100644 --- a/src/frontend/src/app/shared/model/v1/cronjob.ts +++ b/src/frontend/src/app/shared/model/v1/cronjob.ts @@ -30,14 +30,14 @@ export class PodAntiAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -50,14 +50,14 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -70,15 +70,15 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -90,14 +90,14 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -111,15 +111,15 @@ export class PodAffinityTerm { topologyKey: string; constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } } static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); + const result = new PodAffinityTerm(); result.labelSelector = LabelSelector.emptyObject(); result.namespaces = []; return result; @@ -132,14 +132,14 @@ export class PodAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -152,14 +152,14 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -172,15 +172,15 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -191,13 +191,13 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -208,13 +208,13 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -226,14 +226,14 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -247,15 +247,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -271,16 +271,16 @@ export class CronjobMetaData { privileged?: { [key: string]: boolean }; constructor(init?: CronjobMetaData) { - if (!init) return; - if (init.replicas) this.replicas = init.replicas; - if (init.suspends) this.suspends = init.suspends; - if (init.affinity) this.affinity = init.affinity; - if (init.privileged) this.privileged = init.privileged; + if (!init) { return; } + if (init.replicas) { this.replicas = init.replicas; } + if (init.suspends) { this.suspends = init.suspends; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.privileged) { this.privileged = init.privileged; } } static emptyObject(): CronjobMetaData { - let result = new CronjobMetaData(); + const result = new CronjobMetaData(); result.replicas = null; result.suspends = null; result.affinity = Affinity.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/daemonset.ts b/src/frontend/src/app/shared/model/v1/daemonset.ts index e3e145d3b..6ab072a91 100644 --- a/src/frontend/src/app/shared/model/v1/daemonset.ts +++ b/src/frontend/src/app/shared/model/v1/daemonset.ts @@ -16,22 +16,22 @@ export class DaemonSet { order: number; constructor(init?: DaemonSet) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.metaData) this.metaData = init.metaData; - if (init.app) this.app = init.app; - if (init.description) this.description = init.description; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.app) { this.app = init.app; } + if (init.description) { this.description = init.description; } if (init.createTime) this.createTime = new Date(init.createTime as any); if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.appId) this.appId = init.appId; + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.appId) { this.appId = init.appId; } } static emptyObject(): DaemonSet { - let result = new DaemonSet(); + const result = new DaemonSet(); result.app = App.emptyObject(); result.createTime = null; result.updateTime = null; @@ -46,14 +46,14 @@ export class PodAntiAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -66,14 +66,14 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -86,15 +86,15 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -106,14 +106,14 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -127,15 +127,15 @@ export class PodAffinityTerm { topologyKey: string; constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } } static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); + const result = new PodAffinityTerm(); result.labelSelector = LabelSelector.emptyObject(); result.namespaces = []; return result; @@ -148,14 +148,14 @@ export class PodAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -168,14 +168,14 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -188,15 +188,15 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -207,13 +207,13 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -224,13 +224,13 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -242,14 +242,14 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -263,15 +263,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -286,15 +286,15 @@ export class DaemonSetMetaData { privileged?: { [key: string]: boolean }; constructor(init?: DaemonSetMetaData) { - if (!init) return; - if (init.resources) this.resources = init.resources; - if (init.affinity) this.affinity = init.affinity; - if (init.privileged) this.privileged = init.privileged; + if (!init) { return; } + if (init.resources) { this.resources = init.resources; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.privileged) { this.privileged = init.privileged; } } static emptyObject(): DaemonSetMetaData { - let result = new DaemonSetMetaData(); + const result = new DaemonSetMetaData(); result.resources = null; result.affinity = Affinity.emptyObject(); result.privileged = null; diff --git a/src/frontend/src/app/shared/model/v1/daemonsettpl.ts b/src/frontend/src/app/shared/model/v1/daemonsettpl.ts index d4dabcd30..7c348a406 100644 --- a/src/frontend/src/app/shared/model/v1/daemonsettpl.ts +++ b/src/frontend/src/app/shared/model/v1/daemonsettpl.ts @@ -17,23 +17,23 @@ export class DaemonSetTemplate { containerVersions: string[]; constructor(init?: DaemonSetTemplate) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.template) this.template = init.template; - if (init.daemonSet) this.daemonSet = init.daemonSet; - if (init.description) this.description = init.description; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.template) { this.template = init.template; } + if (init.daemonSet) { this.daemonSet = init.daemonSet; } + if (init.description) { this.description = init.description; } if (init.createTime) this.createTime = new Date(init.createTime as any); if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.daemonSetId) this.daemonSetId = init.daemonSetId; - if (init.status) this.status = init.status; + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.daemonSetId) { this.daemonSetId = init.daemonSetId; } + if (init.status) { this.status = init.status; } } static emptyObject(): DaemonSetTemplate { - let result = new DaemonSetTemplate(); + const result = new DaemonSetTemplate(); result.daemonSet = DaemonSet.emptyObject(); result.createTime = null; result.updateTime = null; diff --git a/src/frontend/src/app/shared/model/v1/deployment.ts b/src/frontend/src/app/shared/model/v1/deployment.ts index 14fcb19dc..6a23b7669 100644 --- a/src/frontend/src/app/shared/model/v1/deployment.ts +++ b/src/frontend/src/app/shared/model/v1/deployment.ts @@ -31,14 +31,14 @@ export class PodAntiAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -51,14 +51,14 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -71,15 +71,15 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -91,14 +91,14 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -112,15 +112,15 @@ export class PodAffinityTerm { topologyKey: string; constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } } static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); + const result = new PodAffinityTerm(); result.labelSelector = LabelSelector.emptyObject(); result.namespaces = []; return result; @@ -133,14 +133,14 @@ export class PodAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -153,14 +153,14 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -173,15 +173,15 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -192,13 +192,13 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -209,13 +209,13 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -227,14 +227,14 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -248,15 +248,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -272,16 +272,16 @@ export class DeploymentMetaData { privileged?: { [key: string]: boolean }; constructor(init?: DeploymentMetaData) { - if (!init) return; - if (init.replicas) this.replicas = init.replicas; - if (init.resources) this.resources = init.resources; - if (init.affinity) this.affinity = init.affinity; - if (init.privileged) this.privileged = init.privileged; + if (!init) { return; } + if (init.replicas) { this.replicas = init.replicas; } + if (init.resources) { this.resources = init.resources; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.privileged) { this.privileged = init.privileged; } } static emptyObject(): DeploymentMetaData { - let result = new DeploymentMetaData(); + const result = new DeploymentMetaData(); result.replicas = null; result.resources = null; result.affinity = Affinity.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/configmap.ts b/src/frontend/src/app/shared/model/v1/kubernetes/configmap.ts index c17198c77..ee683aed7 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/configmap.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/configmap.ts @@ -5,10 +5,6 @@ export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - - - //[end] } export class StatusDetails { @@ -18,19 +14,11 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - - - //[end] } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - - - //[end] } export class Status { @@ -42,27 +30,15 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - - - //[end] } export class Initializer { name: string; - //[Initializer:] - - - //[end] } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - - - //[end] } export class OwnerReference { @@ -72,17 +48,9 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - - - //[end] } export class Time { - //[Time:] - - - //[end] } export class ObjectMeta { @@ -102,10 +70,6 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - - - //[end] } export class KubeConfigMap { @@ -113,8 +77,4 @@ export class KubeConfigMap { apiVersion: string; metadata: ObjectMeta; data: {}; - //[ConfigMap:] - - - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts b/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts index b41035ae3..1d6de5af1 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts @@ -9,28 +9,16 @@ export class ObjectReference { apiVersion: string; resourceVersion: string; fieldPath: string; - //[ObjectReference:] - - - //[end] } export class CronJobStatus { active: ObjectReference[]; lastScheduleTime: Time; - //[CronJobStatus:] - - - //[end] } export class HostAlias { ip: string; hostnames: string[]; - //[HostAlias:] - - - //[end] } export class Toleration { @@ -39,102 +27,58 @@ export class Toleration { value: string; effect: string; tolerationSeconds: number; - //[Toleration:] - - - //[end] } export class PodAntiAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAntiAffinity:] - - - //[end] } export class WeightedPodAffinityTerm { weight: number; podAffinityTerm: PodAffinityTerm; - //[WeightedPodAffinityTerm:] - - - //[end] } export class PodAffinityTerm { labelSelector: LabelSelector; namespaces: string[]; topologyKey: string; - //[PodAffinityTerm:] - - - //[end] } export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAffinity:] - - - //[end] } export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; - //[PreferredSchedulingTerm:] - - - //[end] } export class NodeSelectorRequirement { key: string; operator: string; values: string[]; - //[NodeSelectorRequirement:] - - - //[end] } export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; - //[NodeSelectorTerm:] - - - //[end] } export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; - //[NodeSelector:] - - - //[end] } export class NodeAffinity { requiredDuringSchedulingIgnoredDuringExecution: NodeSelector; preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; - //[NodeAffinity:] - - - //[end] } export class Affinity { nodeAffinity: NodeAffinity; podAffinity: PodAffinity; podAntiAffinity: PodAntiAffinity; - //[Affinity:] - - - //[end] } @@ -144,10 +88,6 @@ export class PodSecurityContext { runAsNonRoot: boolean; supplementalGroups: number[]; fsGroup: number; - //[PodSecurityContext:] - - - //[end] } export class SELinuxOptions { @@ -155,19 +95,11 @@ export class SELinuxOptions { role: string; type: string; level: string; - //[SELinuxOptions:] - - - //[end] } export class Capabilities { add: string[]; drop: string[]; - //[Capabilities:] - - - //[end] } export class SecurityContext { @@ -177,10 +109,6 @@ export class SecurityContext { runAsUser: number; runAsNonRoot: boolean; readOnlyRootFilesystem: boolean; - //[SecurityContext:] - - - //[end] } @@ -190,45 +118,25 @@ export class Handler { exec: ExecAction; httpGet: HTTPGetAction; tcpSocket: TCPSocketAction; - //[Handler:] - - - //[end] } export class Lifecycle { postStart: Handler; preStop: Handler; - //[Lifecycle:] - - - //[end] } export class TCPSocketAction { port: IntOrString; host: string; - //[TCPSocketAction:] - - - //[end] } export class HTTPHeader { name: string; value: string; - //[HTTPHeader:] - - - //[end] } export class IntOrString { - //[IntOrString:] - - - //[end] } export class HTTPGetAction { @@ -237,18 +145,10 @@ export class HTTPGetAction { host: string; scheme: string; httpHeaders: HTTPHeader[]; - //[HTTPGetAction:] - - - //[end] } export class ExecAction { command: string[]; - //[ExecAction:] - - - //[end] } export class Probe { @@ -260,10 +160,6 @@ export class Probe { periodSeconds: number; successThreshold: number; failureThreshold: number; - //[Probe:] - - - //[end] } export class VolumeMount { @@ -271,10 +167,6 @@ export class VolumeMount { readOnly: boolean; mountPath: string; subPath: string; - //[VolumeMount:] - - - //[end] } export class ResourceRequirements { @@ -282,14 +174,14 @@ export class ResourceRequirements { requests?: { [key: string]: any }; constructor(init?: ResourceRequirements) { - if (!init) return; - if (init.limits) this.limits = init.limits; - if (init.requests) this.requests = init.requests; + if (!init) { return; } + if (init.limits) { this.limits = init.limits; } + if (init.requests) { this.requests = init.requests; } } static emptyObject(): ResourceRequirements { - let result = new ResourceRequirements(); + const result = new ResourceRequirements(); result.limits = null; result.requests = null; return result; @@ -300,20 +192,12 @@ export class SecretKeySelector { name: string; key: string; optional: boolean; - //[SecretKeySelector:] - - - //[end] } export class ConfigMapKeySelector { name: string; key: string; optional: boolean; - //[ConfigMapKeySelector:] - - - //[end] } @@ -322,48 +206,28 @@ export class EnvVarSource { resourceFieldRef: ResourceFieldSelector; configMapKeyRef: ConfigMapKeySelector; secretKeyRef: SecretKeySelector; - //[EnvVarSource:] - - - //[end] } export class EnvVar { name: string; value: string; valueFrom: EnvVarSource; - //[EnvVar:] - - - //[end] } export class SecretEnvSource { name: string; optional: boolean; - //[SecretEnvSource:] - - - //[end] } export class ConfigMapEnvSource { name: string; optional: boolean; - //[ConfigMapEnvSource:] - - - //[end] } export class EnvFromSource { prefix: string; configMapRef: ConfigMapEnvSource; secretRef: SecretEnvSource; - //[EnvFromSource:] - - - //[end] } export class ContainerPort { @@ -372,10 +236,6 @@ export class ContainerPort { containerPort: number; protocol: string; hostIP: string; - //[ContainerPort:] - - - //[end] } export class Container { @@ -399,10 +259,6 @@ export class Container { stdin: boolean; stdinOnce: boolean; tty: boolean; - //[Container:] - - - //[end] } export class StorageOSVolumeSource { @@ -411,10 +267,6 @@ export class StorageOSVolumeSource { fsType: string; readOnly: boolean; secretRef: LocalObjectReference; - //[StorageOSVolumeSource:] - - - //[end] } export class ScaleIOVolumeSource { @@ -428,76 +280,44 @@ export class ScaleIOVolumeSource { volumeName: string; fsType: string; readOnly: boolean; - //[ScaleIOVolumeSource:] - - - //[end] } export class PortworxVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[PortworxVolumeSource:] - - - //[end] } export class ConfigMapProjection { name: string; items: KeyToPath[]; optional: boolean; - //[ConfigMapProjection:] - - - //[end] } export class DownwardAPIProjection { items: DownwardAPIVolumeFile[]; - //[DownwardAPIProjection:] - - - //[end] } export class SecretProjection { name: string; items: KeyToPath[]; optional: boolean; - //[SecretProjection:] - - - //[end] } export class VolumeProjection { secret: SecretProjection; downwardAPI: DownwardAPIProjection; configMap: ConfigMapProjection; - //[VolumeProjection:] - - - //[end] } export class ProjectedVolumeSource { sources: VolumeProjection[]; defaultMode: number; - //[ProjectedVolumeSource:] - - - //[end] } export class PhotonPersistentDiskVolumeSource { pdID: string; fsType: string; - //[PhotonPersistentDiskVolumeSource:] - - - //[end] } export class AzureDiskVolumeSource { @@ -507,10 +327,6 @@ export class AzureDiskVolumeSource { fsType: string; readOnly: boolean; kind: string; - //[AzureDiskVolumeSource:] - - - //[end] } export class QuobyteVolumeSource { @@ -519,10 +335,6 @@ export class QuobyteVolumeSource { readOnly: boolean; user: string; group: string; - //[QuobyteVolumeSource:] - - - //[end] } export class VsphereVirtualDiskVolumeSource { @@ -530,10 +342,6 @@ export class VsphereVirtualDiskVolumeSource { fsType: string; storagePolicyName: string; storagePolicyID: string; - //[VsphereVirtualDiskVolumeSource:] - - - //[end] } export class ConfigMapVolumeSource { @@ -541,20 +349,12 @@ export class ConfigMapVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[ConfigMapVolumeSource:] - - - //[end] } export class AzureFileVolumeSource { secretName: string; shareName: string; readOnly: boolean; - //[AzureFileVolumeSource:] - - - //[end] } export class FCVolumeSource { @@ -562,29 +362,17 @@ export class FCVolumeSource { lun: number; fsType: string; readOnly: boolean; - //[FCVolumeSource:] - - - //[end] } export class ResourceFieldSelector { containerName: string; resource: string; divisor: Quantity; - //[ResourceFieldSelector:] - - - //[end] } export class ObjectFieldSelector { apiVersion: string; fieldPath: string; - //[ObjectFieldSelector:] - - - //[end] } export class DownwardAPIVolumeFile { @@ -592,28 +380,16 @@ export class DownwardAPIVolumeFile { fieldRef: ObjectFieldSelector; resourceFieldRef: ResourceFieldSelector; mode: number; - //[DownwardAPIVolumeFile:] - - - //[end] } export class DownwardAPIVolumeSource { items: DownwardAPIVolumeFile[]; defaultMode: number; - //[DownwardAPIVolumeSource:] - - - //[end] } export class FlockerVolumeSource { datasetName: string; datasetUUID: string; - //[FlockerVolumeSource:] - - - //[end] } export class CephFSVolumeSource { @@ -623,20 +399,12 @@ export class CephFSVolumeSource { secretFile: string; secretRef: LocalObjectReference; readOnly: boolean; - //[CephFSVolumeSource:] - - - //[end] } export class CinderVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[CinderVolumeSource:] - - - //[end] } export class FlexVolumeSource { @@ -645,10 +413,6 @@ export class FlexVolumeSource { secretRef: LocalObjectReference; readOnly: boolean; options: {}; - //[FlexVolumeSource:] - - - //[end] } export class RBDVolumeSource { @@ -660,37 +424,21 @@ export class RBDVolumeSource { keyring: string; secretRef: LocalObjectReference; readOnly: boolean; - //[RBDVolumeSource:] - - - //[end] } export class PersistentVolumeClaimVolumeSource { claimName: string; readOnly: boolean; - //[PersistentVolumeClaimVolumeSource:] - - - //[end] } export class GlusterfsVolumeSource { endpoints: string; path: string; readOnly: boolean; - //[GlusterfsVolumeSource:] - - - //[end] } export class LocalObjectReference { name: string; - //[LocalObjectReference:] - - - //[end] } export class ISCSIVolumeSource { @@ -704,30 +452,18 @@ export class ISCSIVolumeSource { chapAuthDiscovery: boolean; chapAuthSession: boolean; secretRef: LocalObjectReference; - //[ISCSIVolumeSource:] - - - //[end] } export class NFSVolumeSource { server: string; path: string; readOnly: boolean; - //[NFSVolumeSource:] - - - //[end] } export class KeyToPath { key: string; path: string; mode: number; - //[KeyToPath:] - - - //[end] } export class SecretVolumeSource { @@ -735,20 +471,12 @@ export class SecretVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[SecretVolumeSource:] - - - //[end] } export class GitRepoVolumeSource { repository: string; revision: string; directory: string; - //[GitRepoVolumeSource:] - - - //[end] } export class AWSElasticBlockStoreVolumeSource { @@ -756,10 +484,6 @@ export class AWSElasticBlockStoreVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[AWSElasticBlockStoreVolumeSource:] - - - //[end] } export class GCEPersistentDiskVolumeSource { @@ -767,14 +491,10 @@ export class GCEPersistentDiskVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[GCEPersistentDiskVolumeSource:] - - - //[end] } export class Quantity { - //[Quantity:] + //[end] @@ -783,18 +503,10 @@ export class Quantity { export class EmptyDirVolumeSource { medium: string; sizeLimit: Quantity; - //[EmptyDirVolumeSource:] - - - //[end] } export class HostPathVolumeSource { path: string; - //[HostPathVolumeSource:] - - - //[end] } export class Volume { @@ -826,10 +538,6 @@ export class Volume { portworxVolume: PortworxVolumeSource; scaleIO: ScaleIOVolumeSource; storageos: StorageOSVolumeSource; - //[Volume:] - - - //[end] } export class PodSpec { @@ -856,38 +564,22 @@ export class PodSpec { schedulerName: string; tolerations: Toleration[]; hostAliases: HostAlias[]; - //[PodSpec:] - - - //[end] } export class PodTemplateSpec { metadata: ObjectMeta; spec: PodSpec; - //[PodTemplateSpec:] - - - //[end] } export class LabelSelectorRequirement { key: string; operator: string; values: string[]; - //[LabelSelectorRequirement:] - - - //[end] } export class LabelSelector { matchLabels: {}; matchExpressions: LabelSelectorRequirement[]; - //[LabelSelector:] - - - //[end] } export class JobSpec { @@ -897,19 +589,11 @@ export class JobSpec { selector: LabelSelector; manualSelector: boolean; template: PodTemplateSpec; - //[JobSpec:] - - - //[end] } export class JobTemplateSpec { metadata: ObjectMeta; spec: JobSpec; - //[JobTemplateSpec:] - - - //[end] } export class CronJobSpec { @@ -920,20 +604,12 @@ export class CronJobSpec { jobTemplate: JobTemplateSpec; successfulJobsHistoryLimit: number; failedJobsHistoryLimit: number; - //[CronJobSpec:] - - - //[end] } export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - - - //[end] } export class StatusDetails { @@ -943,19 +619,11 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - - - //[end] } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - - - //[end] } export class Status { @@ -967,27 +635,15 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - - - //[end] } export class Initializer { name: string; - //[Initializer:] - - - //[end] } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - - - //[end] } export class OwnerReference { @@ -997,17 +653,9 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - - - //[end] } export class Time { - //[Time:] - - - //[end] } export class ObjectMeta { @@ -1027,10 +675,6 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - - - //[end] } export class KubeCronJob { @@ -1039,8 +683,4 @@ export class KubeCronJob { metadata: ObjectMeta; spec: CronJobSpec; status: CronJobStatus; - //[CronJob:] - - - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts b/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts index fb796611b..ac8f3afa7 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts @@ -9,17 +9,17 @@ export class DaemonSetCondition { message: string; constructor(init?: DaemonSetCondition) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.status) this.status = init.status; - if (init.lastTransitionTime) this.lastTransitionTime = init.lastTransitionTime; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.status) { this.status = init.status; } + if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } } static emptyObject(): DaemonSetCondition { - let result = new DaemonSetCondition(); + const result = new DaemonSetCondition(); result.lastTransitionTime = Time.emptyObject(); return result; } @@ -39,22 +39,22 @@ export class DaemonSetStatus { conditions: DaemonSetCondition[]; constructor(init?: DaemonSetStatus) { - if (!init) return; - if (init.currentNumberScheduled) this.currentNumberScheduled = init.currentNumberScheduled; - if (init.numberMisscheduled) this.numberMisscheduled = init.numberMisscheduled; - if (init.desiredNumberScheduled) this.desiredNumberScheduled = init.desiredNumberScheduled; - if (init.numberReady) this.numberReady = init.numberReady; - if (init.observedGeneration) this.observedGeneration = init.observedGeneration; - if (init.updatedNumberScheduled) this.updatedNumberScheduled = init.updatedNumberScheduled; - if (init.numberAvailable) this.numberAvailable = init.numberAvailable; - if (init.numberUnavailable) this.numberUnavailable = init.numberUnavailable; - if (init.collisionCount) this.collisionCount = init.collisionCount; - if (init.conditions) this.conditions = init.conditions; + if (!init) { return; } + if (init.currentNumberScheduled) { this.currentNumberScheduled = init.currentNumberScheduled; } + if (init.numberMisscheduled) { this.numberMisscheduled = init.numberMisscheduled; } + if (init.desiredNumberScheduled) { this.desiredNumberScheduled = init.desiredNumberScheduled; } + if (init.numberReady) { this.numberReady = init.numberReady; } + if (init.observedGeneration) { this.observedGeneration = init.observedGeneration; } + if (init.updatedNumberScheduled) { this.updatedNumberScheduled = init.updatedNumberScheduled; } + if (init.numberAvailable) { this.numberAvailable = init.numberAvailable; } + if (init.numberUnavailable) { this.numberUnavailable = init.numberUnavailable; } + if (init.collisionCount) { this.collisionCount = init.collisionCount; } + if (init.conditions) { this.conditions = init.conditions; } } static emptyObject(): DaemonSetStatus { - let result = new DaemonSetStatus(); + const result = new DaemonSetStatus(); result.conditions = []; return result; } @@ -65,13 +65,13 @@ export class RollingUpdateDaemonSet { maxUnavailable?: IntOrString; constructor(init?: RollingUpdateDaemonSet) { - if (!init) return; - if (init.maxUnavailable) this.maxUnavailable = init.maxUnavailable; + if (!init) { return; } + if (init.maxUnavailable) { this.maxUnavailable = init.maxUnavailable; } } static emptyObject(): RollingUpdateDaemonSet { - let result = new RollingUpdateDaemonSet(); + const result = new RollingUpdateDaemonSet(); result.maxUnavailable = IntOrString.emptyObject(); return result; } @@ -83,14 +83,14 @@ export class DaemonSetUpdateStrategy { rollingUpdate?: RollingUpdateDaemonSet; constructor(init?: DaemonSetUpdateStrategy) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.rollingUpdate) this.rollingUpdate = init.rollingUpdate; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.rollingUpdate) { this.rollingUpdate = init.rollingUpdate; } } static emptyObject(): DaemonSetUpdateStrategy { - let result = new DaemonSetUpdateStrategy(); + const result = new DaemonSetUpdateStrategy(); result.rollingUpdate = RollingUpdateDaemonSet.emptyObject(); return result; } @@ -102,14 +102,14 @@ export class PodDNSConfigOption { value?: string; constructor(init?: PodDNSConfigOption) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } } static emptyObject(): PodDNSConfigOption { - let result = new PodDNSConfigOption(); + const result = new PodDNSConfigOption(); return result; } @@ -121,15 +121,15 @@ export class PodDNSConfig { options: PodDNSConfigOption[]; constructor(init?: PodDNSConfig) { - if (!init) return; - if (init.nameservers) this.nameservers = init.nameservers; - if (init.searches) this.searches = init.searches; - if (init.options) this.options = init.options; + if (!init) { return; } + if (init.nameservers) { this.nameservers = init.nameservers; } + if (init.searches) { this.searches = init.searches; } + if (init.options) { this.options = init.options; } } static emptyObject(): PodDNSConfig { - let result = new PodDNSConfig(); + const result = new PodDNSConfig(); result.nameservers = []; result.searches = []; result.options = []; @@ -143,14 +143,14 @@ export class HostAlias { hostnames: string[]; constructor(init?: HostAlias) { - if (!init) return; - if (init.ip) this.ip = init.ip; - if (init.hostnames) this.hostnames = init.hostnames; + if (!init) { return; } + if (init.ip) { this.ip = init.ip; } + if (init.hostnames) { this.hostnames = init.hostnames; } } static emptyObject(): HostAlias { - let result = new HostAlias(); + const result = new HostAlias(); result.hostnames = []; return result; } @@ -165,17 +165,17 @@ export class Toleration { tolerationSeconds?: number; constructor(init?: Toleration) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.value) this.value = init.value; - if (init.effect) this.effect = init.effect; - if (init.tolerationSeconds) this.tolerationSeconds = init.tolerationSeconds; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.value) { this.value = init.value; } + if (init.effect) { this.effect = init.effect; } + if (init.tolerationSeconds) { this.tolerationSeconds = init.tolerationSeconds; } } static emptyObject(): Toleration { - let result = new Toleration(); + const result = new Toleration(); return result; } @@ -187,14 +187,18 @@ export class PodAntiAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -207,14 +211,14 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -227,15 +231,15 @@ export class PodAffinityTerm { topologyKey: string; constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } } static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); + const result = new PodAffinityTerm(); result.labelSelector = LabelSelector.emptyObject(); result.namespaces = []; return result; @@ -248,14 +252,18 @@ export class PodAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -268,14 +276,14 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -288,15 +296,15 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -307,13 +315,13 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -324,13 +332,13 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -342,14 +350,18 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -363,15 +375,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -390,18 +402,18 @@ export class PodSecurityContext { fsGroup?: number; constructor(init?: PodSecurityContext) { - if (!init) return; - if (init.seLinuxOptions) this.seLinuxOptions = init.seLinuxOptions; - if (init.runAsUser) this.runAsUser = init.runAsUser; - if (init.runAsGroup) this.runAsGroup = init.runAsGroup; - if (init.runAsNonRoot) this.runAsNonRoot = init.runAsNonRoot; - if (init.supplementalGroups) this.supplementalGroups = init.supplementalGroups; - if (init.fsGroup) this.fsGroup = init.fsGroup; + if (!init) { return; } + if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } + if (init.runAsUser) { this.runAsUser = init.runAsUser; } + if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } + if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } + if (init.supplementalGroups) { this.supplementalGroups = init.supplementalGroups; } + if (init.fsGroup) { this.fsGroup = init.fsGroup; } } static emptyObject(): PodSecurityContext { - let result = new PodSecurityContext(); + const result = new PodSecurityContext(); result.seLinuxOptions = SELinuxOptions.emptyObject(); result.supplementalGroups = []; return result; @@ -416,16 +428,16 @@ export class SELinuxOptions { level: string; constructor(init?: SELinuxOptions) { - if (!init) return; - if (init.user) this.user = init.user; - if (init.role) this.role = init.role; - if (init.type) this.type = init.type; - if (init.level) this.level = init.level; + if (!init) { return; } + if (init.user) { this.user = init.user; } + if (init.role) { this.role = init.role; } + if (init.type) { this.type = init.type; } + if (init.level) { this.level = init.level; } } static emptyObject(): SELinuxOptions { - let result = new SELinuxOptions(); + const result = new SELinuxOptions(); return result; } @@ -436,14 +448,14 @@ export class Capabilities { drop: string[]; constructor(init?: Capabilities) { - if (!init) return; - if (init.add) this.add = init.add; - if (init.drop) this.drop = init.drop; + if (!init) { return; } + if (init.add) { this.add = init.add; } + if (init.drop) { this.drop = init.drop; } } static emptyObject(): Capabilities { - let result = new Capabilities(); + const result = new Capabilities(); result.add = []; result.drop = []; return result; @@ -462,20 +474,20 @@ export class SecurityContext { allowPrivilegeEscalation?: boolean; constructor(init?: SecurityContext) { - if (!init) return; - if (init.capabilities) this.capabilities = init.capabilities; - if (init.privileged) this.privileged = init.privileged; - if (init.seLinuxOptions) this.seLinuxOptions = init.seLinuxOptions; - if (init.runAsUser) this.runAsUser = init.runAsUser; - if (init.runAsGroup) this.runAsGroup = init.runAsGroup; - if (init.runAsNonRoot) this.runAsNonRoot = init.runAsNonRoot; - if (init.readOnlyRootFilesystem) this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; - if (init.allowPrivilegeEscalation) this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; + if (!init) { return; } + if (init.capabilities) { this.capabilities = init.capabilities; } + if (init.privileged) { this.privileged = init.privileged; } + if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } + if (init.runAsUser) { this.runAsUser = init.runAsUser; } + if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } + if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } + if (init.readOnlyRootFilesystem) { this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; } + if (init.allowPrivilegeEscalation) { this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; } } static emptyObject(): SecurityContext { - let result = new SecurityContext(); + const result = new SecurityContext(); result.capabilities = Capabilities.emptyObject(); result.seLinuxOptions = SELinuxOptions.emptyObject(); return result; @@ -492,15 +504,15 @@ export class Handler { tcpSocket?: TCPSocketAction; constructor(init?: Handler) { - if (!init) return; - if (init.exec) this.exec = init.exec; - if (init.httpGet) this.httpGet = init.httpGet; - if (init.tcpSocket) this.tcpSocket = init.tcpSocket; + if (!init) { return; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } } static emptyObject(): Handler { - let result = new Handler(); + const result = new Handler(); result.exec = ExecAction.emptyObject(); result.httpGet = HTTPGetAction.emptyObject(); result.tcpSocket = TCPSocketAction.emptyObject(); @@ -514,14 +526,14 @@ export class Lifecycle { preStop?: Handler; constructor(init?: Lifecycle) { - if (!init) return; - if (init.postStart) this.postStart = init.postStart; - if (init.preStop) this.preStop = init.preStop; + if (!init) { return; } + if (init.postStart) { this.postStart = init.postStart; } + if (init.preStop) { this.preStop = init.preStop; } } static emptyObject(): Lifecycle { - let result = new Lifecycle(); + const result = new Lifecycle(); result.postStart = Handler.emptyObject(); result.preStop = Handler.emptyObject(); return result; @@ -535,14 +547,14 @@ export class TCPSocketAction { host: string; constructor(init?: TCPSocketAction) { - if (!init) return; - if (init.port) this.port = init.port; - if (init.host) this.host = init.host; + if (!init) { return; } + if (init.port) { this.port = init.port; } + if (init.host) { this.host = init.host; } } static emptyObject(): TCPSocketAction { - let result = new TCPSocketAction(); + const result = new TCPSocketAction(); result.port = IntOrString.emptyObject(); return result; } @@ -554,14 +566,14 @@ export class HTTPHeader { value: string; constructor(init?: HTTPHeader) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } } static emptyObject(): HTTPHeader { - let result = new HTTPHeader(); + const result = new HTTPHeader(); return result; } @@ -573,15 +585,15 @@ export class IntOrString { StrVal: string; constructor(init?: IntOrString) { - if (!init) return; - if (init.Type) this.Type = init.Type; - if (init.IntVal) this.IntVal = init.IntVal; - if (init.StrVal) this.StrVal = init.StrVal; + if (!init) { return; } + if (init.Type) { this.Type = init.Type; } + if (init.IntVal) { this.IntVal = init.IntVal; } + if (init.StrVal) { this.StrVal = init.StrVal; } } static emptyObject(): IntOrString { - let result = new IntOrString(); + const result = new IntOrString(); return result; } @@ -595,17 +607,17 @@ export class HTTPGetAction { httpHeaders: HTTPHeader[]; constructor(init?: HTTPGetAction) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.port) this.port = init.port; - if (init.host) this.host = init.host; - if (init.scheme) this.scheme = init.scheme; - if (init.httpHeaders) this.httpHeaders = init.httpHeaders; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.port) { this.port = init.port; } + if (init.host) { this.host = init.host; } + if (init.scheme) { this.scheme = init.scheme; } + if (init.httpHeaders) { this.httpHeaders = init.httpHeaders; } } static emptyObject(): HTTPGetAction { - let result = new HTTPGetAction(); + const result = new HTTPGetAction(); result.port = IntOrString.emptyObject(); result.httpHeaders = []; return result; @@ -617,13 +629,13 @@ export class ExecAction { command: string[]; constructor(init?: ExecAction) { - if (!init) return; - if (init.command) this.command = init.command; + if (!init) { return; } + if (init.command) { this.command = init.command; } } static emptyObject(): ExecAction { - let result = new ExecAction(); + const result = new ExecAction(); result.command = []; return result; } @@ -641,20 +653,20 @@ export class Probe { failureThreshold: number; constructor(init?: Probe) { - if (!init) return; - if (init.exec) this.exec = init.exec; - if (init.httpGet) this.httpGet = init.httpGet; - if (init.tcpSocket) this.tcpSocket = init.tcpSocket; - if (init.initialDelaySeconds) this.initialDelaySeconds = init.initialDelaySeconds; - if (init.timeoutSeconds) this.timeoutSeconds = init.timeoutSeconds; - if (init.periodSeconds) this.periodSeconds = init.periodSeconds; - if (init.successThreshold) this.successThreshold = init.successThreshold; - if (init.failureThreshold) this.failureThreshold = init.failureThreshold; + if (!init) { return; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } + if (init.initialDelaySeconds) { this.initialDelaySeconds = init.initialDelaySeconds; } + if (init.timeoutSeconds) { this.timeoutSeconds = init.timeoutSeconds; } + if (init.periodSeconds) { this.periodSeconds = init.periodSeconds; } + if (init.successThreshold) { this.successThreshold = init.successThreshold; } + if (init.failureThreshold) { this.failureThreshold = init.failureThreshold; } } static emptyObject(): Probe { - let result = new Probe(); + const result = new Probe(); result.exec = ExecAction.emptyObject(); result.httpGet = HTTPGetAction.emptyObject(); result.tcpSocket = TCPSocketAction.emptyObject(); @@ -668,14 +680,14 @@ export class VolumeDevice { devicePath: string; constructor(init?: VolumeDevice) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.devicePath) this.devicePath = init.devicePath; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.devicePath) { this.devicePath = init.devicePath; } } static emptyObject(): VolumeDevice { - let result = new VolumeDevice(); + const result = new VolumeDevice(); return result; } @@ -689,17 +701,17 @@ export class VolumeMount { mountPropagation?: string; constructor(init?: VolumeMount) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.mountPath) this.mountPath = init.mountPath; - if (init.subPath) this.subPath = init.subPath; - if (init.mountPropagation) this.mountPropagation = init.mountPropagation; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.mountPath) { this.mountPath = init.mountPath; } + if (init.subPath) { this.subPath = init.subPath; } + if (init.mountPropagation) { this.mountPropagation = init.mountPropagation; } } static emptyObject(): VolumeMount { - let result = new VolumeMount(); + const result = new VolumeMount(); return result; } @@ -710,14 +722,14 @@ export class ResourceRequirements { requests?: { [key: string]: any }; constructor(init?: ResourceRequirements) { - if (!init) return; - if (init.limits) this.limits = init.limits; - if (init.requests) this.requests = init.requests; + if (!init) { return; } + if (init.limits) { this.limits = init.limits; } + if (init.requests) { this.requests = init.requests; } } static emptyObject(): ResourceRequirements { - let result = new ResourceRequirements(); + const result = new ResourceRequirements(); result.limits = null; result.requests = null; return result; @@ -731,15 +743,15 @@ export class SecretKeySelector { optional?: boolean; constructor(init?: SecretKeySelector) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.key) this.key = init.key; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.key) { this.key = init.key; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretKeySelector { - let result = new SecretKeySelector(); + const result = new SecretKeySelector(); return result; } @@ -751,15 +763,15 @@ export class ConfigMapKeySelector { optional?: boolean; constructor(init?: ConfigMapKeySelector) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.key) this.key = init.key; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.key) { this.key = init.key; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapKeySelector { - let result = new ConfigMapKeySelector(); + const result = new ConfigMapKeySelector(); return result; } @@ -773,16 +785,16 @@ export class EnvVarSource { secretKeyRef?: SecretKeySelector; constructor(init?: EnvVarSource) { - if (!init) return; - if (init.fieldRef) this.fieldRef = init.fieldRef; - if (init.resourceFieldRef) this.resourceFieldRef = init.resourceFieldRef; - if (init.configMapKeyRef) this.configMapKeyRef = init.configMapKeyRef; - if (init.secretKeyRef) this.secretKeyRef = init.secretKeyRef; + if (!init) { return; } + if (init.fieldRef) { this.fieldRef = init.fieldRef; } + if (init.resourceFieldRef) { this.resourceFieldRef = init.resourceFieldRef; } + if (init.configMapKeyRef) { this.configMapKeyRef = init.configMapKeyRef; } + if (init.secretKeyRef) { this.secretKeyRef = init.secretKeyRef; } } static emptyObject(): EnvVarSource { - let result = new EnvVarSource(); + const result = new EnvVarSource(); result.fieldRef = ObjectFieldSelector.emptyObject(); result.resourceFieldRef = ResourceFieldSelector.emptyObject(); result.configMapKeyRef = ConfigMapKeySelector.emptyObject(); @@ -798,15 +810,15 @@ export class EnvVar { valueFrom?: EnvVarSource; constructor(init?: EnvVar) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; - if (init.valueFrom) this.valueFrom = init.valueFrom; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } + if (init.valueFrom) { this.valueFrom = init.valueFrom; } } static emptyObject(): EnvVar { - let result = new EnvVar(); + const result = new EnvVar(); result.valueFrom = EnvVarSource.emptyObject(); return result; } @@ -818,14 +830,14 @@ export class SecretEnvSource { optional?: boolean; constructor(init?: SecretEnvSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretEnvSource { - let result = new SecretEnvSource(); + const result = new SecretEnvSource(); return result; } @@ -836,14 +848,14 @@ export class ConfigMapEnvSource { optional?: boolean; constructor(init?: ConfigMapEnvSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapEnvSource { - let result = new ConfigMapEnvSource(); + const result = new ConfigMapEnvSource(); return result; } @@ -855,15 +867,15 @@ export class EnvFromSource { secretRef?: SecretEnvSource; constructor(init?: EnvFromSource) { - if (!init) return; - if (init.prefix) this.prefix = init.prefix; - if (init.configMapRef) this.configMapRef = init.configMapRef; - if (init.secretRef) this.secretRef = init.secretRef; + if (!init) { return; } + if (init.prefix) { this.prefix = init.prefix; } + if (init.configMapRef) { this.configMapRef = init.configMapRef; } + if (init.secretRef) { this.secretRef = init.secretRef; } } static emptyObject(): EnvFromSource { - let result = new EnvFromSource(); + const result = new EnvFromSource(); result.configMapRef = ConfigMapEnvSource.emptyObject(); result.secretRef = SecretEnvSource.emptyObject(); return result; @@ -879,17 +891,17 @@ export class ContainerPort { hostIP: string; constructor(init?: ContainerPort) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.hostPort) this.hostPort = init.hostPort; - if (init.containerPort) this.containerPort = init.containerPort; - if (init.protocol) this.protocol = init.protocol; - if (init.hostIP) this.hostIP = init.hostIP; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.hostPort) { this.hostPort = init.hostPort; } + if (init.containerPort) { this.containerPort = init.containerPort; } + if (init.protocol) { this.protocol = init.protocol; } + if (init.hostIP) { this.hostIP = init.hostIP; } } static emptyObject(): ContainerPort { - let result = new ContainerPort(); + const result = new ContainerPort(); return result; } @@ -919,33 +931,33 @@ export class Container { tty: boolean; constructor(init?: Container) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.image) this.image = init.image; - if (init.command) this.command = init.command; - if (init.args) this.args = init.args; - if (init.workingDir) this.workingDir = init.workingDir; - if (init.ports) this.ports = init.ports; - if (init.envFrom) this.envFrom = init.envFrom; - if (init.env) this.env = init.env; - if (init.resources) this.resources = init.resources; - if (init.volumeMounts) this.volumeMounts = init.volumeMounts; - if (init.volumeDevices) this.volumeDevices = init.volumeDevices; - if (init.livenessProbe) this.livenessProbe = init.livenessProbe; - if (init.readinessProbe) this.readinessProbe = init.readinessProbe; - if (init.lifecycle) this.lifecycle = init.lifecycle; - if (init.terminationMessagePath) this.terminationMessagePath = init.terminationMessagePath; - if (init.terminationMessagePolicy) this.terminationMessagePolicy = init.terminationMessagePolicy; - if (init.imagePullPolicy) this.imagePullPolicy = init.imagePullPolicy; - if (init.securityContext) this.securityContext = init.securityContext; - if (init.stdin) this.stdin = init.stdin; - if (init.stdinOnce) this.stdinOnce = init.stdinOnce; - if (init.tty) this.tty = init.tty; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.image) { this.image = init.image; } + if (init.command) { this.command = init.command; } + if (init.args) { this.args = init.args; } + if (init.workingDir) { this.workingDir = init.workingDir; } + if (init.ports) { this.ports = init.ports; } + if (init.envFrom) { this.envFrom = init.envFrom; } + if (init.env) { this.env = init.env; } + if (init.resources) { this.resources = init.resources; } + if (init.volumeMounts) { this.volumeMounts = init.volumeMounts; } + if (init.volumeDevices) { this.volumeDevices = init.volumeDevices; } + if (init.livenessProbe) { this.livenessProbe = init.livenessProbe; } + if (init.readinessProbe) { this.readinessProbe = init.readinessProbe; } + if (init.lifecycle) { this.lifecycle = init.lifecycle; } + if (init.terminationMessagePath) { this.terminationMessagePath = init.terminationMessagePath; } + if (init.terminationMessagePolicy) { this.terminationMessagePolicy = init.terminationMessagePolicy; } + if (init.imagePullPolicy) { this.imagePullPolicy = init.imagePullPolicy; } + if (init.securityContext) { this.securityContext = init.securityContext; } + if (init.stdin) { this.stdin = init.stdin; } + if (init.stdinOnce) { this.stdinOnce = init.stdinOnce; } + if (init.tty) { this.tty = init.tty; } } static emptyObject(): Container { - let result = new Container(); + const result = new Container(); result.command = []; result.args = []; result.ports = []; @@ -971,17 +983,17 @@ export class StorageOSVolumeSource { secretRef?: LocalObjectReference; constructor(init?: StorageOSVolumeSource) { - if (!init) return; - if (init.volumeName) this.volumeName = init.volumeName; - if (init.volumeNamespace) this.volumeNamespace = init.volumeNamespace; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.secretRef) this.secretRef = init.secretRef; + if (!init) { return; } + if (init.volumeName) { this.volumeName = init.volumeName; } + if (init.volumeNamespace) { this.volumeNamespace = init.volumeNamespace; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.secretRef) { this.secretRef = init.secretRef; } } static emptyObject(): StorageOSVolumeSource { - let result = new StorageOSVolumeSource(); + const result = new StorageOSVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); return result; } @@ -1001,22 +1013,22 @@ export class ScaleIOVolumeSource { readOnly: boolean; constructor(init?: ScaleIOVolumeSource) { - if (!init) return; - if (init.gateway) this.gateway = init.gateway; - if (init.system) this.system = init.system; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.sslEnabled) this.sslEnabled = init.sslEnabled; - if (init.protectionDomain) this.protectionDomain = init.protectionDomain; - if (init.storagePool) this.storagePool = init.storagePool; - if (init.storageMode) this.storageMode = init.storageMode; - if (init.volumeName) this.volumeName = init.volumeName; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.gateway) { this.gateway = init.gateway; } + if (init.system) { this.system = init.system; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.sslEnabled) { this.sslEnabled = init.sslEnabled; } + if (init.protectionDomain) { this.protectionDomain = init.protectionDomain; } + if (init.storagePool) { this.storagePool = init.storagePool; } + if (init.storageMode) { this.storageMode = init.storageMode; } + if (init.volumeName) { this.volumeName = init.volumeName; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): ScaleIOVolumeSource { - let result = new ScaleIOVolumeSource(); + const result = new ScaleIOVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); return result; } @@ -1029,15 +1041,15 @@ export class PortworxVolumeSource { readOnly: boolean; constructor(init?: PortworxVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): PortworxVolumeSource { - let result = new PortworxVolumeSource(); + const result = new PortworxVolumeSource(); return result; } @@ -1049,15 +1061,15 @@ export class ConfigMapProjection { optional?: boolean; constructor(init?: ConfigMapProjection) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapProjection { - let result = new ConfigMapProjection(); + const result = new ConfigMapProjection(); result.items = []; return result; } @@ -1068,13 +1080,13 @@ export class DownwardAPIProjection { items: DownwardAPIVolumeFile[]; constructor(init?: DownwardAPIProjection) { - if (!init) return; - if (init.items) this.items = init.items; + if (!init) { return; } + if (init.items) { this.items = init.items; } } static emptyObject(): DownwardAPIProjection { - let result = new DownwardAPIProjection(); + const result = new DownwardAPIProjection(); result.items = []; return result; } @@ -1087,15 +1099,15 @@ export class SecretProjection { optional?: boolean; constructor(init?: SecretProjection) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretProjection { - let result = new SecretProjection(); + const result = new SecretProjection(); result.items = []; return result; } @@ -1108,15 +1120,15 @@ export class VolumeProjection { configMap?: ConfigMapProjection; constructor(init?: VolumeProjection) { - if (!init) return; - if (init.secret) this.secret = init.secret; - if (init.downwardAPI) this.downwardAPI = init.downwardAPI; - if (init.configMap) this.configMap = init.configMap; + if (!init) { return; } + if (init.secret) { this.secret = init.secret; } + if (init.downwardAPI) { this.downwardAPI = init.downwardAPI; } + if (init.configMap) { this.configMap = init.configMap; } } static emptyObject(): VolumeProjection { - let result = new VolumeProjection(); + const result = new VolumeProjection(); result.secret = SecretProjection.emptyObject(); result.downwardAPI = DownwardAPIProjection.emptyObject(); result.configMap = ConfigMapProjection.emptyObject(); @@ -1130,14 +1142,14 @@ export class ProjectedVolumeSource { defaultMode?: number; constructor(init?: ProjectedVolumeSource) { - if (!init) return; - if (init.sources) this.sources = init.sources; - if (init.defaultMode) this.defaultMode = init.defaultMode; + if (!init) { return; } + if (init.sources) { this.sources = init.sources; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } } static emptyObject(): ProjectedVolumeSource { - let result = new ProjectedVolumeSource(); + const result = new ProjectedVolumeSource(); result.sources = []; return result; } @@ -1149,14 +1161,14 @@ export class PhotonPersistentDiskVolumeSource { fsType: string; constructor(init?: PhotonPersistentDiskVolumeSource) { - if (!init) return; - if (init.pdID) this.pdID = init.pdID; - if (init.fsType) this.fsType = init.fsType; + if (!init) { return; } + if (init.pdID) { this.pdID = init.pdID; } + if (init.fsType) { this.fsType = init.fsType; } } static emptyObject(): PhotonPersistentDiskVolumeSource { - let result = new PhotonPersistentDiskVolumeSource(); + const result = new PhotonPersistentDiskVolumeSource(); return result; } @@ -1171,18 +1183,18 @@ export class AzureDiskVolumeSource { kind?: string; constructor(init?: AzureDiskVolumeSource) { - if (!init) return; - if (init.diskName) this.diskName = init.diskName; - if (init.diskURI) this.diskURI = init.diskURI; - if (init.cachingMode) this.cachingMode = init.cachingMode; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.kind) this.kind = init.kind; + if (!init) { return; } + if (init.diskName) { this.diskName = init.diskName; } + if (init.diskURI) { this.diskURI = init.diskURI; } + if (init.cachingMode) { this.cachingMode = init.cachingMode; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.kind) { this.kind = init.kind; } } static emptyObject(): AzureDiskVolumeSource { - let result = new AzureDiskVolumeSource(); + const result = new AzureDiskVolumeSource(); return result; } @@ -1196,17 +1208,17 @@ export class QuobyteVolumeSource { group: string; constructor(init?: QuobyteVolumeSource) { - if (!init) return; - if (init.registry) this.registry = init.registry; - if (init.volume) this.volume = init.volume; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.user) this.user = init.user; - if (init.group) this.group = init.group; + if (!init) { return; } + if (init.registry) { this.registry = init.registry; } + if (init.volume) { this.volume = init.volume; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.user) { this.user = init.user; } + if (init.group) { this.group = init.group; } } static emptyObject(): QuobyteVolumeSource { - let result = new QuobyteVolumeSource(); + const result = new QuobyteVolumeSource(); return result; } @@ -1219,16 +1231,16 @@ export class VsphereVirtualDiskVolumeSource { storagePolicyID: string; constructor(init?: VsphereVirtualDiskVolumeSource) { - if (!init) return; - if (init.volumePath) this.volumePath = init.volumePath; - if (init.fsType) this.fsType = init.fsType; - if (init.storagePolicyName) this.storagePolicyName = init.storagePolicyName; - if (init.storagePolicyID) this.storagePolicyID = init.storagePolicyID; + if (!init) { return; } + if (init.volumePath) { this.volumePath = init.volumePath; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.storagePolicyName) { this.storagePolicyName = init.storagePolicyName; } + if (init.storagePolicyID) { this.storagePolicyID = init.storagePolicyID; } } static emptyObject(): VsphereVirtualDiskVolumeSource { - let result = new VsphereVirtualDiskVolumeSource(); + const result = new VsphereVirtualDiskVolumeSource(); return result; } @@ -1241,16 +1253,16 @@ export class ConfigMapVolumeSource { optional?: boolean; constructor(init?: ConfigMapVolumeSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapVolumeSource { - let result = new ConfigMapVolumeSource(); + const result = new ConfigMapVolumeSource(); result.items = []; return result; } @@ -1263,15 +1275,15 @@ export class AzureFileVolumeSource { readOnly: boolean; constructor(init?: AzureFileVolumeSource) { - if (!init) return; - if (init.secretName) this.secretName = init.secretName; - if (init.shareName) this.shareName = init.shareName; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.secretName) { this.secretName = init.secretName; } + if (init.shareName) { this.shareName = init.shareName; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): AzureFileVolumeSource { - let result = new AzureFileVolumeSource(); + const result = new AzureFileVolumeSource(); return result; } @@ -1285,17 +1297,17 @@ export class FCVolumeSource { wwids: string[]; constructor(init?: FCVolumeSource) { - if (!init) return; - if (init.targetWWNs) this.targetWWNs = init.targetWWNs; - if (init.lun) this.lun = init.lun; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.wwids) this.wwids = init.wwids; + if (!init) { return; } + if (init.targetWWNs) { this.targetWWNs = init.targetWWNs; } + if (init.lun) { this.lun = init.lun; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.wwids) { this.wwids = init.wwids; } } static emptyObject(): FCVolumeSource { - let result = new FCVolumeSource(); + const result = new FCVolumeSource(); result.targetWWNs = []; result.wwids = []; return result; @@ -1309,15 +1321,15 @@ export class ResourceFieldSelector { divisor: Quantity; constructor(init?: ResourceFieldSelector) { - if (!init) return; - if (init.containerName) this.containerName = init.containerName; - if (init.resource) this.resource = init.resource; - if (init.divisor) this.divisor = init.divisor; + if (!init) { return; } + if (init.containerName) { this.containerName = init.containerName; } + if (init.resource) { this.resource = init.resource; } + if (init.divisor) { this.divisor = init.divisor; } } static emptyObject(): ResourceFieldSelector { - let result = new ResourceFieldSelector(); + const result = new ResourceFieldSelector(); result.divisor = Quantity.emptyObject(); return result; } @@ -1329,14 +1341,14 @@ export class ObjectFieldSelector { fieldPath: string; constructor(init?: ObjectFieldSelector) { - if (!init) return; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.fieldPath) this.fieldPath = init.fieldPath; + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.fieldPath) { this.fieldPath = init.fieldPath; } } static emptyObject(): ObjectFieldSelector { - let result = new ObjectFieldSelector(); + const result = new ObjectFieldSelector(); return result; } @@ -1349,16 +1361,16 @@ export class DownwardAPIVolumeFile { mode?: number; constructor(init?: DownwardAPIVolumeFile) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.fieldRef) this.fieldRef = init.fieldRef; - if (init.resourceFieldRef) this.resourceFieldRef = init.resourceFieldRef; - if (init.mode) this.mode = init.mode; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.fieldRef) { this.fieldRef = init.fieldRef; } + if (init.resourceFieldRef) { this.resourceFieldRef = init.resourceFieldRef; } + if (init.mode) { this.mode = init.mode; } } static emptyObject(): DownwardAPIVolumeFile { - let result = new DownwardAPIVolumeFile(); + const result = new DownwardAPIVolumeFile(); result.fieldRef = ObjectFieldSelector.emptyObject(); result.resourceFieldRef = ResourceFieldSelector.emptyObject(); return result; @@ -1371,14 +1383,14 @@ export class DownwardAPIVolumeSource { defaultMode?: number; constructor(init?: DownwardAPIVolumeSource) { - if (!init) return; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; + if (!init) { return; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } } static emptyObject(): DownwardAPIVolumeSource { - let result = new DownwardAPIVolumeSource(); + const result = new DownwardAPIVolumeSource(); result.items = []; return result; } @@ -1390,14 +1402,14 @@ export class FlockerVolumeSource { datasetUUID: string; constructor(init?: FlockerVolumeSource) { - if (!init) return; - if (init.datasetName) this.datasetName = init.datasetName; - if (init.datasetUUID) this.datasetUUID = init.datasetUUID; + if (!init) { return; } + if (init.datasetName) { this.datasetName = init.datasetName; } + if (init.datasetUUID) { this.datasetUUID = init.datasetUUID; } } static emptyObject(): FlockerVolumeSource { - let result = new FlockerVolumeSource(); + const result = new FlockerVolumeSource(); return result; } @@ -1412,18 +1424,18 @@ export class CephFSVolumeSource { readOnly: boolean; constructor(init?: CephFSVolumeSource) { - if (!init) return; - if (init.monitors) this.monitors = init.monitors; - if (init.path) this.path = init.path; - if (init.user) this.user = init.user; - if (init.secretFile) this.secretFile = init.secretFile; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.monitors) { this.monitors = init.monitors; } + if (init.path) { this.path = init.path; } + if (init.user) { this.user = init.user; } + if (init.secretFile) { this.secretFile = init.secretFile; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): CephFSVolumeSource { - let result = new CephFSVolumeSource(); + const result = new CephFSVolumeSource(); result.monitors = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1437,15 +1449,15 @@ export class CinderVolumeSource { readOnly: boolean; constructor(init?: CinderVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): CinderVolumeSource { - let result = new CinderVolumeSource(); + const result = new CinderVolumeSource(); return result; } @@ -1459,17 +1471,17 @@ export class FlexVolumeSource { options?: { [key: string]: string }; constructor(init?: FlexVolumeSource) { - if (!init) return; - if (init.driver) this.driver = init.driver; - if (init.fsType) this.fsType = init.fsType; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.options) this.options = init.options; + if (!init) { return; } + if (init.driver) { this.driver = init.driver; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.options) { this.options = init.options; } } static emptyObject(): FlexVolumeSource { - let result = new FlexVolumeSource(); + const result = new FlexVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); result.options = null; return result; @@ -1488,20 +1500,20 @@ export class RBDVolumeSource { readOnly: boolean; constructor(init?: RBDVolumeSource) { - if (!init) return; - if (init.monitors) this.monitors = init.monitors; - if (init.image) this.image = init.image; - if (init.fsType) this.fsType = init.fsType; - if (init.pool) this.pool = init.pool; - if (init.user) this.user = init.user; - if (init.keyring) this.keyring = init.keyring; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.monitors) { this.monitors = init.monitors; } + if (init.image) { this.image = init.image; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.pool) { this.pool = init.pool; } + if (init.user) { this.user = init.user; } + if (init.keyring) { this.keyring = init.keyring; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): RBDVolumeSource { - let result = new RBDVolumeSource(); + const result = new RBDVolumeSource(); result.monitors = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1514,14 +1526,14 @@ export class PersistentVolumeClaimVolumeSource { readOnly: boolean; constructor(init?: PersistentVolumeClaimVolumeSource) { - if (!init) return; - if (init.claimName) this.claimName = init.claimName; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.claimName) { this.claimName = init.claimName; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): PersistentVolumeClaimVolumeSource { - let result = new PersistentVolumeClaimVolumeSource(); + const result = new PersistentVolumeClaimVolumeSource(); return result; } @@ -1533,15 +1545,15 @@ export class GlusterfsVolumeSource { readOnly: boolean; constructor(init?: GlusterfsVolumeSource) { - if (!init) return; - if (init.endpoints) this.endpoints = init.endpoints; - if (init.path) this.path = init.path; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.endpoints) { this.endpoints = init.endpoints; } + if (init.path) { this.path = init.path; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): GlusterfsVolumeSource { - let result = new GlusterfsVolumeSource(); + const result = new GlusterfsVolumeSource(); return result; } @@ -1551,13 +1563,13 @@ export class LocalObjectReference { name: string; constructor(init?: LocalObjectReference) { - if (!init) return; - if (init.name) this.name = init.name; + if (!init) { return; } + if (init.name) { this.name = init.name; } } static emptyObject(): LocalObjectReference { - let result = new LocalObjectReference(); + const result = new LocalObjectReference(); return result; } @@ -1577,23 +1589,23 @@ export class ISCSIVolumeSource { initiatorName?: string; constructor(init?: ISCSIVolumeSource) { - if (!init) return; - if (init.targetPortal) this.targetPortal = init.targetPortal; - if (init.iqn) this.iqn = init.iqn; - if (init.lun) this.lun = init.lun; - if (init.iscsiInterface) this.iscsiInterface = init.iscsiInterface; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.portals) this.portals = init.portals; - if (init.chapAuthDiscovery) this.chapAuthDiscovery = init.chapAuthDiscovery; - if (init.chapAuthSession) this.chapAuthSession = init.chapAuthSession; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.initiatorName) this.initiatorName = init.initiatorName; + if (!init) { return; } + if (init.targetPortal) { this.targetPortal = init.targetPortal; } + if (init.iqn) { this.iqn = init.iqn; } + if (init.lun) { this.lun = init.lun; } + if (init.iscsiInterface) { this.iscsiInterface = init.iscsiInterface; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.portals) { this.portals = init.portals; } + if (init.chapAuthDiscovery) { this.chapAuthDiscovery = init.chapAuthDiscovery; } + if (init.chapAuthSession) { this.chapAuthSession = init.chapAuthSession; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.initiatorName) { this.initiatorName = init.initiatorName; } } static emptyObject(): ISCSIVolumeSource { - let result = new ISCSIVolumeSource(); + const result = new ISCSIVolumeSource(); result.portals = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1607,15 +1619,15 @@ export class NFSVolumeSource { readOnly: boolean; constructor(init?: NFSVolumeSource) { - if (!init) return; - if (init.server) this.server = init.server; - if (init.path) this.path = init.path; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.server) { this.server = init.server; } + if (init.path) { this.path = init.path; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): NFSVolumeSource { - let result = new NFSVolumeSource(); + const result = new NFSVolumeSource(); return result; } @@ -1627,15 +1639,15 @@ export class KeyToPath { mode?: number; constructor(init?: KeyToPath) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.path) this.path = init.path; - if (init.mode) this.mode = init.mode; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.path) { this.path = init.path; } + if (init.mode) { this.mode = init.mode; } } static emptyObject(): KeyToPath { - let result = new KeyToPath(); + const result = new KeyToPath(); return result; } @@ -1648,16 +1660,16 @@ export class SecretVolumeSource { optional?: boolean; constructor(init?: SecretVolumeSource) { - if (!init) return; - if (init.secretName) this.secretName = init.secretName; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.secretName) { this.secretName = init.secretName; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretVolumeSource { - let result = new SecretVolumeSource(); + const result = new SecretVolumeSource(); result.items = []; return result; } @@ -1670,15 +1682,15 @@ export class GitRepoVolumeSource { directory: string; constructor(init?: GitRepoVolumeSource) { - if (!init) return; - if (init.repository) this.repository = init.repository; - if (init.revision) this.revision = init.revision; - if (init.directory) this.directory = init.directory; + if (!init) { return; } + if (init.repository) { this.repository = init.repository; } + if (init.revision) { this.revision = init.revision; } + if (init.directory) { this.directory = init.directory; } } static emptyObject(): GitRepoVolumeSource { - let result = new GitRepoVolumeSource(); + const result = new GitRepoVolumeSource(); return result; } @@ -1691,16 +1703,16 @@ export class AWSElasticBlockStoreVolumeSource { readOnly: boolean; constructor(init?: AWSElasticBlockStoreVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.partition) this.partition = init.partition; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.partition) { this.partition = init.partition; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): AWSElasticBlockStoreVolumeSource { - let result = new AWSElasticBlockStoreVolumeSource(); + const result = new AWSElasticBlockStoreVolumeSource(); return result; } @@ -1713,16 +1725,16 @@ export class GCEPersistentDiskVolumeSource { readOnly: boolean; constructor(init?: GCEPersistentDiskVolumeSource) { - if (!init) return; - if (init.pdName) this.pdName = init.pdName; - if (init.fsType) this.fsType = init.fsType; - if (init.partition) this.partition = init.partition; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.pdName) { this.pdName = init.pdName; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.partition) { this.partition = init.partition; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): GCEPersistentDiskVolumeSource { - let result = new GCEPersistentDiskVolumeSource(); + const result = new GCEPersistentDiskVolumeSource(); return result; } @@ -1732,13 +1744,13 @@ export class Quantity { Format: string; constructor(init?: Quantity) { - if (!init) return; - if (init.Format) this.Format = init.Format; + if (!init) { return; } + if (init.Format) { this.Format = init.Format; } } static emptyObject(): Quantity { - let result = new Quantity(); + const result = new Quantity(); return result; } @@ -1749,14 +1761,14 @@ export class EmptyDirVolumeSource { sizeLimit?: Quantity; constructor(init?: EmptyDirVolumeSource) { - if (!init) return; - if (init.medium) this.medium = init.medium; - if (init.sizeLimit) this.sizeLimit = init.sizeLimit; + if (!init) { return; } + if (init.medium) { this.medium = init.medium; } + if (init.sizeLimit) { this.sizeLimit = init.sizeLimit; } } static emptyObject(): EmptyDirVolumeSource { - let result = new EmptyDirVolumeSource(); + const result = new EmptyDirVolumeSource(); result.sizeLimit = Quantity.emptyObject(); return result; } @@ -1768,14 +1780,14 @@ export class HostPathVolumeSource { type?: string; constructor(init?: HostPathVolumeSource) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.type) this.type = init.type; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.type) { this.type = init.type; } } static emptyObject(): HostPathVolumeSource { - let result = new HostPathVolumeSource(); + const result = new HostPathVolumeSource(); return result; } @@ -1812,40 +1824,40 @@ export class Volume { storageos?: StorageOSVolumeSource; constructor(init?: Volume) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.hostPath) this.hostPath = init.hostPath; - if (init.emptyDir) this.emptyDir = init.emptyDir; - if (init.gcePersistentDisk) this.gcePersistentDisk = init.gcePersistentDisk; - if (init.awsElasticBlockStore) this.awsElasticBlockStore = init.awsElasticBlockStore; - if (init.gitRepo) this.gitRepo = init.gitRepo; - if (init.secret) this.secret = init.secret; - if (init.nfs) this.nfs = init.nfs; - if (init.iscsi) this.iscsi = init.iscsi; - if (init.glusterfs) this.glusterfs = init.glusterfs; - if (init.persistentVolumeClaim) this.persistentVolumeClaim = init.persistentVolumeClaim; - if (init.rbd) this.rbd = init.rbd; - if (init.flexVolume) this.flexVolume = init.flexVolume; - if (init.cinder) this.cinder = init.cinder; - if (init.cephfs) this.cephfs = init.cephfs; - if (init.flocker) this.flocker = init.flocker; - if (init.downwardAPI) this.downwardAPI = init.downwardAPI; - if (init.fc) this.fc = init.fc; - if (init.azureFile) this.azureFile = init.azureFile; - if (init.configMap) this.configMap = init.configMap; - if (init.vsphereVolume) this.vsphereVolume = init.vsphereVolume; - if (init.quobyte) this.quobyte = init.quobyte; - if (init.azureDisk) this.azureDisk = init.azureDisk; - if (init.photonPersistentDisk) this.photonPersistentDisk = init.photonPersistentDisk; - if (init.projected) this.projected = init.projected; - if (init.portworxVolume) this.portworxVolume = init.portworxVolume; - if (init.scaleIO) this.scaleIO = init.scaleIO; - if (init.storageos) this.storageos = init.storageos; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.hostPath) { this.hostPath = init.hostPath; } + if (init.emptyDir) { this.emptyDir = init.emptyDir; } + if (init.gcePersistentDisk) { this.gcePersistentDisk = init.gcePersistentDisk; } + if (init.awsElasticBlockStore) { this.awsElasticBlockStore = init.awsElasticBlockStore; } + if (init.gitRepo) { this.gitRepo = init.gitRepo; } + if (init.secret) { this.secret = init.secret; } + if (init.nfs) { this.nfs = init.nfs; } + if (init.iscsi) { this.iscsi = init.iscsi; } + if (init.glusterfs) { this.glusterfs = init.glusterfs; } + if (init.persistentVolumeClaim) { this.persistentVolumeClaim = init.persistentVolumeClaim; } + if (init.rbd) { this.rbd = init.rbd; } + if (init.flexVolume) { this.flexVolume = init.flexVolume; } + if (init.cinder) { this.cinder = init.cinder; } + if (init.cephfs) { this.cephfs = init.cephfs; } + if (init.flocker) { this.flocker = init.flocker; } + if (init.downwardAPI) { this.downwardAPI = init.downwardAPI; } + if (init.fc) { this.fc = init.fc; } + if (init.azureFile) { this.azureFile = init.azureFile; } + if (init.configMap) { this.configMap = init.configMap; } + if (init.vsphereVolume) { this.vsphereVolume = init.vsphereVolume; } + if (init.quobyte) { this.quobyte = init.quobyte; } + if (init.azureDisk) { this.azureDisk = init.azureDisk; } + if (init.photonPersistentDisk) { this.photonPersistentDisk = init.photonPersistentDisk; } + if (init.projected) { this.projected = init.projected; } + if (init.portworxVolume) { this.portworxVolume = init.portworxVolume; } + if (init.scaleIO) { this.scaleIO = init.scaleIO; } + if (init.storageos) { this.storageos = init.storageos; } } static emptyObject(): Volume { - let result = new Volume(); + const result = new Volume(); result.hostPath = HostPathVolumeSource.emptyObject(); result.emptyDir = EmptyDirVolumeSource.emptyObject(); result.gcePersistentDisk = GCEPersistentDiskVolumeSource.emptyObject(); @@ -1908,39 +1920,39 @@ export class PodSpec { dnsConfig?: PodDNSConfig; constructor(init?: PodSpec) { - if (!init) return; - if (init.volumes) this.volumes = init.volumes; - if (init.initContainers) this.initContainers = init.initContainers; - if (init.containers) this.containers = init.containers; - if (init.restartPolicy) this.restartPolicy = init.restartPolicy; - if (init.terminationGracePeriodSeconds) this.terminationGracePeriodSeconds = init.terminationGracePeriodSeconds; - if (init.activeDeadlineSeconds) this.activeDeadlineSeconds = init.activeDeadlineSeconds; - if (init.dnsPolicy) this.dnsPolicy = init.dnsPolicy; - if (init.nodeSelector) this.nodeSelector = init.nodeSelector; - if (init.serviceAccountName) this.serviceAccountName = init.serviceAccountName; - if (init.serviceAccount) this.serviceAccount = init.serviceAccount; - if (init.automountServiceAccountToken) this.automountServiceAccountToken = init.automountServiceAccountToken; - if (init.nodeName) this.nodeName = init.nodeName; - if (init.hostNetwork) this.hostNetwork = init.hostNetwork; - if (init.hostPID) this.hostPID = init.hostPID; - if (init.hostIPC) this.hostIPC = init.hostIPC; - if (init.shareProcessNamespace) this.shareProcessNamespace = init.shareProcessNamespace; - if (init.securityContext) this.securityContext = init.securityContext; - if (init.imagePullSecrets) this.imagePullSecrets = init.imagePullSecrets; - if (init.hostname) this.hostname = init.hostname; - if (init.subdomain) this.subdomain = init.subdomain; - if (init.affinity) this.affinity = init.affinity; - if (init.schedulerName) this.schedulerName = init.schedulerName; - if (init.tolerations) this.tolerations = init.tolerations; - if (init.hostAliases) this.hostAliases = init.hostAliases; - if (init.priorityClassName) this.priorityClassName = init.priorityClassName; - if (init.priority) this.priority = init.priority; - if (init.dnsConfig) this.dnsConfig = init.dnsConfig; + if (!init) { return; } + if (init.volumes) { this.volumes = init.volumes; } + if (init.initContainers) { this.initContainers = init.initContainers; } + if (init.containers) { this.containers = init.containers; } + if (init.restartPolicy) { this.restartPolicy = init.restartPolicy; } + if (init.terminationGracePeriodSeconds) { this.terminationGracePeriodSeconds = init.terminationGracePeriodSeconds; } + if (init.activeDeadlineSeconds) { this.activeDeadlineSeconds = init.activeDeadlineSeconds; } + if (init.dnsPolicy) { this.dnsPolicy = init.dnsPolicy; } + if (init.nodeSelector) { this.nodeSelector = init.nodeSelector; } + if (init.serviceAccountName) { this.serviceAccountName = init.serviceAccountName; } + if (init.serviceAccount) { this.serviceAccount = init.serviceAccount; } + if (init.automountServiceAccountToken) { this.automountServiceAccountToken = init.automountServiceAccountToken; } + if (init.nodeName) { this.nodeName = init.nodeName; } + if (init.hostNetwork) { this.hostNetwork = init.hostNetwork; } + if (init.hostPID) { this.hostPID = init.hostPID; } + if (init.hostIPC) { this.hostIPC = init.hostIPC; } + if (init.shareProcessNamespace) { this.shareProcessNamespace = init.shareProcessNamespace; } + if (init.securityContext) { this.securityContext = init.securityContext; } + if (init.imagePullSecrets) { this.imagePullSecrets = init.imagePullSecrets; } + if (init.hostname) { this.hostname = init.hostname; } + if (init.subdomain) { this.subdomain = init.subdomain; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.schedulerName) { this.schedulerName = init.schedulerName; } + if (init.tolerations) { this.tolerations = init.tolerations; } + if (init.hostAliases) { this.hostAliases = init.hostAliases; } + if (init.priorityClassName) { this.priorityClassName = init.priorityClassName; } + if (init.priority) { this.priority = init.priority; } + if (init.dnsConfig) { this.dnsConfig = init.dnsConfig; } } static emptyObject(): PodSpec { - let result = new PodSpec(); + const result = new PodSpec(); result.volumes = []; result.initContainers = []; result.containers = []; @@ -1961,14 +1973,14 @@ export class PodTemplateSpec { spec: PodSpec; constructor(init?: PodTemplateSpec) { - if (!init) return; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; + if (!init) { return; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } } static emptyObject(): PodTemplateSpec { - let result = new PodTemplateSpec(); + const result = new PodTemplateSpec(); result.metadata = ObjectMeta.emptyObject(); result.spec = PodSpec.emptyObject(); return result; @@ -1982,15 +1994,15 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -2002,14 +2014,14 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -2026,18 +2038,18 @@ export class DaemonSetSpec { revisionHistoryLimit?: number; constructor(init?: DaemonSetSpec) { - if (!init) return; - if (init.selector) this.selector = init.selector; - if (init.template) this.template = init.template; - if (init.updateStrategy) this.updateStrategy = init.updateStrategy; - if (init.minReadySeconds) this.minReadySeconds = init.minReadySeconds; - if (init.templateGeneration) this.templateGeneration = init.templateGeneration; - if (init.revisionHistoryLimit) this.revisionHistoryLimit = init.revisionHistoryLimit; + if (!init) { return; } + if (init.selector) { this.selector = init.selector; } + if (init.template) { this.template = init.template; } + if (init.updateStrategy) { this.updateStrategy = init.updateStrategy; } + if (init.minReadySeconds) { this.minReadySeconds = init.minReadySeconds; } + if (init.templateGeneration) { this.templateGeneration = init.templateGeneration; } + if (init.revisionHistoryLimit) { this.revisionHistoryLimit = init.revisionHistoryLimit; } } static emptyObject(): DaemonSetSpec { - let result = new DaemonSetSpec(); + const result = new DaemonSetSpec(); result.selector = LabelSelector.emptyObject(); result.template = PodTemplateSpec.emptyObject(); result.updateStrategy = DaemonSetUpdateStrategy.emptyObject(); @@ -2052,15 +2064,15 @@ export class StatusCause { field: string; constructor(init?: StatusCause) { - if (!init) return; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; - if (init.field) this.field = init.field; + if (!init) { return; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } + if (init.field) { this.field = init.field; } } static emptyObject(): StatusCause { - let result = new StatusCause(); + const result = new StatusCause(); return result; } @@ -2075,18 +2087,18 @@ export class StatusDetails { retryAfterSeconds: number; constructor(init?: StatusDetails) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.group) this.group = init.group; - if (init.kind) this.kind = init.kind; - if (init.uid) this.uid = init.uid; - if (init.causes) this.causes = init.causes; - if (init.retryAfterSeconds) this.retryAfterSeconds = init.retryAfterSeconds; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.group) { this.group = init.group; } + if (init.kind) { this.kind = init.kind; } + if (init.uid) { this.uid = init.uid; } + if (init.causes) { this.causes = init.causes; } + if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } } static emptyObject(): StatusDetails { - let result = new StatusDetails(); + const result = new StatusDetails(); result.causes = []; return result; } @@ -2099,15 +2111,15 @@ export class ListMeta { continue: string; constructor(init?: ListMeta) { - if (!init) return; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.continue) this.continue = init.continue; + if (!init) { return; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.continue) { this.continue = init.continue; } } static emptyObject(): ListMeta { - let result = new ListMeta(); + const result = new ListMeta(); return result; } @@ -2124,20 +2136,20 @@ export class Status { code: number; constructor(init?: Status) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.status) this.status = init.status; - if (init.message) this.message = init.message; - if (init.reason) this.reason = init.reason; - if (init.details) this.details = init.details; - if (init.code) this.code = init.code; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.status) { this.status = init.status; } + if (init.message) { this.message = init.message; } + if (init.reason) { this.reason = init.reason; } + if (init.details) { this.details = init.details; } + if (init.code) { this.code = init.code; } } static emptyObject(): Status { - let result = new Status(); + const result = new Status(); result.metadata = ListMeta.emptyObject(); result.details = StatusDetails.emptyObject(); return result; @@ -2149,13 +2161,13 @@ export class Initializer { name: string; constructor(init?: Initializer) { - if (!init) return; - if (init.name) this.name = init.name; + if (!init) { return; } + if (init.name) { this.name = init.name; } } static emptyObject(): Initializer { - let result = new Initializer(); + const result = new Initializer(); return result; } @@ -2166,14 +2178,14 @@ export class Initializers { result?: Status; constructor(init?: Initializers) { - if (!init) return; - if (init.pending) this.pending = init.pending; - if (init.result) this.result = init.result; + if (!init) { return; } + if (init.pending) { this.pending = init.pending; } + if (init.result) { this.result = init.result; } } static emptyObject(): Initializers { - let result = new Initializers(); + const result = new Initializers(); result.pending = []; result.result = Status.emptyObject(); return result; @@ -2190,18 +2202,18 @@ export class OwnerReference { blockOwnerDeletion?: boolean; constructor(init?: OwnerReference) { - if (!init) return; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.kind) this.kind = init.kind; - if (init.name) this.name = init.name; - if (init.uid) this.uid = init.uid; - if (init.controller) this.controller = init.controller; - if (init.blockOwnerDeletion) this.blockOwnerDeletion = init.blockOwnerDeletion; + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.kind) { this.kind = init.kind; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.controller) { this.controller = init.controller; } + if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } } static emptyObject(): OwnerReference { - let result = new OwnerReference(); + const result = new OwnerReference(); return result; } @@ -2212,13 +2224,13 @@ export class Time { Time: Date; constructor(init?: Time) { - if (!init) return; - if (init.Time) this.Time = new Date(init.Time as any); + if (!init) { return; } + if (init.Time) { this.Time = new Date(init.Time as any); } } static emptyObject(): Time { - let result = new Time(); + const result = new Time(); result.Time = null; return result; } @@ -2244,28 +2256,28 @@ export class ObjectMeta { clusterName: string; constructor(init?: ObjectMeta) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.generateName) this.generateName = init.generateName; - if (init.namespace) this.namespace = init.namespace; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.uid) this.uid = init.uid; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.generation) this.generation = init.generation; - if (init.creationTimestamp) this.creationTimestamp = init.creationTimestamp; - if (init.deletionTimestamp) this.deletionTimestamp = init.deletionTimestamp; - if (init.deletionGracePeriodSeconds) this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; - if (init.labels) this.labels = init.labels; - if (init.annotations) this.annotations = init.annotations; - if (init.ownerReferences) this.ownerReferences = init.ownerReferences; - if (init.initializers) this.initializers = init.initializers; - if (init.finalizers) this.finalizers = init.finalizers; - if (init.clusterName) this.clusterName = init.clusterName; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.generateName) { this.generateName = init.generateName; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.uid) { this.uid = init.uid; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.generation) { this.generation = init.generation; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } + if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } + if (init.initializers) { this.initializers = init.initializers; } + if (init.finalizers) { this.finalizers = init.finalizers; } + if (init.clusterName) { this.clusterName = init.clusterName; } } static emptyObject(): ObjectMeta { - let result = new ObjectMeta(); + const result = new ObjectMeta(); result.creationTimestamp = Time.emptyObject(); result.deletionTimestamp = Time.emptyObject(); result.labels = null; @@ -2286,17 +2298,17 @@ export class KubeDaemonSet { status: DaemonSetStatus; constructor(init?: KubeDaemonSet) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } + if (init.status) { this.status = init.status; } } static emptyObject(): KubeDaemonSet { - let result = new KubeDaemonSet(); + const result = new KubeDaemonSet(); result.metadata = ObjectMeta.emptyObject(); result.spec = DaemonSetSpec.emptyObject(); result.status = DaemonSetStatus.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts b/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts index 272fad64a..93f33b13a 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts @@ -318,13 +318,13 @@ export class ResourceRequirements { //[ResourceRequirements:] constructor(init?: ResourceRequirements) { - if (!init) return; - if (init.limits) this.limits = init.limits; - if (init.requests) this.requests = init.requests; + if (!init) { return; } + if (init.limits) { this.limits = init.limits; } + if (init.requests) { this.requests = init.requests; } } static emptyObject(): ResourceRequirements { - let result = new ResourceRequirements(); + const result = new ResourceRequirements(); result.limits = null; result.requests = null; return result; diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts b/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts index 6192b0b92..72ef610fb 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts @@ -14,22 +14,22 @@ export class NodeSystemInfo { architecture: string; constructor(init?: NodeSystemInfo) { - if (!init) return; - if (init.machineID) this.machineID = init.machineID; - if (init.systemUUID) this.systemUUID = init.systemUUID; - if (init.bootID) this.bootID = init.bootID; - if (init.kernelVersion) this.kernelVersion = init.kernelVersion; - if (init.osImage) this.osImage = init.osImage; - if (init.containerRuntimeVersion) this.containerRuntimeVersion = init.containerRuntimeVersion; - if (init.kubeletVersion) this.kubeletVersion = init.kubeletVersion; - if (init.kubeProxyVersion) this.kubeProxyVersion = init.kubeProxyVersion; - if (init.operatingSystem) this.operatingSystem = init.operatingSystem; - if (init.architecture) this.architecture = init.architecture; + if (!init) { return; } + if (init.machineID) { this.machineID = init.machineID; } + if (init.systemUUID) { this.systemUUID = init.systemUUID; } + if (init.bootID) { this.bootID = init.bootID; } + if (init.kernelVersion) { this.kernelVersion = init.kernelVersion; } + if (init.osImage) { this.osImage = init.osImage; } + if (init.containerRuntimeVersion) { this.containerRuntimeVersion = init.containerRuntimeVersion; } + if (init.kubeletVersion) { this.kubeletVersion = init.kubeletVersion; } + if (init.kubeProxyVersion) { this.kubeProxyVersion = init.kubeProxyVersion; } + if (init.operatingSystem) { this.operatingSystem = init.operatingSystem; } + if (init.architecture) { this.architecture = init.architecture; } } static emptyObject(): NodeSystemInfo { - let result = new NodeSystemInfo(); + const result = new NodeSystemInfo(); return result; } @@ -39,13 +39,13 @@ export class Quantity { Format: string; constructor(init?: Quantity) { - if (!init) return; - if (init.Format) this.Format = init.Format; + if (!init) { return; } + if (init.Format) { this.Format = init.Format; } } static emptyObject(): Quantity { - let result = new Quantity(); + const result = new Quantity(); return result; } @@ -56,14 +56,14 @@ export class NodeStatus { nodeInfo: NodeSystemInfo; constructor(init?: NodeStatus) { - if (!init) return; - if (init.capacity) this.capacity = init.capacity; - if (init.nodeInfo) this.nodeInfo = init.nodeInfo; + if (!init) { return; } + if (init.capacity) { this.capacity = init.capacity; } + if (init.nodeInfo) { this.nodeInfo = init.nodeInfo; } } static emptyObject(): NodeStatus { - let result = new NodeStatus(); + const result = new NodeStatus(); result.capacity = null; result.nodeInfo = NodeSystemInfo.emptyObject(); return result; @@ -75,13 +75,13 @@ export class Time { Time: Date; constructor(init?: Time) { - if (!init) return; + if (!init) { return; } if (init.Time) this.Time = new Date(init.Time as any); } static emptyObject(): Time { - let result = new Time(); + const result = new Time(); result.Time = null; return result; } @@ -95,16 +95,16 @@ export class Taint { timeAdded?: Time; constructor(init?: Taint) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.value) this.value = init.value; - if (init.effect) this.effect = init.effect; - if (init.timeAdded) this.timeAdded = init.timeAdded; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.value) { this.value = init.value; } + if (init.effect) { this.effect = init.effect; } + if (init.timeAdded) { this.timeAdded = init.timeAdded; } } static emptyObject(): Taint { - let result = new Taint(); + const result = new Taint(); result.timeAdded = Time.emptyObject(); return result; } @@ -117,15 +117,15 @@ export class NodeSpec { ready: string; constructor(init?: NodeSpec) { - if (!init) return; - if (init.unschedulable) this.unschedulable = init.unschedulable; - if (init.taints) this.taints = init.taints; - if (init.ready) this.ready = init.ready; + if (!init) { return; } + if (init.unschedulable) { this.unschedulable = init.unschedulable; } + if (init.taints) { this.taints = init.taints; } + if (init.ready) { this.ready = init.ready; } } static emptyObject(): NodeSpec { - let result = new NodeSpec(); + const result = new NodeSpec(); result.taints = []; return result; } @@ -139,16 +139,16 @@ export class Node { status: NodeStatus; constructor(init?: Node) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.labels) this.labels = init.labels; - if (init.spec) this.spec = init.spec; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.labels) { this.labels = init.labels; } + if (init.spec) { this.spec = init.spec; } + if (init.status) { this.status = init.status; } } static emptyObject(): Node { - let result = new Node(); + const result = new Node(); result.labels = null; result.spec = NodeSpec.emptyObject(); result.status = NodeStatus.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts index 7a38b70f1..64d17aaa3 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts @@ -6,14 +6,14 @@ export class AttachedVolume { devicePath: string; constructor(init?: AttachedVolume) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.devicePath) this.devicePath = init.devicePath; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.devicePath) { this.devicePath = init.devicePath; } } static emptyObject(): AttachedVolume { - let result = new AttachedVolume(); + const result = new AttachedVolume(); return result; } @@ -24,14 +24,14 @@ export class ContainerImage { sizeBytes: number; constructor(init?: ContainerImage) { - if (!init) return; - if (init.names) this.names = init.names; - if (init.sizeBytes) this.sizeBytes = init.sizeBytes; + if (!init) { return; } + if (init.names) { this.names = init.names; } + if (init.sizeBytes) { this.sizeBytes = init.sizeBytes; } } static emptyObject(): ContainerImage { - let result = new ContainerImage(); + const result = new ContainerImage(); result.names = []; return result; } @@ -51,22 +51,22 @@ export class NodeSystemInfo { architecture: string; constructor(init?: NodeSystemInfo) { - if (!init) return; - if (init.machineID) this.machineID = init.machineID; - if (init.systemUUID) this.systemUUID = init.systemUUID; - if (init.bootID) this.bootID = init.bootID; - if (init.kernelVersion) this.kernelVersion = init.kernelVersion; - if (init.osImage) this.osImage = init.osImage; - if (init.containerRuntimeVersion) this.containerRuntimeVersion = init.containerRuntimeVersion; - if (init.kubeletVersion) this.kubeletVersion = init.kubeletVersion; - if (init.kubeProxyVersion) this.kubeProxyVersion = init.kubeProxyVersion; - if (init.operatingSystem) this.operatingSystem = init.operatingSystem; - if (init.architecture) this.architecture = init.architecture; + if (!init) { return; } + if (init.machineID) { this.machineID = init.machineID; } + if (init.systemUUID) { this.systemUUID = init.systemUUID; } + if (init.bootID) { this.bootID = init.bootID; } + if (init.kernelVersion) { this.kernelVersion = init.kernelVersion; } + if (init.osImage) { this.osImage = init.osImage; } + if (init.containerRuntimeVersion) { this.containerRuntimeVersion = init.containerRuntimeVersion; } + if (init.kubeletVersion) { this.kubeletVersion = init.kubeletVersion; } + if (init.kubeProxyVersion) { this.kubeProxyVersion = init.kubeProxyVersion; } + if (init.operatingSystem) { this.operatingSystem = init.operatingSystem; } + if (init.architecture) { this.architecture = init.architecture; } } static emptyObject(): NodeSystemInfo { - let result = new NodeSystemInfo(); + const result = new NodeSystemInfo(); return result; } @@ -76,13 +76,13 @@ export class DaemonEndpoint { Port: number; constructor(init?: DaemonEndpoint) { - if (!init) return; - if (init.Port) this.Port = init.Port; + if (!init) { return; } + if (init.port) { this.port = init.port; } } static emptyObject(): DaemonEndpoint { - let result = new DaemonEndpoint(); + const result = new DaemonEndpoint(); return result; } @@ -92,13 +92,13 @@ export class NodeDaemonEndpoints { kubeletEndpoint: DaemonEndpoint; constructor(init?: NodeDaemonEndpoints) { - if (!init) return; - if (init.kubeletEndpoint) this.kubeletEndpoint = init.kubeletEndpoint; + if (!init) { return; } + if (init.kubeletEndpoint) { this.kubeletEndpoint = init.kubeletEndpoint; } } static emptyObject(): NodeDaemonEndpoints { - let result = new NodeDaemonEndpoints(); + const result = new NodeDaemonEndpoints(); result.kubeletEndpoint = DaemonEndpoint.emptyObject(); return result; } @@ -110,14 +110,14 @@ export class NodeAddress { address: string; constructor(init?: NodeAddress) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.address) this.address = init.address; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.address) { this.address = init.address; } } static emptyObject(): NodeAddress { - let result = new NodeAddress(); + const result = new NodeAddress(); return result; } @@ -133,18 +133,18 @@ export class NodeCondition { message: string; constructor(init?: NodeCondition) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.status) this.status = init.status; - if (init.lastHeartbeatTime) this.lastHeartbeatTime = init.lastHeartbeatTime; - if (init.lastTransitionTime) this.lastTransitionTime = init.lastTransitionTime; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.status) { this.status = init.status; } + if (init.lastHeartbeatTime) { this.lastHeartbeatTime = init.lastHeartbeatTime; } + if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } } static emptyObject(): NodeCondition { - let result = new NodeCondition(); + const result = new NodeCondition(); result.lastHeartbeatTime = Time.emptyObject(); result.lastTransitionTime = Time.emptyObject(); return result; @@ -156,13 +156,13 @@ export class Quantity { Format: string; constructor(init?: Quantity) { - if (!init) return; - if (init.Format) this.Format = init.Format; + if (!init) { return; } + if (init.Format) { this.Format = init.Format; } } static emptyObject(): Quantity { - let result = new Quantity(); + const result = new Quantity(); return result; } @@ -181,22 +181,22 @@ export class NodeStatus { volumesAttached: AttachedVolume[]; constructor(init?: NodeStatus) { - if (!init) return; - if (init.capacity) this.capacity = init.capacity; - if (init.allocatable) this.allocatable = init.allocatable; - if (init.phase) this.phase = init.phase; - if (init.conditions) this.conditions = init.conditions; - if (init.addresses) this.addresses = init.addresses; - if (init.daemonEndpoints) this.daemonEndpoints = init.daemonEndpoints; - if (init.nodeInfo) this.nodeInfo = init.nodeInfo; - if (init.images) this.images = init.images; - if (init.volumesInUse) this.volumesInUse = init.volumesInUse; - if (init.volumesAttached) this.volumesAttached = init.volumesAttached; + if (!init) { return; } + if (init.capacity) { this.capacity = init.capacity; } + if (init.allocatable) { this.allocatable = init.allocatable; } + if (init.phase) { this.phase = init.phase; } + if (init.conditions) { this.conditions = init.conditions; } + if (init.addresses) { this.addresses = init.addresses; } + if (init.daemonEndpoints) { this.daemonEndpoints = init.daemonEndpoints; } + if (init.nodeInfo) { this.nodeInfo = init.nodeInfo; } + if (init.images) { this.images = init.images; } + if (init.volumesInUse) { this.volumesInUse = init.volumesInUse; } + if (init.volumesAttached) { this.volumesAttached = init.volumesAttached; } } static emptyObject(): NodeStatus { - let result = new NodeStatus(); + const result = new NodeStatus(); result.capacity = null; result.allocatable = null; result.conditions = []; @@ -221,19 +221,19 @@ export class ObjectReference { fieldPath: string; constructor(init?: ObjectReference) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.namespace) this.namespace = init.namespace; - if (init.name) this.name = init.name; - if (init.uid) this.uid = init.uid; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.fieldPath) this.fieldPath = init.fieldPath; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.fieldPath) { this.fieldPath = init.fieldPath; } } static emptyObject(): ObjectReference { - let result = new ObjectReference(); + const result = new ObjectReference(); return result; } @@ -245,15 +245,15 @@ export class NodeConfigSource { configMapRef?: ObjectReference; constructor(init?: NodeConfigSource) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.configMapRef) this.configMapRef = init.configMapRef; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.configMapRef) { this.configMapRef = init.configMapRef; } } static emptyObject(): NodeConfigSource { - let result = new NodeConfigSource(); + const result = new NodeConfigSource(); result.configMapRef = ObjectReference.emptyObject(); return result; } @@ -267,16 +267,16 @@ export class Taint { timeAdded?: Time; constructor(init?: Taint) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.value) this.value = init.value; - if (init.effect) this.effect = init.effect; - if (init.timeAdded) this.timeAdded = init.timeAdded; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.value) { this.value = init.value; } + if (init.effect) { this.effect = init.effect; } + if (init.timeAdded) { this.timeAdded = init.timeAdded; } } static emptyObject(): Taint { - let result = new Taint(); + const result = new Taint(); result.timeAdded = Time.emptyObject(); return result; } @@ -292,18 +292,18 @@ export class NodeSpec { configSource?: NodeConfigSource; constructor(init?: NodeSpec) { - if (!init) return; - if (init.podCIDR) this.podCIDR = init.podCIDR; - if (init.externalID) this.externalID = init.externalID; - if (init.providerID) this.providerID = init.providerID; - if (init.unschedulable) this.unschedulable = init.unschedulable; - if (init.taints) this.taints = init.taints; - if (init.configSource) this.configSource = init.configSource; + if (!init) { return; } + if (init.podCIDR) { this.podCIDR = init.podCIDR; } + if (init.externalID) { this.externalID = init.externalID; } + if (init.providerID) { this.providerID = init.providerID; } + if (init.unschedulable) { this.unschedulable = init.unschedulable; } + if (init.taints) { this.taints = init.taints; } + if (init.configSource) { this.configSource = init.configSource; } } static emptyObject(): NodeSpec { - let result = new NodeSpec(); + const result = new NodeSpec(); result.taints = []; result.configSource = NodeConfigSource.emptyObject(); return result; @@ -317,15 +317,15 @@ export class StatusCause { field: string; constructor(init?: StatusCause) { - if (!init) return; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; - if (init.field) this.field = init.field; + if (!init) { return; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } + if (init.field) { this.field = init.field; } } static emptyObject(): StatusCause { - let result = new StatusCause(); + const result = new StatusCause(); return result; } @@ -340,18 +340,18 @@ export class StatusDetails { retryAfterSeconds: number; constructor(init?: StatusDetails) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.group) this.group = init.group; - if (init.kind) this.kind = init.kind; - if (init.uid) this.uid = init.uid; - if (init.causes) this.causes = init.causes; - if (init.retryAfterSeconds) this.retryAfterSeconds = init.retryAfterSeconds; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.group) { this.group = init.group; } + if (init.kind) { this.kind = init.kind; } + if (init.uid) { this.uid = init.uid; } + if (init.causes) { this.causes = init.causes; } + if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } } static emptyObject(): StatusDetails { - let result = new StatusDetails(); + const result = new StatusDetails(); result.causes = []; return result; } @@ -364,15 +364,15 @@ export class ListMeta { continue: string; constructor(init?: ListMeta) { - if (!init) return; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.continue) this.continue = init.continue; + if (!init) { return; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.continue) { this.continue = init.continue; } } static emptyObject(): ListMeta { - let result = new ListMeta(); + const result = new ListMeta(); return result; } @@ -389,20 +389,20 @@ export class Status { code: number; constructor(init?: Status) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.status) this.status = init.status; - if (init.message) this.message = init.message; - if (init.reason) this.reason = init.reason; - if (init.details) this.details = init.details; - if (init.code) this.code = init.code; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.status) { this.status = init.status; } + if (init.message) { this.message = init.message; } + if (init.reason) { this.reason = init.reason; } + if (init.details) { this.details = init.details; } + if (init.code) { this.code = init.code; } } static emptyObject(): Status { - let result = new Status(); + const result = new Status(); result.metadata = ListMeta.emptyObject(); result.details = StatusDetails.emptyObject(); return result; @@ -414,13 +414,13 @@ export class Initializer { name: string; constructor(init?: Initializer) { - if (!init) return; - if (init.name) this.name = init.name; + if (!init) { return; } + if (init.name) { this.name = init.name; } } static emptyObject(): Initializer { - let result = new Initializer(); + const result = new Initializer(); return result; } @@ -431,14 +431,14 @@ export class Initializers { result?: Status; constructor(init?: Initializers) { - if (!init) return; - if (init.pending) this.pending = init.pending; - if (init.result) this.result = init.result; + if (!init) { return; } + if (init.pending) { this.pending = init.pending; } + if (init.result) { this.result = init.result; } } static emptyObject(): Initializers { - let result = new Initializers(); + const result = new Initializers(); result.pending = []; result.result = Status.emptyObject(); return result; @@ -455,18 +455,18 @@ export class OwnerReference { blockOwnerDeletion?: boolean; constructor(init?: OwnerReference) { - if (!init) return; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.kind) this.kind = init.kind; - if (init.name) this.name = init.name; - if (init.uid) this.uid = init.uid; - if (init.controller) this.controller = init.controller; - if (init.blockOwnerDeletion) this.blockOwnerDeletion = init.blockOwnerDeletion; + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.kind) { this.kind = init.kind; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.controller) { this.controller = init.controller; } + if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } } static emptyObject(): OwnerReference { - let result = new OwnerReference(); + const result = new OwnerReference(); return result; } @@ -477,13 +477,13 @@ export class Time { Time: Date; constructor(init?: Time) { - if (!init) return; + if (!init) { return; } if (init.Time) this.Time = new Date(init.Time as any); } static emptyObject(): Time { - let result = new Time(); + const result = new Time(); result.Time = null; return result; } @@ -509,28 +509,28 @@ export class ObjectMeta { clusterName: string; constructor(init?: ObjectMeta) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.generateName) this.generateName = init.generateName; - if (init.namespace) this.namespace = init.namespace; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.uid) this.uid = init.uid; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.generation) this.generation = init.generation; - if (init.creationTimestamp) this.creationTimestamp = init.creationTimestamp; - if (init.deletionTimestamp) this.deletionTimestamp = init.deletionTimestamp; - if (init.deletionGracePeriodSeconds) this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; - if (init.labels) this.labels = init.labels; - if (init.annotations) this.annotations = init.annotations; - if (init.ownerReferences) this.ownerReferences = init.ownerReferences; - if (init.initializers) this.initializers = init.initializers; - if (init.finalizers) this.finalizers = init.finalizers; - if (init.clusterName) this.clusterName = init.clusterName; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.generateName) { this.generateName = init.generateName; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.uid) { this.uid = init.uid; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.generation) { this.generation = init.generation; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } + if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } + if (init.initializers) { this.initializers = init.initializers; } + if (init.finalizers) { this.finalizers = init.finalizers; } + if (init.clusterName) { this.clusterName = init.clusterName; } } static emptyObject(): ObjectMeta { - let result = new ObjectMeta(); + const result = new ObjectMeta(); result.creationTimestamp = Time.emptyObject(); result.deletionTimestamp = Time.emptyObject(); result.labels = null; @@ -551,17 +551,17 @@ export class KubeNode { status: NodeStatus; constructor(init?: KubeNode) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } + if (init.status) { this.status = init.status; } } static emptyObject(): KubeNode { - let result = new KubeNode(); + const result = new KubeNode(); result.metadata = ObjectMeta.emptyObject(); result.spec = NodeSpec.emptyObject(); result.status = NodeStatus.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts index d6f23ad4d..decc1c375 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts @@ -9,17 +9,17 @@ export class StatefulSetCondition { message: string; constructor(init?: StatefulSetCondition) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.status) this.status = init.status; - if (init.lastTransitionTime) this.lastTransitionTime = init.lastTransitionTime; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.status) { this.status = init.status; } + if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } } static emptyObject(): StatefulSetCondition { - let result = new StatefulSetCondition(); + const result = new StatefulSetCondition(); result.lastTransitionTime = null; return result; } @@ -38,21 +38,21 @@ export class StatefulSetStatus { conditions: StatefulSetCondition[]; constructor(init?: StatefulSetStatus) { - if (!init) return; - if (init.observedGeneration) this.observedGeneration = init.observedGeneration; - if (init.replicas) this.replicas = init.replicas; - if (init.readyReplicas) this.readyReplicas = init.readyReplicas; - if (init.currentReplicas) this.currentReplicas = init.currentReplicas; - if (init.updatedReplicas) this.updatedReplicas = init.updatedReplicas; - if (init.currentRevision) this.currentRevision = init.currentRevision; - if (init.updateRevision) this.updateRevision = init.updateRevision; - if (init.collisionCount) this.collisionCount = init.collisionCount; - if (init.conditions) this.conditions = init.conditions; + if (!init) { return; } + if (init.observedGeneration) { this.observedGeneration = init.observedGeneration; } + if (init.replicas) { this.replicas = init.replicas; } + if (init.readyReplicas) { this.readyReplicas = init.readyReplicas; } + if (init.currentReplicas) { this.currentReplicas = init.currentReplicas; } + if (init.updatedReplicas) { this.updatedReplicas = init.updatedReplicas; } + if (init.currentRevision) { this.currentRevision = init.currentRevision; } + if (init.updateRevision) { this.updateRevision = init.updateRevision; } + if (init.collisionCount) { this.collisionCount = init.collisionCount; } + if (init.conditions) { this.conditions = init.conditions; } } static emptyObject(): StatefulSetStatus { - let result = new StatefulSetStatus(); + const result = new StatefulSetStatus(); result.conditions = []; return result; } @@ -63,13 +63,13 @@ export class RollingUpdateStatefulSetStrategy { partition?: number; constructor(init?: RollingUpdateStatefulSetStrategy) { - if (!init) return; - if (init.partition) this.partition = init.partition; + if (!init) { return; } + if (init.partition) { this.partition = init.partition; } } static emptyObject(): RollingUpdateStatefulSetStrategy { - let result = new RollingUpdateStatefulSetStrategy(); + const result = new RollingUpdateStatefulSetStrategy(); return result; } @@ -80,14 +80,14 @@ export class StatefulSetUpdateStrategy { rollingUpdate?: RollingUpdateStatefulSetStrategy; constructor(init?: StatefulSetUpdateStrategy) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.rollingUpdate) this.rollingUpdate = init.rollingUpdate; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.rollingUpdate) { this.rollingUpdate = init.rollingUpdate; } } static emptyObject(): StatefulSetUpdateStrategy { - let result = new StatefulSetUpdateStrategy(); + const result = new StatefulSetUpdateStrategy(); result.rollingUpdate = RollingUpdateStatefulSetStrategy.emptyObject(); return result; } @@ -103,18 +103,18 @@ export class PersistentVolumeClaimCondition { message: string; constructor(init?: PersistentVolumeClaimCondition) { - if (!init) return; - if (init.type) this.type = init.type; - if (init.status) this.status = init.status; - if (init.lastProbeTime) this.lastProbeTime = init.lastProbeTime; - if (init.lastTransitionTime) this.lastTransitionTime = init.lastTransitionTime; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.status) { this.status = init.status; } + if (init.lastProbeTime) { this.lastProbeTime = init.lastProbeTime; } + if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } } static emptyObject(): PersistentVolumeClaimCondition { - let result = new PersistentVolumeClaimCondition(); + const result = new PersistentVolumeClaimCondition(); result.lastProbeTime = null; result.lastTransitionTime = null; return result; @@ -129,16 +129,16 @@ export class PersistentVolumeClaimStatus { conditions: PersistentVolumeClaimCondition[]; constructor(init?: PersistentVolumeClaimStatus) { - if (!init) return; - if (init.phase) this.phase = init.phase; - if (init.accessModes) this.accessModes = init.accessModes; - if (init.capacity) this.capacity = init.capacity; - if (init.conditions) this.conditions = init.conditions; + if (!init) { return; } + if (init.phase) { this.phase = init.phase; } + if (init.accessModes) { this.accessModes = init.accessModes; } + if (init.capacity) { this.capacity = init.capacity; } + if (init.conditions) { this.conditions = init.conditions; } } static emptyObject(): PersistentVolumeClaimStatus { - let result = new PersistentVolumeClaimStatus(); + const result = new PersistentVolumeClaimStatus(); result.accessModes = []; result.capacity = null; result.conditions = []; @@ -157,18 +157,18 @@ export class PersistentVolumeClaimSpec { volumeMode?: string; constructor(init?: PersistentVolumeClaimSpec) { - if (!init) return; - if (init.accessModes) this.accessModes = init.accessModes; - if (init.selector) this.selector = init.selector; - if (init.resources) this.resources = init.resources; - if (init.volumeName) this.volumeName = init.volumeName; - if (init.storageClassName) this.storageClassName = init.storageClassName; - if (init.volumeMode) this.volumeMode = init.volumeMode; + if (!init) { return; } + if (init.accessModes) { this.accessModes = init.accessModes; } + if (init.selector) { this.selector = init.selector; } + if (init.resources) { this.resources = init.resources; } + if (init.volumeName) { this.volumeName = init.volumeName; } + if (init.storageClassName) { this.storageClassName = init.storageClassName; } + if (init.volumeMode) { this.volumeMode = init.volumeMode; } } static emptyObject(): PersistentVolumeClaimSpec { - let result = new PersistentVolumeClaimSpec(); + const result = new PersistentVolumeClaimSpec(); result.accessModes = []; result.selector = LabelSelector.emptyObject(); result.resources = ResourceRequirements.emptyObject(); @@ -185,17 +185,17 @@ export class PersistentVolumeClaim { status: PersistentVolumeClaimStatus; constructor(init?: PersistentVolumeClaim) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } + if (init.status) { this.status = init.status; } } static emptyObject(): PersistentVolumeClaim { - let result = new PersistentVolumeClaim(); + const result = new PersistentVolumeClaim(); result.metadata = ObjectMeta.emptyObject(); result.spec = PersistentVolumeClaimSpec.emptyObject(); result.status = PersistentVolumeClaimStatus.emptyObject(); @@ -209,14 +209,14 @@ export class PodDNSConfigOption { value?: string; constructor(init?: PodDNSConfigOption) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } } static emptyObject(): PodDNSConfigOption { - let result = new PodDNSConfigOption(); + const result = new PodDNSConfigOption(); return result; } @@ -228,15 +228,15 @@ export class PodDNSConfig { options: PodDNSConfigOption[]; constructor(init?: PodDNSConfig) { - if (!init) return; - if (init.nameservers) this.nameservers = init.nameservers; - if (init.searches) this.searches = init.searches; - if (init.options) this.options = init.options; + if (!init) { return; } + if (init.nameservers) { this.nameservers = init.nameservers; } + if (init.searches) { this.searches = init.searches; } + if (init.options) { this.options = init.options; } } static emptyObject(): PodDNSConfig { - let result = new PodDNSConfig(); + const result = new PodDNSConfig(); result.nameservers = []; result.searches = []; result.options = []; @@ -250,14 +250,14 @@ export class HostAlias { hostnames: string[]; constructor(init?: HostAlias) { - if (!init) return; - if (init.ip) this.ip = init.ip; - if (init.hostnames) this.hostnames = init.hostnames; + if (!init) { return; } + if (init.ip) { this.ip = init.ip; } + if (init.hostnames) { this.hostnames = init.hostnames; } } static emptyObject(): HostAlias { - let result = new HostAlias(); + const result = new HostAlias(); result.hostnames = []; return result; } @@ -272,17 +272,17 @@ export class Toleration { tolerationSeconds?: number; constructor(init?: Toleration) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.value) this.value = init.value; - if (init.effect) this.effect = init.effect; - if (init.tolerationSeconds) this.tolerationSeconds = init.tolerationSeconds; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.value) { this.value = init.value; } + if (init.effect) { this.effect = init.effect; } + if (init.tolerationSeconds) { this.tolerationSeconds = init.tolerationSeconds; } } static emptyObject(): Toleration { - let result = new Toleration(); + const result = new Toleration(); return result; } @@ -294,14 +294,14 @@ export class PodAntiAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -314,14 +314,14 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -334,15 +334,15 @@ export class PodAffinityTerm { topologyKey: string; constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } } static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); + const result = new PodAffinityTerm(); result.labelSelector = LabelSelector.emptyObject(); result.namespaces = []; return result; @@ -355,14 +355,14 @@ export class PodAffinity { preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -375,14 +375,14 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -395,15 +395,15 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -414,13 +414,13 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -431,13 +431,13 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -449,14 +449,14 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -470,15 +470,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -497,18 +497,18 @@ export class PodSecurityContext { fsGroup?: number; constructor(init?: PodSecurityContext) { - if (!init) return; - if (init.seLinuxOptions) this.seLinuxOptions = init.seLinuxOptions; - if (init.runAsUser) this.runAsUser = init.runAsUser; - if (init.runAsGroup) this.runAsGroup = init.runAsGroup; - if (init.runAsNonRoot) this.runAsNonRoot = init.runAsNonRoot; - if (init.supplementalGroups) this.supplementalGroups = init.supplementalGroups; - if (init.fsGroup) this.fsGroup = init.fsGroup; + if (!init) { return; } + if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } + if (init.runAsUser) { this.runAsUser = init.runAsUser; } + if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } + if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } + if (init.supplementalGroups) { this.supplementalGroups = init.supplementalGroups; } + if (init.fsGroup) { this.fsGroup = init.fsGroup; } } static emptyObject(): PodSecurityContext { - let result = new PodSecurityContext(); + const result = new PodSecurityContext(); result.seLinuxOptions = SELinuxOptions.emptyObject(); result.supplementalGroups = []; return result; @@ -523,16 +523,16 @@ export class SELinuxOptions { level: string; constructor(init?: SELinuxOptions) { - if (!init) return; - if (init.user) this.user = init.user; - if (init.role) this.role = init.role; - if (init.type) this.type = init.type; - if (init.level) this.level = init.level; + if (!init) { return; } + if (init.user) { this.user = init.user; } + if (init.role) { this.role = init.role; } + if (init.type) { this.type = init.type; } + if (init.level) { this.level = init.level; } } static emptyObject(): SELinuxOptions { - let result = new SELinuxOptions(); + const result = new SELinuxOptions(); return result; } @@ -543,14 +543,14 @@ export class Capabilities { drop: string[]; constructor(init?: Capabilities) { - if (!init) return; - if (init.add) this.add = init.add; - if (init.drop) this.drop = init.drop; + if (!init) { return; } + if (init.add) { this.add = init.add; } + if (init.drop) { this.drop = init.drop; } } static emptyObject(): Capabilities { - let result = new Capabilities(); + const result = new Capabilities(); result.add = []; result.drop = []; return result; @@ -569,20 +569,20 @@ export class SecurityContext { allowPrivilegeEscalation?: boolean; constructor(init?: SecurityContext) { - if (!init) return; - if (init.capabilities) this.capabilities = init.capabilities; - if (init.privileged) this.privileged = init.privileged; - if (init.seLinuxOptions) this.seLinuxOptions = init.seLinuxOptions; - if (init.runAsUser) this.runAsUser = init.runAsUser; - if (init.runAsGroup) this.runAsGroup = init.runAsGroup; - if (init.runAsNonRoot) this.runAsNonRoot = init.runAsNonRoot; - if (init.readOnlyRootFilesystem) this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; - if (init.allowPrivilegeEscalation) this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; + if (!init) { return; } + if (init.capabilities) { this.capabilities = init.capabilities; } + if (init.privileged) { this.privileged = init.privileged; } + if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } + if (init.runAsUser) { this.runAsUser = init.runAsUser; } + if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } + if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } + if (init.readOnlyRootFilesystem) { this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; } + if (init.allowPrivilegeEscalation) { this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; } } static emptyObject(): SecurityContext { - let result = new SecurityContext(); + const result = new SecurityContext(); result.capabilities = Capabilities.emptyObject(); result.seLinuxOptions = SELinuxOptions.emptyObject(); return result; @@ -599,15 +599,15 @@ export class Handler { tcpSocket?: TCPSocketAction; constructor(init?: Handler) { - if (!init) return; - if (init.exec) this.exec = init.exec; - if (init.httpGet) this.httpGet = init.httpGet; - if (init.tcpSocket) this.tcpSocket = init.tcpSocket; + if (!init) { return; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } } static emptyObject(): Handler { - let result = new Handler(); + const result = new Handler(); result.exec = ExecAction.emptyObject(); result.httpGet = HTTPGetAction.emptyObject(); result.tcpSocket = TCPSocketAction.emptyObject(); @@ -621,14 +621,14 @@ export class Lifecycle { preStop?: Handler; constructor(init?: Lifecycle) { - if (!init) return; - if (init.postStart) this.postStart = init.postStart; - if (init.preStop) this.preStop = init.preStop; + if (!init) { return; } + if (init.postStart) { this.postStart = init.postStart; } + if (init.preStop) { this.preStop = init.preStop; } } static emptyObject(): Lifecycle { - let result = new Lifecycle(); + const result = new Lifecycle(); result.postStart = Handler.emptyObject(); result.preStop = Handler.emptyObject(); return result; @@ -642,14 +642,14 @@ export class TCPSocketAction { host: string; constructor(init?: TCPSocketAction) { - if (!init) return; - if (init.port) this.port = init.port; - if (init.host) this.host = init.host; + if (!init) { return; } + if (init.port) { this.port = init.port; } + if (init.host) { this.host = init.host; } } static emptyObject(): TCPSocketAction { - let result = new TCPSocketAction(); + const result = new TCPSocketAction(); result.port = IntOrString.emptyObject(); return result; } @@ -661,14 +661,14 @@ export class HTTPHeader { value: string; constructor(init?: HTTPHeader) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } } static emptyObject(): HTTPHeader { - let result = new HTTPHeader(); + const result = new HTTPHeader(); return result; } @@ -680,15 +680,15 @@ export class IntOrString { StrVal: string; constructor(init?: IntOrString) { - if (!init) return; - if (init.Type) this.Type = init.Type; - if (init.IntVal) this.IntVal = init.IntVal; - if (init.StrVal) this.StrVal = init.StrVal; + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.IntVal) { this.IntVal = init.IntVal; } + if (init.StrVal) { this.StrVal = init.StrVal; } } static emptyObject(): IntOrString { - let result = new IntOrString(); + const result = new IntOrString(); return result; } @@ -702,17 +702,17 @@ export class HTTPGetAction { httpHeaders: HTTPHeader[]; constructor(init?: HTTPGetAction) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.port) this.port = init.port; - if (init.host) this.host = init.host; - if (init.scheme) this.scheme = init.scheme; - if (init.httpHeaders) this.httpHeaders = init.httpHeaders; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.port) { this.port = init.port; } + if (init.host) { this.host = init.host; } + if (init.scheme) { this.scheme = init.scheme; } + if (init.httpHeaders) { this.httpHeaders = init.httpHeaders; } } static emptyObject(): HTTPGetAction { - let result = new HTTPGetAction(); + const result = new HTTPGetAction(); result.port = IntOrString.emptyObject(); result.httpHeaders = []; return result; @@ -724,13 +724,13 @@ export class ExecAction { command: string[]; constructor(init?: ExecAction) { - if (!init) return; - if (init.command) this.command = init.command; + if (!init) { return; } + if (init.command) { this.command = init.command; } } static emptyObject(): ExecAction { - let result = new ExecAction(); + const result = new ExecAction(); result.command = []; return result; } @@ -748,20 +748,20 @@ export class Probe { failureThreshold: number; constructor(init?: Probe) { - if (!init) return; - if (init.exec) this.exec = init.exec; - if (init.httpGet) this.httpGet = init.httpGet; - if (init.tcpSocket) this.tcpSocket = init.tcpSocket; - if (init.initialDelaySeconds) this.initialDelaySeconds = init.initialDelaySeconds; - if (init.timeoutSeconds) this.timeoutSeconds = init.timeoutSeconds; - if (init.periodSeconds) this.periodSeconds = init.periodSeconds; - if (init.successThreshold) this.successThreshold = init.successThreshold; - if (init.failureThreshold) this.failureThreshold = init.failureThreshold; + if (!init) { return; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } + if (init.initialDelaySeconds) { this.initialDelaySeconds = init.initialDelaySeconds; } + if (init.timeoutSeconds) { this.timeoutSeconds = init.timeoutSeconds; } + if (init.periodSeconds) { this.periodSeconds = init.periodSeconds; } + if (init.successThreshold) { this.successThreshold = init.successThreshold; } + if (init.failureThreshold) { this.failureThreshold = init.failureThreshold; } } static emptyObject(): Probe { - let result = new Probe(); + const result = new Probe(); result.exec = ExecAction.emptyObject(); result.httpGet = HTTPGetAction.emptyObject(); result.tcpSocket = TCPSocketAction.emptyObject(); @@ -775,14 +775,14 @@ export class VolumeDevice { devicePath: string; constructor(init?: VolumeDevice) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.devicePath) this.devicePath = init.devicePath; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.devicePath) { this.devicePath = init.devicePath; } } static emptyObject(): VolumeDevice { - let result = new VolumeDevice(); + const result = new VolumeDevice(); return result; } @@ -796,17 +796,17 @@ export class VolumeMount { mountPropagation?: string; constructor(init?: VolumeMount) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.mountPath) this.mountPath = init.mountPath; - if (init.subPath) this.subPath = init.subPath; - if (init.mountPropagation) this.mountPropagation = init.mountPropagation; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.mountPath) { this.mountPath = init.mountPath; } + if (init.subPath) { this.subPath = init.subPath; } + if (init.mountPropagation) { this.mountPropagation = init.mountPropagation; } } static emptyObject(): VolumeMount { - let result = new VolumeMount(); + const result = new VolumeMount(); return result; } @@ -817,14 +817,14 @@ export class ResourceRequirements { requests?: { [key: string]: any }; constructor(init?: ResourceRequirements) { - if (!init) return; - if (init.limits) this.limits = init.limits; - if (init.requests) this.requests = init.requests; + if (!init) { return; } + if (init.limits) { this.limits = init.limits; } + if (init.requests) { this.requests = init.requests; } } static emptyObject(): ResourceRequirements { - let result = new ResourceRequirements(); + const result = new ResourceRequirements(); result.limits = null; result.requests = null; return result; @@ -838,15 +838,15 @@ export class SecretKeySelector { optional?: boolean; constructor(init?: SecretKeySelector) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.key) this.key = init.key; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.key) { this.key = init.key; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretKeySelector { - let result = new SecretKeySelector(); + const result = new SecretKeySelector(); return result; } @@ -858,15 +858,15 @@ export class ConfigMapKeySelector { optional?: boolean; constructor(init?: ConfigMapKeySelector) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.key) this.key = init.key; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.key) { this.key = init.key; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapKeySelector { - let result = new ConfigMapKeySelector(); + const result = new ConfigMapKeySelector(); return result; } @@ -880,16 +880,16 @@ export class EnvVarSource { secretKeyRef?: SecretKeySelector; constructor(init?: EnvVarSource) { - if (!init) return; - if (init.fieldRef) this.fieldRef = init.fieldRef; - if (init.resourceFieldRef) this.resourceFieldRef = init.resourceFieldRef; - if (init.configMapKeyRef) this.configMapKeyRef = init.configMapKeyRef; - if (init.secretKeyRef) this.secretKeyRef = init.secretKeyRef; + if (!init) { return; } + if (init.fieldRef) { this.fieldRef = init.fieldRef; } + if (init.resourceFieldRef) { this.resourceFieldRef = init.resourceFieldRef; } + if (init.configMapKeyRef) { this.configMapKeyRef = init.configMapKeyRef; } + if (init.secretKeyRef) { this.secretKeyRef = init.secretKeyRef; } } static emptyObject(): EnvVarSource { - let result = new EnvVarSource(); + const result = new EnvVarSource(); result.fieldRef = ObjectFieldSelector.emptyObject(); result.resourceFieldRef = ResourceFieldSelector.emptyObject(); result.configMapKeyRef = ConfigMapKeySelector.emptyObject(); @@ -905,15 +905,15 @@ export class EnvVar { valueFrom?: EnvVarSource; constructor(init?: EnvVar) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.value) this.value = init.value; - if (init.valueFrom) this.valueFrom = init.valueFrom; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } + if (init.valueFrom) { this.valueFrom = init.valueFrom; } } static emptyObject(): EnvVar { - let result = new EnvVar(); + const result = new EnvVar(); result.valueFrom = EnvVarSource.emptyObject(); return result; } @@ -925,14 +925,14 @@ export class SecretEnvSource { optional?: boolean; constructor(init?: SecretEnvSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretEnvSource { - let result = new SecretEnvSource(); + const result = new SecretEnvSource(); return result; } @@ -943,14 +943,14 @@ export class ConfigMapEnvSource { optional?: boolean; constructor(init?: ConfigMapEnvSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapEnvSource { - let result = new ConfigMapEnvSource(); + const result = new ConfigMapEnvSource(); return result; } @@ -962,15 +962,15 @@ export class EnvFromSource { secretRef?: SecretEnvSource; constructor(init?: EnvFromSource) { - if (!init) return; - if (init.prefix) this.prefix = init.prefix; - if (init.configMapRef) this.configMapRef = init.configMapRef; - if (init.secretRef) this.secretRef = init.secretRef; + if (!init) { return; } + if (init.prefix) { this.prefix = init.prefix; } + if (init.configMapRef) { this.configMapRef = init.configMapRef; } + if (init.secretRef) { this.secretRef = init.secretRef; } } static emptyObject(): EnvFromSource { - let result = new EnvFromSource(); + const result = new EnvFromSource(); result.configMapRef = ConfigMapEnvSource.emptyObject(); result.secretRef = SecretEnvSource.emptyObject(); return result; @@ -986,17 +986,17 @@ export class ContainerPort { hostIP: string; constructor(init?: ContainerPort) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.hostPort) this.hostPort = init.hostPort; - if (init.containerPort) this.containerPort = init.containerPort; - if (init.protocol) this.protocol = init.protocol; - if (init.hostIP) this.hostIP = init.hostIP; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.hostPort) { this.hostPort = init.hostPort; } + if (init.containerPort) { this.containerPort = init.containerPort; } + if (init.protocol) { this.protocol = init.protocol; } + if (init.hostIP) { this.hostIP = init.hostIP; } } static emptyObject(): ContainerPort { - let result = new ContainerPort(); + const result = new ContainerPort(); return result; } @@ -1026,33 +1026,33 @@ export class Container { tty: boolean; constructor(init?: Container) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.image) this.image = init.image; - if (init.command) this.command = init.command; - if (init.args) this.args = init.args; - if (init.workingDir) this.workingDir = init.workingDir; - if (init.ports) this.ports = init.ports; - if (init.envFrom) this.envFrom = init.envFrom; - if (init.env) this.env = init.env; - if (init.resources) this.resources = init.resources; - if (init.volumeMounts) this.volumeMounts = init.volumeMounts; - if (init.volumeDevices) this.volumeDevices = init.volumeDevices; - if (init.livenessProbe) this.livenessProbe = init.livenessProbe; - if (init.readinessProbe) this.readinessProbe = init.readinessProbe; - if (init.lifecycle) this.lifecycle = init.lifecycle; - if (init.terminationMessagePath) this.terminationMessagePath = init.terminationMessagePath; - if (init.terminationMessagePolicy) this.terminationMessagePolicy = init.terminationMessagePolicy; - if (init.imagePullPolicy) this.imagePullPolicy = init.imagePullPolicy; - if (init.securityContext) this.securityContext = init.securityContext; - if (init.stdin) this.stdin = init.stdin; - if (init.stdinOnce) this.stdinOnce = init.stdinOnce; - if (init.tty) this.tty = init.tty; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.image) { this.image = init.image; } + if (init.command) { this.command = init.command; } + if (init.args) { this.args = init.args; } + if (init.workingDir) { this.workingDir = init.workingDir; } + if (init.ports) { this.ports = init.ports; } + if (init.envFrom) { this.envFrom = init.envFrom; } + if (init.env) { this.env = init.env; } + if (init.resources) { this.resources = init.resources; } + if (init.volumeMounts) { this.volumeMounts = init.volumeMounts; } + if (init.volumeDevices) { this.volumeDevices = init.volumeDevices; } + if (init.livenessProbe) { this.livenessProbe = init.livenessProbe; } + if (init.readinessProbe) { this.readinessProbe = init.readinessProbe; } + if (init.lifecycle) { this.lifecycle = init.lifecycle; } + if (init.terminationMessagePath) { this.terminationMessagePath = init.terminationMessagePath; } + if (init.terminationMessagePolicy) { this.terminationMessagePolicy = init.terminationMessagePolicy; } + if (init.imagePullPolicy) { this.imagePullPolicy = init.imagePullPolicy; } + if (init.securityContext) { this.securityContext = init.securityContext; } + if (init.stdin) { this.stdin = init.stdin; } + if (init.stdinOnce) { this.stdinOnce = init.stdinOnce; } + if (init.tty) { this.tty = init.tty; } } static emptyObject(): Container { - let result = new Container(); + const result = new Container(); result.command = []; result.args = []; result.ports = []; @@ -1078,17 +1078,17 @@ export class StorageOSVolumeSource { secretRef?: LocalObjectReference; constructor(init?: StorageOSVolumeSource) { - if (!init) return; - if (init.volumeName) this.volumeName = init.volumeName; - if (init.volumeNamespace) this.volumeNamespace = init.volumeNamespace; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.secretRef) this.secretRef = init.secretRef; + if (!init) { return; } + if (init.volumeName) { this.volumeName = init.volumeName; } + if (init.volumeNamespace) { this.volumeNamespace = init.volumeNamespace; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.secretRef) { this.secretRef = init.secretRef; } } static emptyObject(): StorageOSVolumeSource { - let result = new StorageOSVolumeSource(); + const result = new StorageOSVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); return result; } @@ -1108,22 +1108,22 @@ export class ScaleIOVolumeSource { readOnly: boolean; constructor(init?: ScaleIOVolumeSource) { - if (!init) return; - if (init.gateway) this.gateway = init.gateway; - if (init.system) this.system = init.system; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.sslEnabled) this.sslEnabled = init.sslEnabled; - if (init.protectionDomain) this.protectionDomain = init.protectionDomain; - if (init.storagePool) this.storagePool = init.storagePool; - if (init.storageMode) this.storageMode = init.storageMode; - if (init.volumeName) this.volumeName = init.volumeName; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.gateway) { this.gateway = init.gateway; } + if (init.system) { this.system = init.system; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.sslEnabled) { this.sslEnabled = init.sslEnabled; } + if (init.protectionDomain) { this.protectionDomain = init.protectionDomain; } + if (init.storagePool) { this.storagePool = init.storagePool; } + if (init.storageMode) { this.storageMode = init.storageMode; } + if (init.volumeName) { this.volumeName = init.volumeName; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): ScaleIOVolumeSource { - let result = new ScaleIOVolumeSource(); + const result = new ScaleIOVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); return result; } @@ -1136,15 +1136,15 @@ export class PortworxVolumeSource { readOnly: boolean; constructor(init?: PortworxVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): PortworxVolumeSource { - let result = new PortworxVolumeSource(); + const result = new PortworxVolumeSource(); return result; } @@ -1156,15 +1156,15 @@ export class ConfigMapProjection { optional?: boolean; constructor(init?: ConfigMapProjection) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapProjection { - let result = new ConfigMapProjection(); + const result = new ConfigMapProjection(); result.items = []; return result; } @@ -1175,13 +1175,13 @@ export class DownwardAPIProjection { items: DownwardAPIVolumeFile[]; constructor(init?: DownwardAPIProjection) { - if (!init) return; - if (init.items) this.items = init.items; + if (!init) { return; } + if (init.items) { this.items = init.items; } } static emptyObject(): DownwardAPIProjection { - let result = new DownwardAPIProjection(); + const result = new DownwardAPIProjection(); result.items = []; return result; } @@ -1194,15 +1194,15 @@ export class SecretProjection { optional?: boolean; constructor(init?: SecretProjection) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretProjection { - let result = new SecretProjection(); + const result = new SecretProjection(); result.items = []; return result; } @@ -1215,15 +1215,15 @@ export class VolumeProjection { configMap?: ConfigMapProjection; constructor(init?: VolumeProjection) { - if (!init) return; - if (init.secret) this.secret = init.secret; - if (init.downwardAPI) this.downwardAPI = init.downwardAPI; - if (init.configMap) this.configMap = init.configMap; + if (!init) { return; } + if (init.secret) { this.secret = init.secret; } + if (init.downwardAPI) { this.downwardAPI = init.downwardAPI; } + if (init.configMap) { this.configMap = init.configMap; } } static emptyObject(): VolumeProjection { - let result = new VolumeProjection(); + const result = new VolumeProjection(); result.secret = SecretProjection.emptyObject(); result.downwardAPI = DownwardAPIProjection.emptyObject(); result.configMap = ConfigMapProjection.emptyObject(); @@ -1237,14 +1237,14 @@ export class ProjectedVolumeSource { defaultMode?: number; constructor(init?: ProjectedVolumeSource) { - if (!init) return; - if (init.sources) this.sources = init.sources; - if (init.defaultMode) this.defaultMode = init.defaultMode; + if (!init) { return; } + if (init.sources) { this.sources = init.sources; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } } static emptyObject(): ProjectedVolumeSource { - let result = new ProjectedVolumeSource(); + const result = new ProjectedVolumeSource(); result.sources = []; return result; } @@ -1256,14 +1256,14 @@ export class PhotonPersistentDiskVolumeSource { fsType: string; constructor(init?: PhotonPersistentDiskVolumeSource) { - if (!init) return; - if (init.pdID) this.pdID = init.pdID; - if (init.fsType) this.fsType = init.fsType; + if (!init) { return; } + if (init.pdID) { this.pdID = init.pdID; } + if (init.fsType) { this.fsType = init.fsType; } } static emptyObject(): PhotonPersistentDiskVolumeSource { - let result = new PhotonPersistentDiskVolumeSource(); + const result = new PhotonPersistentDiskVolumeSource(); return result; } @@ -1278,18 +1278,18 @@ export class AzureDiskVolumeSource { kind?: string; constructor(init?: AzureDiskVolumeSource) { - if (!init) return; - if (init.diskName) this.diskName = init.diskName; - if (init.diskURI) this.diskURI = init.diskURI; - if (init.cachingMode) this.cachingMode = init.cachingMode; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.kind) this.kind = init.kind; + if (!init) { return; } + if (init.diskName) { this.diskName = init.diskName; } + if (init.diskURI) { this.diskURI = init.diskURI; } + if (init.cachingMode) { this.cachingMode = init.cachingMode; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.kind) { this.kind = init.kind; } } static emptyObject(): AzureDiskVolumeSource { - let result = new AzureDiskVolumeSource(); + const result = new AzureDiskVolumeSource(); return result; } @@ -1303,17 +1303,17 @@ export class QuobyteVolumeSource { group: string; constructor(init?: QuobyteVolumeSource) { - if (!init) return; - if (init.registry) this.registry = init.registry; - if (init.volume) this.volume = init.volume; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.user) this.user = init.user; - if (init.group) this.group = init.group; + if (!init) { return; } + if (init.registry) { this.registry = init.registry; } + if (init.volume) { this.volume = init.volume; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.user) { this.user = init.user; } + if (init.group) { this.group = init.group; } } static emptyObject(): QuobyteVolumeSource { - let result = new QuobyteVolumeSource(); + const result = new QuobyteVolumeSource(); return result; } @@ -1326,16 +1326,16 @@ export class VsphereVirtualDiskVolumeSource { storagePolicyID: string; constructor(init?: VsphereVirtualDiskVolumeSource) { - if (!init) return; - if (init.volumePath) this.volumePath = init.volumePath; - if (init.fsType) this.fsType = init.fsType; - if (init.storagePolicyName) this.storagePolicyName = init.storagePolicyName; - if (init.storagePolicyID) this.storagePolicyID = init.storagePolicyID; + if (!init) { return; } + if (init.volumePath) { this.volumePath = init.volumePath; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.storagePolicyName) { this.storagePolicyName = init.storagePolicyName; } + if (init.storagePolicyID) { this.storagePolicyID = init.storagePolicyID; } } static emptyObject(): VsphereVirtualDiskVolumeSource { - let result = new VsphereVirtualDiskVolumeSource(); + const result = new VsphereVirtualDiskVolumeSource(); return result; } @@ -1348,16 +1348,16 @@ export class ConfigMapVolumeSource { optional?: boolean; constructor(init?: ConfigMapVolumeSource) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): ConfigMapVolumeSource { - let result = new ConfigMapVolumeSource(); + const result = new ConfigMapVolumeSource(); result.items = []; return result; } @@ -1370,15 +1370,15 @@ export class AzureFileVolumeSource { readOnly: boolean; constructor(init?: AzureFileVolumeSource) { - if (!init) return; - if (init.secretName) this.secretName = init.secretName; - if (init.shareName) this.shareName = init.shareName; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.secretName) { this.secretName = init.secretName; } + if (init.shareName) { this.shareName = init.shareName; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): AzureFileVolumeSource { - let result = new AzureFileVolumeSource(); + const result = new AzureFileVolumeSource(); return result; } @@ -1392,17 +1392,17 @@ export class FCVolumeSource { wwids: string[]; constructor(init?: FCVolumeSource) { - if (!init) return; - if (init.targetWWNs) this.targetWWNs = init.targetWWNs; - if (init.lun) this.lun = init.lun; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.wwids) this.wwids = init.wwids; + if (!init) { return; } + if (init.targetWWNs) { this.targetWWNs = init.targetWWNs; } + if (init.lun) { this.lun = init.lun; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.wwids) { this.wwids = init.wwids; } } static emptyObject(): FCVolumeSource { - let result = new FCVolumeSource(); + const result = new FCVolumeSource(); result.targetWWNs = []; result.wwids = []; return result; @@ -1416,15 +1416,15 @@ export class ResourceFieldSelector { divisor: string; constructor(init?: ResourceFieldSelector) { - if (!init) return; - if (init.containerName) this.containerName = init.containerName; - if (init.resource) this.resource = init.resource; - if (init.divisor) this.divisor = init.divisor; + if (!init) { return; } + if (init.containerName) { this.containerName = init.containerName; } + if (init.resource) { this.resource = init.resource; } + if (init.divisor) { this.divisor = init.divisor; } } static emptyObject(): ResourceFieldSelector { - let result = new ResourceFieldSelector(); + const result = new ResourceFieldSelector(); result.divisor = null; return result; } @@ -1436,14 +1436,14 @@ export class ObjectFieldSelector { fieldPath: string; constructor(init?: ObjectFieldSelector) { - if (!init) return; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.fieldPath) this.fieldPath = init.fieldPath; + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.fieldPath) { this.fieldPath = init.fieldPath; } } static emptyObject(): ObjectFieldSelector { - let result = new ObjectFieldSelector(); + const result = new ObjectFieldSelector(); return result; } @@ -1456,16 +1456,16 @@ export class DownwardAPIVolumeFile { mode?: number; constructor(init?: DownwardAPIVolumeFile) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.fieldRef) this.fieldRef = init.fieldRef; - if (init.resourceFieldRef) this.resourceFieldRef = init.resourceFieldRef; - if (init.mode) this.mode = init.mode; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.fieldRef) { this.fieldRef = init.fieldRef; } + if (init.resourceFieldRef) { this.resourceFieldRef = init.resourceFieldRef; } + if (init.mode) { this.mode = init.mode; } } static emptyObject(): DownwardAPIVolumeFile { - let result = new DownwardAPIVolumeFile(); + const result = new DownwardAPIVolumeFile(); result.fieldRef = ObjectFieldSelector.emptyObject(); result.resourceFieldRef = ResourceFieldSelector.emptyObject(); return result; @@ -1478,14 +1478,14 @@ export class DownwardAPIVolumeSource { defaultMode?: number; constructor(init?: DownwardAPIVolumeSource) { - if (!init) return; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; + if (!init) { return; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } } static emptyObject(): DownwardAPIVolumeSource { - let result = new DownwardAPIVolumeSource(); + const result = new DownwardAPIVolumeSource(); result.items = []; return result; } @@ -1497,14 +1497,14 @@ export class FlockerVolumeSource { datasetUUID: string; constructor(init?: FlockerVolumeSource) { - if (!init) return; - if (init.datasetName) this.datasetName = init.datasetName; - if (init.datasetUUID) this.datasetUUID = init.datasetUUID; + if (!init) { return; } + if (init.datasetName) { this.datasetName = init.datasetName; } + if (init.datasetUUID) { this.datasetUUID = init.datasetUUID; } } static emptyObject(): FlockerVolumeSource { - let result = new FlockerVolumeSource(); + const result = new FlockerVolumeSource(); return result; } @@ -1519,18 +1519,18 @@ export class CephFSVolumeSource { readOnly: boolean; constructor(init?: CephFSVolumeSource) { - if (!init) return; - if (init.monitors) this.monitors = init.monitors; - if (init.path) this.path = init.path; - if (init.user) this.user = init.user; - if (init.secretFile) this.secretFile = init.secretFile; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.monitors) { this.monitors = init.monitors; } + if (init.path) { this.path = init.path; } + if (init.user) { this.user = init.user; } + if (init.secretFile) { this.secretFile = init.secretFile; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): CephFSVolumeSource { - let result = new CephFSVolumeSource(); + const result = new CephFSVolumeSource(); result.monitors = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1544,15 +1544,15 @@ export class CinderVolumeSource { readOnly: boolean; constructor(init?: CinderVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): CinderVolumeSource { - let result = new CinderVolumeSource(); + const result = new CinderVolumeSource(); return result; } @@ -1566,17 +1566,17 @@ export class FlexVolumeSource { options?: { [key: string]: string }; constructor(init?: FlexVolumeSource) { - if (!init) return; - if (init.driver) this.driver = init.driver; - if (init.fsType) this.fsType = init.fsType; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.options) this.options = init.options; + if (!init) { return; } + if (init.driver) { this.driver = init.driver; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.options) { this.options = init.options; } } static emptyObject(): FlexVolumeSource { - let result = new FlexVolumeSource(); + const result = new FlexVolumeSource(); result.secretRef = LocalObjectReference.emptyObject(); result.options = null; return result; @@ -1595,20 +1595,20 @@ export class RBDVolumeSource { readOnly: boolean; constructor(init?: RBDVolumeSource) { - if (!init) return; - if (init.monitors) this.monitors = init.monitors; - if (init.image) this.image = init.image; - if (init.fsType) this.fsType = init.fsType; - if (init.pool) this.pool = init.pool; - if (init.user) this.user = init.user; - if (init.keyring) this.keyring = init.keyring; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.monitors) { this.monitors = init.monitors; } + if (init.image) { this.image = init.image; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.pool) { this.pool = init.pool; } + if (init.user) { this.user = init.user; } + if (init.keyring) { this.keyring = init.keyring; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): RBDVolumeSource { - let result = new RBDVolumeSource(); + const result = new RBDVolumeSource(); result.monitors = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1621,14 +1621,14 @@ export class PersistentVolumeClaimVolumeSource { readOnly: boolean; constructor(init?: PersistentVolumeClaimVolumeSource) { - if (!init) return; - if (init.claimName) this.claimName = init.claimName; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.claimName) { this.claimName = init.claimName; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): PersistentVolumeClaimVolumeSource { - let result = new PersistentVolumeClaimVolumeSource(); + const result = new PersistentVolumeClaimVolumeSource(); return result; } @@ -1640,15 +1640,15 @@ export class GlusterfsVolumeSource { readOnly: boolean; constructor(init?: GlusterfsVolumeSource) { - if (!init) return; - if (init.endpoints) this.endpoints = init.endpoints; - if (init.path) this.path = init.path; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.endpoints) { this.endpoints = init.endpoints; } + if (init.path) { this.path = init.path; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): GlusterfsVolumeSource { - let result = new GlusterfsVolumeSource(); + const result = new GlusterfsVolumeSource(); return result; } @@ -1658,13 +1658,13 @@ export class LocalObjectReference { name: string; constructor(init?: LocalObjectReference) { - if (!init) return; - if (init.name) this.name = init.name; + if (!init) { return; } + if (init.name) { this.name = init.name; } } static emptyObject(): LocalObjectReference { - let result = new LocalObjectReference(); + const result = new LocalObjectReference(); return result; } @@ -1684,23 +1684,23 @@ export class ISCSIVolumeSource { initiatorName?: string; constructor(init?: ISCSIVolumeSource) { - if (!init) return; - if (init.targetPortal) this.targetPortal = init.targetPortal; - if (init.iqn) this.iqn = init.iqn; - if (init.lun) this.lun = init.lun; - if (init.iscsiInterface) this.iscsiInterface = init.iscsiInterface; - if (init.fsType) this.fsType = init.fsType; - if (init.readOnly) this.readOnly = init.readOnly; - if (init.portals) this.portals = init.portals; - if (init.chapAuthDiscovery) this.chapAuthDiscovery = init.chapAuthDiscovery; - if (init.chapAuthSession) this.chapAuthSession = init.chapAuthSession; - if (init.secretRef) this.secretRef = init.secretRef; - if (init.initiatorName) this.initiatorName = init.initiatorName; + if (!init) { return; } + if (init.targetPortal) { this.targetPortal = init.targetPortal; } + if (init.iqn) { this.iqn = init.iqn; } + if (init.lun) { this.lun = init.lun; } + if (init.iscsiInterface) { this.iscsiInterface = init.iscsiInterface; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.readOnly) { this.readOnly = init.readOnly; } + if (init.portals) { this.portals = init.portals; } + if (init.chapAuthDiscovery) { this.chapAuthDiscovery = init.chapAuthDiscovery; } + if (init.chapAuthSession) { this.chapAuthSession = init.chapAuthSession; } + if (init.secretRef) { this.secretRef = init.secretRef; } + if (init.initiatorName) { this.initiatorName = init.initiatorName; } } static emptyObject(): ISCSIVolumeSource { - let result = new ISCSIVolumeSource(); + const result = new ISCSIVolumeSource(); result.portals = []; result.secretRef = LocalObjectReference.emptyObject(); return result; @@ -1714,15 +1714,15 @@ export class NFSVolumeSource { readOnly: boolean; constructor(init?: NFSVolumeSource) { - if (!init) return; - if (init.server) this.server = init.server; - if (init.path) this.path = init.path; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.server) { this.server = init.server; } + if (init.path) { this.path = init.path; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): NFSVolumeSource { - let result = new NFSVolumeSource(); + const result = new NFSVolumeSource(); return result; } @@ -1734,15 +1734,15 @@ export class KeyToPath { mode?: number; constructor(init?: KeyToPath) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.path) this.path = init.path; - if (init.mode) this.mode = init.mode; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.path) { this.path = init.path; } + if (init.mode) { this.mode = init.mode; } } static emptyObject(): KeyToPath { - let result = new KeyToPath(); + const result = new KeyToPath(); return result; } @@ -1755,16 +1755,16 @@ export class SecretVolumeSource { optional?: boolean; constructor(init?: SecretVolumeSource) { - if (!init) return; - if (init.secretName) this.secretName = init.secretName; - if (init.items) this.items = init.items; - if (init.defaultMode) this.defaultMode = init.defaultMode; - if (init.optional) this.optional = init.optional; + if (!init) { return; } + if (init.secretName) { this.secretName = init.secretName; } + if (init.items) { this.items = init.items; } + if (init.defaultMode) { this.defaultMode = init.defaultMode; } + if (init.optional) { this.optional = init.optional; } } static emptyObject(): SecretVolumeSource { - let result = new SecretVolumeSource(); + const result = new SecretVolumeSource(); result.items = []; return result; } @@ -1777,15 +1777,15 @@ export class GitRepoVolumeSource { directory: string; constructor(init?: GitRepoVolumeSource) { - if (!init) return; - if (init.repository) this.repository = init.repository; - if (init.revision) this.revision = init.revision; - if (init.directory) this.directory = init.directory; + if (!init) { return; } + if (init.repository) { this.repository = init.repository; } + if (init.revision) { this.revision = init.revision; } + if (init.directory) { this.directory = init.directory; } } static emptyObject(): GitRepoVolumeSource { - let result = new GitRepoVolumeSource(); + const result = new GitRepoVolumeSource(); return result; } @@ -1798,16 +1798,16 @@ export class AWSElasticBlockStoreVolumeSource { readOnly: boolean; constructor(init?: AWSElasticBlockStoreVolumeSource) { - if (!init) return; - if (init.volumeID) this.volumeID = init.volumeID; - if (init.fsType) this.fsType = init.fsType; - if (init.partition) this.partition = init.partition; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.volumeID) { this.volumeID = init.volumeID; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.partition) { this.partition = init.partition; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): AWSElasticBlockStoreVolumeSource { - let result = new AWSElasticBlockStoreVolumeSource(); + const result = new AWSElasticBlockStoreVolumeSource(); return result; } @@ -1820,16 +1820,16 @@ export class GCEPersistentDiskVolumeSource { readOnly: boolean; constructor(init?: GCEPersistentDiskVolumeSource) { - if (!init) return; - if (init.pdName) this.pdName = init.pdName; - if (init.fsType) this.fsType = init.fsType; - if (init.partition) this.partition = init.partition; - if (init.readOnly) this.readOnly = init.readOnly; + if (!init) { return; } + if (init.pdName) { this.pdName = init.pdName; } + if (init.fsType) { this.fsType = init.fsType; } + if (init.partition) { this.partition = init.partition; } + if (init.readOnly) { this.readOnly = init.readOnly; } } static emptyObject(): GCEPersistentDiskVolumeSource { - let result = new GCEPersistentDiskVolumeSource(); + const result = new GCEPersistentDiskVolumeSource(); return result; } @@ -1840,14 +1840,14 @@ export class EmptyDirVolumeSource { sizeLimit: string; constructor(init?: EmptyDirVolumeSource) { - if (!init) return; - if (init.medium) this.medium = init.medium; - if (init.sizeLimit) this.sizeLimit = init.sizeLimit; + if (!init) { return; } + if (init.medium) { this.medium = init.medium; } + if (init.sizeLimit) { this.sizeLimit = init.sizeLimit; } } static emptyObject(): EmptyDirVolumeSource { - let result = new EmptyDirVolumeSource(); + const result = new EmptyDirVolumeSource(); result.sizeLimit = null; return result; } @@ -1859,14 +1859,14 @@ export class HostPathVolumeSource { type?: string; constructor(init?: HostPathVolumeSource) { - if (!init) return; - if (init.path) this.path = init.path; - if (init.type) this.type = init.type; + if (!init) { return; } + if (init.path) { this.path = init.path; } + if (init.type) { this.type = init.type; } } static emptyObject(): HostPathVolumeSource { - let result = new HostPathVolumeSource(); + const result = new HostPathVolumeSource(); return result; } @@ -1903,40 +1903,40 @@ export class Volume { storageos?: StorageOSVolumeSource; constructor(init?: Volume) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.hostPath) this.hostPath = init.hostPath; - if (init.emptyDir) this.emptyDir = init.emptyDir; - if (init.gcePersistentDisk) this.gcePersistentDisk = init.gcePersistentDisk; - if (init.awsElasticBlockStore) this.awsElasticBlockStore = init.awsElasticBlockStore; - if (init.gitRepo) this.gitRepo = init.gitRepo; - if (init.secret) this.secret = init.secret; - if (init.nfs) this.nfs = init.nfs; - if (init.iscsi) this.iscsi = init.iscsi; - if (init.glusterfs) this.glusterfs = init.glusterfs; - if (init.persistentVolumeClaim) this.persistentVolumeClaim = init.persistentVolumeClaim; - if (init.rbd) this.rbd = init.rbd; - if (init.flexVolume) this.flexVolume = init.flexVolume; - if (init.cinder) this.cinder = init.cinder; - if (init.cephfs) this.cephfs = init.cephfs; - if (init.flocker) this.flocker = init.flocker; - if (init.downwardAPI) this.downwardAPI = init.downwardAPI; - if (init.fc) this.fc = init.fc; - if (init.azureFile) this.azureFile = init.azureFile; - if (init.configMap) this.configMap = init.configMap; - if (init.vsphereVolume) this.vsphereVolume = init.vsphereVolume; - if (init.quobyte) this.quobyte = init.quobyte; - if (init.azureDisk) this.azureDisk = init.azureDisk; - if (init.photonPersistentDisk) this.photonPersistentDisk = init.photonPersistentDisk; - if (init.projected) this.projected = init.projected; - if (init.portworxVolume) this.portworxVolume = init.portworxVolume; - if (init.scaleIO) this.scaleIO = init.scaleIO; - if (init.storageos) this.storageos = init.storageos; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.hostPath) { this.hostPath = init.hostPath; } + if (init.emptyDir) { this.emptyDir = init.emptyDir; } + if (init.gcePersistentDisk) { this.gcePersistentDisk = init.gcePersistentDisk; } + if (init.awsElasticBlockStore) { this.awsElasticBlockStore = init.awsElasticBlockStore; } + if (init.gitRepo) { this.gitRepo = init.gitRepo; } + if (init.secret) { this.secret = init.secret; } + if (init.nfs) { this.nfs = init.nfs; } + if (init.iscsi) { this.iscsi = init.iscsi; } + if (init.glusterfs) { this.glusterfs = init.glusterfs; } + if (init.persistentVolumeClaim) { this.persistentVolumeClaim = init.persistentVolumeClaim; } + if (init.rbd) { this.rbd = init.rbd; } + if (init.flexVolume) { this.flexVolume = init.flexVolume; } + if (init.cinder) { this.cinder = init.cinder; } + if (init.cephfs) { this.cephfs = init.cephfs; } + if (init.flocker) { this.flocker = init.flocker; } + if (init.downwardAPI) { this.downwardAPI = init.downwardAPI; } + if (init.fc) { this.fc = init.fc; } + if (init.azureFile) { this.azureFile = init.azureFile; } + if (init.configMap) { this.configMap = init.configMap; } + if (init.vsphereVolume) { this.vsphereVolume = init.vsphereVolume; } + if (init.quobyte) { this.quobyte = init.quobyte; } + if (init.azureDisk) { this.azureDisk = init.azureDisk; } + if (init.photonPersistentDisk) { this.photonPersistentDisk = init.photonPersistentDisk; } + if (init.projected) { this.projected = init.projected; } + if (init.portworxVolume) { this.portworxVolume = init.portworxVolume; } + if (init.scaleIO) { this.scaleIO = init.scaleIO; } + if (init.storageos) { this.storageos = init.storageos; } } static emptyObject(): Volume { - let result = new Volume(); + const result = new Volume(); result.hostPath = HostPathVolumeSource.emptyObject(); result.emptyDir = EmptyDirVolumeSource.emptyObject(); result.gcePersistentDisk = GCEPersistentDiskVolumeSource.emptyObject(); @@ -1999,39 +1999,39 @@ export class PodSpec { dnsConfig?: PodDNSConfig; constructor(init?: PodSpec) { - if (!init) return; - if (init.volumes) this.volumes = init.volumes; - if (init.initContainers) this.initContainers = init.initContainers; - if (init.containers) this.containers = init.containers; - if (init.restartPolicy) this.restartPolicy = init.restartPolicy; - if (init.terminationGracePeriodSeconds) this.terminationGracePeriodSeconds = init.terminationGracePeriodSeconds; - if (init.activeDeadlineSeconds) this.activeDeadlineSeconds = init.activeDeadlineSeconds; - if (init.dnsPolicy) this.dnsPolicy = init.dnsPolicy; - if (init.nodeSelector) this.nodeSelector = init.nodeSelector; - if (init.serviceAccountName) this.serviceAccountName = init.serviceAccountName; - if (init.serviceAccount) this.serviceAccount = init.serviceAccount; - if (init.automountServiceAccountToken) this.automountServiceAccountToken = init.automountServiceAccountToken; - if (init.nodeName) this.nodeName = init.nodeName; - if (init.hostNetwork) this.hostNetwork = init.hostNetwork; - if (init.hostPID) this.hostPID = init.hostPID; - if (init.hostIPC) this.hostIPC = init.hostIPC; - if (init.shareProcessNamespace) this.shareProcessNamespace = init.shareProcessNamespace; - if (init.securityContext) this.securityContext = init.securityContext; - if (init.imagePullSecrets) this.imagePullSecrets = init.imagePullSecrets; - if (init.hostname) this.hostname = init.hostname; - if (init.subdomain) this.subdomain = init.subdomain; - if (init.affinity) this.affinity = init.affinity; - if (init.schedulerName) this.schedulerName = init.schedulerName; - if (init.tolerations) this.tolerations = init.tolerations; - if (init.hostAliases) this.hostAliases = init.hostAliases; - if (init.priorityClassName) this.priorityClassName = init.priorityClassName; - if (init.priority) this.priority = init.priority; - if (init.dnsConfig) this.dnsConfig = init.dnsConfig; + if (!init) { return; } + if (init.volumes) { this.volumes = init.volumes; } + if (init.initContainers) { this.initContainers = init.initContainers; } + if (init.containers) { this.containers = init.containers; } + if (init.restartPolicy) { this.restartPolicy = init.restartPolicy; } + if (init.terminationGracePeriodSeconds) { this.terminationGracePeriodSeconds = init.terminationGracePeriodSeconds; } + if (init.activeDeadlineSeconds) { this.activeDeadlineSeconds = init.activeDeadlineSeconds; } + if (init.dnsPolicy) { this.dnsPolicy = init.dnsPolicy; } + if (init.nodeSelector) { this.nodeSelector = init.nodeSelector; } + if (init.serviceAccountName) { this.serviceAccountName = init.serviceAccountName; } + if (init.serviceAccount) { this.serviceAccount = init.serviceAccount; } + if (init.automountServiceAccountToken) { this.automountServiceAccountToken = init.automountServiceAccountToken; } + if (init.nodeName) { this.nodeName = init.nodeName; } + if (init.hostNetwork) { this.hostNetwork = init.hostNetwork; } + if (init.hostPID) { this.hostPID = init.hostPID; } + if (init.hostIPC) { this.hostIPC = init.hostIPC; } + if (init.shareProcessNamespace) { this.shareProcessNamespace = init.shareProcessNamespace; } + if (init.securityContext) { this.securityContext = init.securityContext; } + if (init.imagePullSecrets) { this.imagePullSecrets = init.imagePullSecrets; } + if (init.hostname) { this.hostname = init.hostname; } + if (init.subdomain) { this.subdomain = init.subdomain; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.schedulerName) { this.schedulerName = init.schedulerName; } + if (init.tolerations) { this.tolerations = init.tolerations; } + if (init.hostAliases) { this.hostAliases = init.hostAliases; } + if (init.priorityClassName) { this.priorityClassName = init.priorityClassName; } + if (init.priority) { this.priority = init.priority; } + if (init.dnsConfig) { this.dnsConfig = init.dnsConfig; } } static emptyObject(): PodSpec { - let result = new PodSpec(); + const result = new PodSpec(); result.volumes = []; result.initContainers = []; result.containers = []; @@ -2052,14 +2052,14 @@ export class PodTemplateSpec { spec: PodSpec; constructor(init?: PodTemplateSpec) { - if (!init) return; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; + if (!init) { return; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } } static emptyObject(): PodTemplateSpec { - let result = new PodTemplateSpec(); + const result = new PodTemplateSpec(); result.metadata = ObjectMeta.emptyObject(); result.spec = PodSpec.emptyObject(); return result; @@ -2073,15 +2073,15 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -2093,14 +2093,14 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -2119,20 +2119,20 @@ export class StatefulSetSpec { revisionHistoryLimit?: number; constructor(init?: StatefulSetSpec) { - if (!init) return; - if (init.replicas) this.replicas = init.replicas; - if (init.selector) this.selector = init.selector; - if (init.template) this.template = init.template; - if (init.volumeClaimTemplates) this.volumeClaimTemplates = init.volumeClaimTemplates; - if (init.serviceName) this.serviceName = init.serviceName; - if (init.podManagementPolicy) this.podManagementPolicy = init.podManagementPolicy; - if (init.updateStrategy) this.updateStrategy = init.updateStrategy; - if (init.revisionHistoryLimit) this.revisionHistoryLimit = init.revisionHistoryLimit; + if (!init) { return; } + if (init.replicas) { this.replicas = init.replicas; } + if (init.selector) { this.selector = init.selector; } + if (init.template) { this.template = init.template; } + if (init.volumeClaimTemplates) { this.volumeClaimTemplates = init.volumeClaimTemplates; } + if (init.serviceName) { this.serviceName = init.serviceName; } + if (init.podManagementPolicy) { this.podManagementPolicy = init.podManagementPolicy; } + if (init.updateStrategy) { this.updateStrategy = init.updateStrategy; } + if (init.revisionHistoryLimit) { this.revisionHistoryLimit = init.revisionHistoryLimit; } } static emptyObject(): StatefulSetSpec { - let result = new StatefulSetSpec(); + const result = new StatefulSetSpec(); result.selector = LabelSelector.emptyObject(); result.template = PodTemplateSpec.emptyObject(); result.volumeClaimTemplates = []; @@ -2148,15 +2148,15 @@ export class StatusCause { field: string; constructor(init?: StatusCause) { - if (!init) return; - if (init.reason) this.reason = init.reason; - if (init.message) this.message = init.message; - if (init.field) this.field = init.field; + if (!init) { return; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } + if (init.field) { this.field = init.field; } } static emptyObject(): StatusCause { - let result = new StatusCause(); + const result = new StatusCause(); return result; } @@ -2171,18 +2171,18 @@ export class StatusDetails { retryAfterSeconds: number; constructor(init?: StatusDetails) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.group) this.group = init.group; - if (init.kind) this.kind = init.kind; - if (init.uid) this.uid = init.uid; - if (init.causes) this.causes = init.causes; - if (init.retryAfterSeconds) this.retryAfterSeconds = init.retryAfterSeconds; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.group) { this.group = init.group; } + if (init.kind) { this.kind = init.kind; } + if (init.uid) { this.uid = init.uid; } + if (init.causes) { this.causes = init.causes; } + if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } } static emptyObject(): StatusDetails { - let result = new StatusDetails(); + const result = new StatusDetails(); result.causes = []; return result; } @@ -2195,15 +2195,15 @@ export class ListMeta { continue: string; constructor(init?: ListMeta) { - if (!init) return; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.continue) this.continue = init.continue; + if (!init) { return; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.continue) { this.continue = init.continue; } } static emptyObject(): ListMeta { - let result = new ListMeta(); + const result = new ListMeta(); return result; } @@ -2220,20 +2220,20 @@ export class Status { code: number; constructor(init?: Status) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.status) this.status = init.status; - if (init.message) this.message = init.message; - if (init.reason) this.reason = init.reason; - if (init.details) this.details = init.details; - if (init.code) this.code = init.code; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.status) { this.status = init.status; } + if (init.message) { this.message = init.message; } + if (init.reason) { this.reason = init.reason; } + if (init.details) { this.details = init.details; } + if (init.code) { this.code = init.code; } } static emptyObject(): Status { - let result = new Status(); + const result = new Status(); result.metadata = ListMeta.emptyObject(); result.details = StatusDetails.emptyObject(); return result; @@ -2245,13 +2245,13 @@ export class Initializer { name: string; constructor(init?: Initializer) { - if (!init) return; - if (init.name) this.name = init.name; + if (!init) { return; } + if (init.name) { this.name = init.name; } } static emptyObject(): Initializer { - let result = new Initializer(); + const result = new Initializer(); return result; } @@ -2262,14 +2262,14 @@ export class Initializers { result?: Status; constructor(init?: Initializers) { - if (!init) return; - if (init.pending) this.pending = init.pending; - if (init.result) this.result = init.result; + if (!init) { return; } + if (init.pending) { this.pending = init.pending; } + if (init.result) { this.result = init.result; } } static emptyObject(): Initializers { - let result = new Initializers(); + const result = new Initializers(); result.pending = []; result.result = Status.emptyObject(); return result; @@ -2286,18 +2286,18 @@ export class OwnerReference { blockOwnerDeletion?: boolean; constructor(init?: OwnerReference) { - if (!init) return; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.kind) this.kind = init.kind; - if (init.name) this.name = init.name; - if (init.uid) this.uid = init.uid; - if (init.controller) this.controller = init.controller; - if (init.blockOwnerDeletion) this.blockOwnerDeletion = init.blockOwnerDeletion; + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.kind) { this.kind = init.kind; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.controller) { this.controller = init.controller; } + if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } } static emptyObject(): OwnerReference { - let result = new OwnerReference(); + const result = new OwnerReference(); return result; } @@ -2322,28 +2322,28 @@ export class ObjectMeta { clusterName: string; constructor(init?: ObjectMeta) { - if (!init) return; - if (init.name) this.name = init.name; - if (init.generateName) this.generateName = init.generateName; - if (init.namespace) this.namespace = init.namespace; - if (init.selfLink) this.selfLink = init.selfLink; - if (init.uid) this.uid = init.uid; - if (init.resourceVersion) this.resourceVersion = init.resourceVersion; - if (init.generation) this.generation = init.generation; - if (init.creationTimestamp) this.creationTimestamp = init.creationTimestamp; - if (init.deletionTimestamp) this.deletionTimestamp = init.deletionTimestamp; - if (init.deletionGracePeriodSeconds) this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; - if (init.labels) this.labels = init.labels; - if (init.annotations) this.annotations = init.annotations; - if (init.ownerReferences) this.ownerReferences = init.ownerReferences; - if (init.initializers) this.initializers = init.initializers; - if (init.finalizers) this.finalizers = init.finalizers; - if (init.clusterName) this.clusterName = init.clusterName; + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.generateName) { this.generateName = init.generateName; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.uid) { this.uid = init.uid; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.generation) { this.generation = init.generation; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } + if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } + if (init.initializers) { this.initializers = init.initializers; } + if (init.finalizers) { this.finalizers = init.finalizers; } + if (init.clusterName) { this.clusterName = init.clusterName; } } static emptyObject(): ObjectMeta { - let result = new ObjectMeta(); + const result = new ObjectMeta(); result.creationTimestamp = null; result.deletionTimestamp = null; result.labels = null; @@ -2364,17 +2364,17 @@ export class KubeStatefulSet { status: StatefulSetStatus; constructor(init?: KubeStatefulSet) { - if (!init) return; - if (init.kind) this.kind = init.kind; - if (init.apiVersion) this.apiVersion = init.apiVersion; - if (init.metadata) this.metadata = init.metadata; - if (init.spec) this.spec = init.spec; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } + if (init.status) { this.status = init.status; } } static emptyObject(): KubeStatefulSet { - let result = new KubeStatefulSet(); + const result = new KubeStatefulSet(); result.metadata = ObjectMeta.emptyObject(); result.spec = StatefulSetSpec.emptyObject(); result.status = StatefulSetStatus.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/namespace.ts b/src/frontend/src/app/shared/model/v1/namespace.ts index 39d5e3e72..790ee73e9 100644 --- a/src/frontend/src/app/shared/model/v1/namespace.ts +++ b/src/frontend/src/app/shared/model/v1/namespace.ts @@ -1,10 +1,19 @@ export class Namespace { + id: number; + name: string; + deleted: boolean; + metaData: string; + metaDataObj: NamespaceMetaData; + user: string; + createTime: Date; + updateTime: Date; + constructor() { this.metaDataObj = new NamespaceMetaData(); } static ParseNamespaceMetaData(obj: any) { - let namespaceMetaData = new NamespaceMetaData(); + const namespaceMetaData = new NamespaceMetaData(); const metaDataObj = JSON.parse(obj); Object.getOwnPropertyNames(metaDataObj).forEach(name => { namespaceMetaData[name] = metaDataObj[name]; @@ -13,33 +22,21 @@ export class Namespace { } static emptyObject(): Namespace { - let result = new Namespace(); + const result = new Namespace(); result.createTime = null; result.updateTime = null; return result; } - - id: number; - name: string; - deleted: boolean; - metaData: string; - metaDataObj: NamespaceMetaData; - user: string; - createTime: Date; - updateTime: Date; } export class ResourcesLimit { cpu: number; memory: number; - //[NamespaceMetaDataResources:] constructor() { this.cpu = 0; this.memory = 0; } - - //[end] } export class ClusterMeta { @@ -61,11 +58,6 @@ export class NamespaceMetaData { this.env = []; this.clusterMeta = {}; } - - //[NamespaceMetaData:] - - - //[end] } export class EnvVar { diff --git a/src/frontend/src/app/shared/model/v1/permission.ts b/src/frontend/src/app/shared/model/v1/permission.ts index 9b2fde717..90fdebaf6 100644 --- a/src/frontend/src/app/shared/model/v1/permission.ts +++ b/src/frontend/src/app/shared/model/v1/permission.ts @@ -5,6 +5,15 @@ export class Permission { type: string; } +export class ActionPermission { + read = false; + create = false; + update = false; + delete = false; + deploy = false; + offline = false; +} + export class TypePermission { app: ActionPermission = new ActionPermission(); appUser: ActionPermission = new ActionPermission(); @@ -40,12 +49,3 @@ export class TypePermission { this.daemonSet = input.daemonSet ? input.daemonSet : this.daemonSet; } } - -export class ActionPermission { - read = false; - create = false; - update = false; - delete = false; - deploy = false; - offline = false; -} diff --git a/src/frontend/src/app/shared/model/v1/publish-history.ts b/src/frontend/src/app/shared/model/v1/publish-history.ts index 783c93dbd..ce069b20c 100644 --- a/src/frontend/src/app/shared/model/v1/publish-history.ts +++ b/src/frontend/src/app/shared/model/v1/publish-history.ts @@ -8,6 +8,4 @@ export class PublishHistory { message: string; user: string; createTime: Date; - //[PublishHistory:] - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/statefulset.ts b/src/frontend/src/app/shared/model/v1/statefulset.ts index 898fe850d..ae75797ba 100644 --- a/src/frontend/src/app/shared/model/v1/statefulset.ts +++ b/src/frontend/src/app/shared/model/v1/statefulset.ts @@ -1,5 +1,39 @@ /* Do not change, this code is generated from Golang structs */ +export class Namespace { + id: number; + name: string; + metaData: string; + createTime?: Date; + updateTime?: Date; + user: string; + deleted: boolean; + + constructor(init?: Namespace) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + } + + + static emptyObject(): Namespace { + const result = new Namespace(); + result.id = 0; + result.name = ''; + result.metaData = ''; + result.createTime = null; + result.updateTime = null; + result.user = ''; + result.deleted = false; + return result; + } + +} export class User { id: number; @@ -17,25 +51,25 @@ export class User { namespaces: Namespace[]; constructor(init?: User) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.email) this.email = init.email; - if (init.display) this.display = init.display; - if (init.comment) this.comment = init.comment; - if (init.type) this.type = init.type; - if (init.enabled) this.enabled = init.enabled; - if (init.admin) this.admin = init.admin; - if (init.lastLogin) this.lastLogin = new Date(init.lastLogin as any); - if (init.lastIp) this.lastIp = init.lastIp; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.namespaces) this.namespaces = init.namespaces; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.email) { this.email = init.email; } + if (init.display) { this.display = init.display; } + if (init.comment) { this.comment = init.comment; } + if (init.type) { this.type = init.type; } + if (init.enabled) { this.enabled = init.enabled; } + if (init.admin) { this.admin = init.admin; } + if (init.lastLogin) { this.lastLogin = new Date(init.lastLogin as any); } + if (init.lastIp) { this.lastIp = init.lastIp; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.namespaces) { this.namespaces = init.namespaces; } } static emptyObject(): User { - let result = new User(); + const result = new User(); result.id = 0; result.name = ''; result.email = ''; @@ -54,103 +88,68 @@ export class User { } -export class AppStarred { - id: number; - app?: App; - user?: User; - - constructor(init?: AppStarred) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.app) this.app = init.app; - if (init.user) this.user = init.user; - } - - - static emptyObject(): AppStarred { - let result = new AppStarred(); - result.id = 0; - result.app = App.emptyObject(); - result.user = User.emptyObject(); - return result; - } - -} - -export class Namespace { +export class App { id: number; name: string; + namespace?: Namespace; metaData: string; + description: string; createTime?: Date; updateTime?: Date; user: string; deleted: boolean; + AppStars: AppStarred[]; - constructor(init?: Namespace) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.metaData) this.metaData = init.metaData; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; + constructor(init?: App) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.description) { this.description = init.description; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.AppStars) { this.AppStars = init.AppStars; } } - static emptyObject(): Namespace { - let result = new Namespace(); + static emptyObject(): App { + const result = new App(); result.id = 0; result.name = ''; + result.namespace = Namespace.emptyObject(); result.metaData = ''; + result.description = ''; result.createTime = null; result.updateTime = null; result.user = ''; result.deleted = false; + result.AppStars = []; return result; } } -export class App { +export class AppStarred { id: number; - name: string; - namespace?: Namespace; - metaData: string; - description: string; - createTime?: Date; - updateTime?: Date; - user: string; - deleted: boolean; - AppStars: AppStarred[]; + app?: App; + user?: User; - constructor(init?: App) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.namespace) this.namespace = init.namespace; - if (init.metaData) this.metaData = init.metaData; - if (init.description) this.description = init.description; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.AppStars) this.AppStars = init.AppStars; + constructor(init?: AppStarred) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.app) { this.app = init.app; } + if (init.user) { this.user = init.user; } } - static emptyObject(): App { - let result = new App(); + static emptyObject(): AppStarred { + const result = new AppStarred(); result.id = 0; - result.name = ''; - result.namespace = Namespace.emptyObject(); - result.metaData = ''; - result.description = ''; - result.createTime = null; - result.updateTime = null; - result.user = ''; - result.deleted = false; - result.AppStars = []; + result.app = App.emptyObject(); + result.user = User.emptyObject(); return result; } @@ -171,22 +170,22 @@ export class Statefulset { appId: number; constructor(init?: Statefulset) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.metaData) this.metaData = init.metaData; - if (init.app) this.app = init.app; - if (init.description) this.description = init.description; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.appId) this.appId = init.appId; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.app) { this.app = init.app; } + if (init.description) { this.description = init.description; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.appId) { this.appId = init.appId; } } static emptyObject(): Statefulset { - let result = new Statefulset(); + const result = new Statefulset(); result.id = 0; result.name = ''; result.metaData = ''; @@ -202,19 +201,51 @@ export class Statefulset { } +export class PodAffinityTerm { + labelSelector?: LabelSelector; + namespaces: string[]; + topologyKey: string; + + constructor(init?: PodAffinityTerm) { + if (!init) { return; } + if (init.labelSelector) { + this.labelSelector = init.labelSelector; + } + if (init.namespaces) { + this.namespaces = init.namespaces; + } + if (init.topologyKey) { + this.topologyKey = init.topologyKey; + } + } + + + static emptyObject(): PodAffinityTerm { + const result = new PodAffinityTerm(); + result.labelSelector = LabelSelector.emptyObject(); + result.namespaces = []; + return result; + } + +} + export class PodAntiAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): PodAntiAffinity { - let result = new PodAntiAffinity(); + const result = new PodAntiAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -227,14 +258,18 @@ export class WeightedPodAffinityTerm { podAffinityTerm: PodAffinityTerm; constructor(init?: WeightedPodAffinityTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.podAffinityTerm) this.podAffinityTerm = init.podAffinityTerm; + if (!init) { return; } + if (init.weight) { + this.weight = init.weight; + } + if (init.podAffinityTerm) { + this.podAffinityTerm = init.podAffinityTerm; + } } static emptyObject(): WeightedPodAffinityTerm { - let result = new WeightedPodAffinityTerm(); + const result = new WeightedPodAffinityTerm(); result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } @@ -247,15 +282,21 @@ export class LabelSelectorRequirement { values: string[]; constructor(init?: LabelSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.values) { + this.values = init.values; + } } static emptyObject(): LabelSelectorRequirement { - let result = new LabelSelectorRequirement(); + const result = new LabelSelectorRequirement(); result.values = []; return result; } @@ -267,14 +308,18 @@ export class LabelSelector { matchExpressions: LabelSelectorRequirement[]; constructor(init?: LabelSelector) { - if (!init) return; - if (init.matchLabels) this.matchLabels = init.matchLabels; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchLabels) { + this.matchLabels = init.matchLabels; + } + if (init.matchExpressions) { + this.matchExpressions = init.matchExpressions; + } } static emptyObject(): LabelSelector { - let result = new LabelSelector(); + const result = new LabelSelector(); result.matchLabels = null; result.matchExpressions = []; return result; @@ -282,41 +327,23 @@ export class LabelSelector { } -export class PodAffinityTerm { - labelSelector?: LabelSelector; - namespaces: string[]; - topologyKey: string; - - constructor(init?: PodAffinityTerm) { - if (!init) return; - if (init.labelSelector) this.labelSelector = init.labelSelector; - if (init.namespaces) this.namespaces = init.namespaces; - if (init.topologyKey) this.topologyKey = init.topologyKey; - } - - - static emptyObject(): PodAffinityTerm { - let result = new PodAffinityTerm(); - result.labelSelector = LabelSelector.emptyObject(); - result.namespaces = []; - return result; - } - -} - export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): PodAffinity { - let result = new PodAffinity(); + const result = new PodAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = []; result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -329,14 +356,18 @@ export class PreferredSchedulingTerm { preference: NodeSelectorTerm; constructor(init?: PreferredSchedulingTerm) { - if (!init) return; - if (init.weight) this.weight = init.weight; - if (init.preference) this.preference = init.preference; + if (!init) { return; } + if (init.weight) { + this.weight = init.weight; + } + if (init.preference) { + this.preference = init.preference; + } } static emptyObject(): PreferredSchedulingTerm { - let result = new PreferredSchedulingTerm(); + const result = new PreferredSchedulingTerm(); result.preference = NodeSelectorTerm.emptyObject(); return result; } @@ -349,15 +380,21 @@ export class NodeSelectorRequirement { values: string[]; constructor(init?: NodeSelectorRequirement) { - if (!init) return; - if (init.key) this.key = init.key; - if (init.operator) this.operator = init.operator; - if (init.values) this.values = init.values; + if (!init) { return; } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.values) { + this.values = init.values; + } } static emptyObject(): NodeSelectorRequirement { - let result = new NodeSelectorRequirement(); + const result = new NodeSelectorRequirement(); result.values = []; return result; } @@ -368,13 +405,15 @@ export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; constructor(init?: NodeSelectorTerm) { - if (!init) return; - if (init.matchExpressions) this.matchExpressions = init.matchExpressions; + if (!init) { return; } + if (init.matchExpressions) { + this.matchExpressions = init.matchExpressions; + } } static emptyObject(): NodeSelectorTerm { - let result = new NodeSelectorTerm(); + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } @@ -385,13 +424,15 @@ export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; constructor(init?: NodeSelector) { - if (!init) return; - if (init.nodeSelectorTerms) this.nodeSelectorTerms = init.nodeSelectorTerms; + if (!init) { return; } + if (init.nodeSelectorTerms) { + this.nodeSelectorTerms = init.nodeSelectorTerms; + } } static emptyObject(): NodeSelector { - let result = new NodeSelector(); + const result = new NodeSelector(); result.nodeSelectorTerms = []; return result; } @@ -403,14 +444,18 @@ export class NodeAffinity { preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; constructor(init?: NodeAffinity) { - if (!init) return; - if (init.requiredDuringSchedulingIgnoredDuringExecution) this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - if (init.preferredDuringSchedulingIgnoredDuringExecution) this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } static emptyObject(): NodeAffinity { - let result = new NodeAffinity(); + const result = new NodeAffinity(); result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; @@ -424,15 +469,15 @@ export class Affinity { podAntiAffinity?: PodAntiAffinity; constructor(init?: Affinity) { - if (!init) return; - if (init.nodeAffinity) this.nodeAffinity = init.nodeAffinity; - if (init.podAffinity) this.podAffinity = init.podAffinity; - if (init.podAntiAffinity) this.podAntiAffinity = init.podAntiAffinity; + if (!init) { return; } + if (init.nodeAffinity) { this.nodeAffinity = init.nodeAffinity; } + if (init.podAffinity) { this.podAffinity = init.podAffinity; } + if (init.podAntiAffinity) { this.podAntiAffinity = init.podAntiAffinity; } } static emptyObject(): Affinity { - let result = new Affinity(); + const result = new Affinity(); result.nodeAffinity = NodeAffinity.emptyObject(); result.podAffinity = PodAffinity.emptyObject(); result.podAntiAffinity = PodAntiAffinity.emptyObject(); @@ -448,16 +493,16 @@ export class StatefulsetMetaData { privileged?: { [key: string]: boolean }; constructor(init?: StatefulsetMetaData) { - if (!init) return; - if (init.replicas) this.replicas = init.replicas; - if (init.resources) this.resources = init.resources; - if (init.affinity) this.affinity = init.affinity; - if (init.privileged) this.privileged = init.privileged; + if (!init) { return; } + if (init.replicas) { this.replicas = init.replicas; } + if (init.resources) { this.resources = init.resources; } + if (init.affinity) { this.affinity = init.affinity; } + if (init.privileged) { this.privileged = init.privileged; } } static emptyObject(): StatefulsetMetaData { - let result = new StatefulsetMetaData(); + const result = new StatefulsetMetaData(); result.replicas = null; result.resources = null; result.affinity = Affinity.emptyObject(); diff --git a/src/frontend/src/app/shared/model/v1/statefulsettpl.ts b/src/frontend/src/app/shared/model/v1/statefulsettpl.ts index 45c72fc37..41b95fd42 100644 --- a/src/frontend/src/app/shared/model/v1/statefulsettpl.ts +++ b/src/frontend/src/app/shared/model/v1/statefulsettpl.ts @@ -19,25 +19,25 @@ export class User { namespaces: Namespace[]; constructor(init?: User) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.email) this.email = init.email; - if (init.display) this.display = init.display; - if (init.comment) this.comment = init.comment; - if (init.type) this.type = init.type; - if (init.enabled) this.enabled = init.enabled; - if (init.admin) this.admin = init.admin; - if (init.lastLogin) this.lastLogin = new Date(init.lastLogin as any); - if (init.lastIp) this.lastIp = init.lastIp; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.namespaces) this.namespaces = init.namespaces; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.email) { this.email = init.email; } + if (init.display) { this.display = init.display; } + if (init.comment) { this.comment = init.comment; } + if (init.type) { this.type = init.type; } + if (init.enabled) { this.enabled = init.enabled; } + if (init.admin) { this.admin = init.admin; } + if (init.lastLogin) { this.lastLogin = new Date(init.lastLogin as any); } + if (init.lastIp) { this.lastIp = init.lastIp; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.namespaces) { this.namespaces = init.namespaces; } } static emptyObject(): User { - let result = new User(); + const result = new User(); result.id = 0; result.name = ''; result.email = ''; @@ -56,111 +56,112 @@ export class User { } -export class AppStarred { - id: number; - app?: App; - user?: User; - - constructor(init?: AppStarred) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.app) this.app = init.app; - if (init.user) this.user = init.user; - } - - - static emptyObject(): AppStarred { - let result = new AppStarred(); - result.id = 0; - result.app = App.emptyObject(); - result.user = User.emptyObject(); - return result; - } - -} - - - -export class Namespace { +export class App { id: number; name: string; + namespace?: Namespace; metaData: string; + description: string; createTime?: Date; updateTime?: Date; user: string; deleted: boolean; + AppStars: AppStarred[]; - constructor(init?: Namespace) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.metaData) this.metaData = init.metaData; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; + constructor(init?: App) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.description) { this.description = init.description; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.AppStars) { this.AppStars = init.AppStars; } } - static emptyObject(): Namespace { - let result = new Namespace(); + static emptyObject(): App { + const result = new App(); result.id = 0; result.name = ''; + result.namespace = Namespace.emptyObject(); result.metaData = ''; + result.description = ''; result.createTime = null; result.updateTime = null; result.user = ''; result.deleted = false; + result.AppStars = []; return result; } } -export class App { +export class AppStarred { + id: number; + app?: App; + user?: User; + + constructor(init?: AppStarred) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.app) { this.app = init.app; } + if (init.user) { this.user = init.user; } + } + + static emptyObject(): AppStarred { + const result = new AppStarred(); + result.id = 0; + result.app = App.emptyObject(); + result.user = User.emptyObject(); + return result; + } + +} + + + + +export class Namespace { id: number; name: string; - namespace?: Namespace; metaData: string; - description: string; createTime?: Date; updateTime?: Date; user: string; deleted: boolean; - AppStars: AppStarred[]; - constructor(init?: App) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.namespace) this.namespace = init.namespace; - if (init.metaData) this.metaData = init.metaData; - if (init.description) this.description = init.description; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.AppStars) this.AppStars = init.AppStars; + constructor(init?: Namespace) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } } - static emptyObject(): App { - let result = new App(); + static emptyObject(): Namespace { + const result = new Namespace(); result.id = 0; result.name = ''; - result.namespace = Namespace.emptyObject(); result.metaData = ''; - result.description = ''; result.createTime = null; result.updateTime = null; result.user = ''; result.deleted = false; - result.AppStars = []; return result; } } + export class Statefulset { id: number; name: string; @@ -174,22 +175,22 @@ export class Statefulset { appId: number; constructor(init?: Statefulset) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.metaData) this.metaData = init.metaData; - if (init.app) this.app = init.app; - if (init.description) this.description = init.description; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.appId) this.appId = init.appId; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.app) { this.app = init.app; } + if (init.description) { this.description = init.description; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.appId) { this.appId = init.appId; } } static emptyObject(): Statefulset { - let result = new Statefulset(); + const result = new Statefulset(); result.id = 0; result.name = ''; result.metaData = ''; @@ -221,23 +222,23 @@ export class StatefulsetTemplate { containerVersions: string[]; constructor(init?: StatefulsetTemplate) { - if (!init) return; - if (init.id) this.id = init.id; - if (init.name) this.name = init.name; - if (init.template) this.template = init.template; - if (init.statefulset) this.statefulset = init.statefulset; - if (init.description) this.description = init.description; - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) this.user = init.user; - if (init.deleted) this.deleted = init.deleted; - if (init.statefulsetId) this.statefulsetId = init.statefulsetId; - if (init.status) this.status = init.status; + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.template) { this.template = init.template; } + if (init.statefulset) { this.statefulset = init.statefulset; } + if (init.description) { this.description = init.description; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.statefulsetId) { this.statefulsetId = init.statefulsetId; } + if (init.status) { this.status = init.status; } } static emptyObject(): StatefulsetTemplate { - let result = new StatefulsetTemplate(); + const result = new StatefulsetTemplate(); result.id = 0; result.name = ''; result.template = ''; diff --git a/src/frontend/src/app/shared/model/v1/status.ts b/src/frontend/src/app/shared/model/v1/status.ts index 59aeedac4..a5e2b4c57 100644 --- a/src/frontend/src/app/shared/model/v1/status.ts +++ b/src/frontend/src/app/shared/model/v1/status.ts @@ -18,7 +18,7 @@ export class TemplateStatus { } static fromPublishStatus(state: PublishStatus) { - let dStatus = new TemplateStatus(); + const dStatus = new TemplateStatus(); dStatus.id = state.id; dStatus.deploymentId = state.resourceId; dStatus.templateId = state.templateId; diff --git a/src/frontend/src/app/shared/navigation/navigation.component.ts b/src/frontend/src/app/shared/navigation/navigation.component.ts index e697c5046..da59ea27f 100644 --- a/src/frontend/src/app/shared/navigation/navigation.component.ts +++ b/src/frontend/src/app/shared/navigation/navigation.component.ts @@ -12,11 +12,11 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { nodeTree: Array; private box: any; - boxHeight: number = 0; + boxHeight = 0; boxOffset: number; allNodeOffset: Array; // 判断是否在点击跳转中，避开scrollEvent 事件 - jumpTo: number = 0; + jumpTo = 0; scrollEventManage: any; /** @@ -35,7 +35,7 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { @Input() set container(value: string) { if (value) { - if (this.scrollEventManage) this.scrollEventManage(); + if (this.scrollEventManage) { this.scrollEventManage(); } if (this.document.querySelector(value)) { this.box = this.document.querySelector(value); this.scrollEventManage = this.eventMessage.addEventListener(this.box, 'scroll', this.scrollEvent.bind(this)); @@ -57,14 +57,14 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } ngOnDestroy() { - if (this.scrollEventManage) this.scrollEventManage(); + if (this.scrollEventManage) { this.scrollEventManage(); } } boxInit() { if (this.box) { this.boxHeight = this.getBoxHeight(this.box); this.boxOffset = this.getOffset(this.box); - if (this.nodeTree) this.allNodeOffset = this.getBoxOffset(); + if (this.nodeTree) { this.allNodeOffset = this.getBoxOffset(); } } } @@ -99,7 +99,8 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { jumpEvent(nodeId: string, event: any) { event.preventDefault(); - this.jumpTo = this.getOffset(this.getElement(nodeId)) - this.boxOffset > this.box.scrollHeight - this.box.offsetHeight ? this.box.scrollHeight - this.box.offsetHeight : this.getOffset(this.getElement(nodeId)) - this.boxOffset; + this.jumpTo = this.getOffset(this.getElement(nodeId)) - this.boxOffset > this.box.scrollHeight - this.box.offsetHeight ? + this.box.scrollHeight - this.box.offsetHeight : this.getOffset(this.getElement(nodeId)) - this.boxOffset; this.box.scrollTo({ top: this.jumpTo, behavior: 'smooth' @@ -148,7 +149,7 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } removeActive() { - if (this.document.querySelector('li.active')) this.document.querySelector('li.active').classList.remove('active'); + if (this.document.querySelector('li.active')) { this.document.querySelector('li.active').classList.remove('active'); } } addActive(nodeId: string) { @@ -161,9 +162,9 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { setActive(top: number): void { if (this.allNodeOffset) { - for (var key = 0; key < this.allNodeOffset.length; key++) { + for (let key = 0; key < this.allNodeOffset.length; key++) { if (this.allNodeOffset[key].offset >= top + this.boxOffset) { - let nodeId = this.allNodeOffset[key ? key - 1 : 0].id; + const nodeId = this.allNodeOffset[key ? key - 1 : 0].id; if (!this.isActive(nodeId)) { this.removeActive(); this.addActive(nodeId); @@ -175,15 +176,15 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } getAllNode(array: Array) { - let nodeArray: Array = new Array(); - let arr = JSON.parse(JSON.stringify(array)); + const nodeArray: Array = new Array(); + const arr = JSON.parse(JSON.stringify(array)); - function resolveChild(arr: Array) { - arr.forEach(node => { + function resolveChild(children: Array) { + children.forEach(node => { if (node.id) { nodeArray.push(node.id); } - if (node.child) resolveChild(node.child); + if (node.child) { resolveChild(node.child); } }); } @@ -192,15 +193,15 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } /** - * @param {array} 输入一个node，tree，不包含text参数 - * @returns {arrar} 返回一个node数组，补全text参数 + * 输入一个node，tree，不包含text参数 + * 返回一个node数组，补全text参数 */ resolveTree(array: Array | undefined): Array { if (array) { array.forEach(item => { if (item.id === undefined) { - console.trace('数据缺少id'); + console.log('数据缺少id'); } if (item.text === undefined) { item.text = item.id; @@ -221,7 +222,7 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } /** - * @param{elment} 获取element相对于body的偏移量 + * @param 获取element相对于body的偏移量 */ getOffset(element: any | null): number { diff --git a/src/frontend/src/app/shared/page/page-state.ts b/src/frontend/src/app/shared/page/page-state.ts index 83c99cd3d..fa368a1d5 100644 --- a/src/frontend/src/app/shared/page/page-state.ts +++ b/src/frontend/src/app/shared/page/page-state.ts @@ -1,12 +1,24 @@ import { State } from '@clr/angular'; +export class Page { + pageNo ? = 1; + pageSize ? = 10; + totalPage?: number; + totalCount?: number; +} + +export class Sort { + by: string; + reverse: boolean; +} + export class PageState { - page? = new Page(); - sort? = new Sort(); - filters? = {}; + page ? = new Page(); + sort ? = new Sort(); + filters ? = {}; // relate?: string; // isOnline?: boolean; - params? = {}; + params ? = {}; constructor(page?: Page) { if (page) { @@ -19,7 +31,7 @@ export class PageState { if (!state) { return new PageState(); } - let pageState = new PageState(page); + const pageState = new PageState(page); if (state.page) { pageState.page.pageNo = Math.ceil((state.page.to + 1) / state.page.size); @@ -30,8 +42,8 @@ export class PageState { pageState.sort.reverse = state.sort.reverse; } if (state.filters) { - for (let filter of state.filters) { - let {property, value} = <{ property: string, value: string }>filter; + for (const filter of state.filters) { + const {property, value} = <{ property: string, value: string }>filter; pageState.filters[property] = value; } } @@ -39,15 +51,3 @@ export class PageState { } } -export class Page { - pageNo?: number = 1; - pageSize?: number = 10; - totalPage?: number; - totalCount?: number; -} - -export class Sort { - by: string; - reverse: boolean; -} - diff --git a/src/frontend/src/app/shared/pipe/relative-time.filter.pipe.ts b/src/frontend/src/app/shared/pipe/relative-time.filter.pipe.ts index 815473a2d..069d9dc2f 100644 --- a/src/frontend/src/app/shared/pipe/relative-time.filter.pipe.ts +++ b/src/frontend/src/app/shared/pipe/relative-time.filter.pipe.ts @@ -7,15 +7,15 @@ import { Pipe, PipeTransform } from '@angular/core'; export class RelativeTimeFilterPipe implements PipeTransform { transform(inputDate: string): string { - let current = new Date().valueOf(); - let input = new Date(inputDate).valueOf(); - let msPerMinute = 60 * 1000; - let msPerHour = msPerMinute * 60; - let msPerDay = msPerHour * 24; - let msPerMonth = msPerDay * 30; - let msPerYear = msPerDay * 365; + const current = new Date().valueOf(); + const input = new Date(inputDate).valueOf(); + const msPerMinute = 60 * 1000; + const msPerHour = msPerMinute * 60; + const msPerDay = msPerHour * 24; + const msPerMonth = msPerDay * 30; + const msPerYear = msPerDay * 365; - let elapsed = current - input; + const elapsed = current - input; if (elapsed < msPerMinute) { return Math.floor(elapsed / 1000) + 's'; diff --git a/src/frontend/src/app/shared/tabs/ListStyle.ts b/src/frontend/src/app/shared/tabs/ListStyle.ts index 3185db6ab..a96f9b8c3 100644 --- a/src/frontend/src/app/shared/tabs/ListStyle.ts +++ b/src/frontend/src/app/shared/tabs/ListStyle.ts @@ -1,3 +1,3 @@ export class ListStyle { - translateX: number = 0; + translateX = 0; } diff --git a/src/frontend/src/app/shared/tabs/tab/tab.component.ts b/src/frontend/src/app/shared/tabs/tab/tab.component.ts index 1f3daa072..e9b5a5536 100644 --- a/src/frontend/src/app/shared/tabs/tab/tab.component.ts +++ b/src/frontend/src/app/shared/tabs/tab/tab.component.ts @@ -5,14 +5,12 @@ import { TabDragService } from '../../client/v1/tab-drag.service'; selector: 'wayne-tab', templateUrl: './tab.component.html', styleUrls: ['./tab.component.scss'], - host: { - 'draggable': 'true' - } }) export class TabComponent implements OnInit { descInfo: string; constructor(private el: ElementRef, private dragService: TabDragService) { + el.nativeElement.setAttribute('draggable', 'true'); } @Input() active: boolean; @@ -23,11 +21,13 @@ export class TabComponent implements OnInit { if (value) { this.descInfo = value; } - }; + } @Input() id: number; @Output() orderChange = new EventEmitter(); + + @HostListener('dragstart', ['$event']) startEvent(event) { event.dataTransfer.setData('text/plain', null); diff --git a/src/frontend/src/app/shared/tabs/tabs.component.ts b/src/frontend/src/app/shared/tabs/tabs.component.ts index 686765f6e..d66f4bcef 100644 --- a/src/frontend/src/app/shared/tabs/tabs.component.ts +++ b/src/frontend/src/app/shared/tabs/tabs.component.ts @@ -12,17 +12,17 @@ import { TabDragService } from '../client/v1/tab-drag.service'; }) export class TabsComponent implements AfterViewInit, OnDestroy { // margin 指的是tabs-box-inner的margin值。 - margin: number = 40; + margin = 40; listStyle: ListStyle = new ListStyle(); - showViewPager: boolean = false; + showViewPager = false; tabsContent: Element; tabsList: Element; tabsContentWidth: number; tabsListWidth: number; - firstEnter: boolean = true; + firstEnter = true; resizeTimer: any; - prevDisabled: boolean = true; - nextDisabled: boolean = false; + prevDisabled = true; + nextDisabled = false; dragSubscribe: Array = new Array(); eventList: Array = new Array(); @@ -37,7 +37,8 @@ export class TabsComponent implements AfterViewInit, OnDestroy { direction => { if (direction === 'right') { if (this.listStyle.translateX > (this.tabsContentWidth - this.tabsListWidth)) { - this.listStyle.translateX = this.listStyle.translateX < (this.tabsContentWidth - this.tabsListWidth + 10) ? this.tabsContentWidth - this.tabsListWidth : this.listStyle.translateX - 10; + this.listStyle.translateX = this.listStyle.translateX < (this.tabsContentWidth - this.tabsListWidth + 10) ? + this.tabsContentWidth - this.tabsListWidth : this.listStyle.translateX - 10; } } else if (direction === 'left') { if (this.listStyle.translateX < 0) { @@ -62,9 +63,9 @@ export class TabsComponent implements AfterViewInit, OnDestroy { @ContentChildren(TabComponent) set tabs(tabs: QueryList) { this.addClickEvent(tabs); this.setActive(tabs); - if (!this.firstEnter) this.boxResize(); + if (!this.firstEnter) { this.boxResize(); } this.firstEnter = false; - }; + } prevEnter() { if (this.listStyle.translateX) { @@ -122,7 +123,7 @@ export class TabsComponent implements AfterViewInit, OnDestroy { this.showViewPager = true; this.tabsContentWidth -= 2 * this.margin; } - if (typeof window !== 'undefined') window.onresize = this.boxResize.bind(this); + if (typeof window !== 'undefined') { window.onresize = this.boxResize.bind(this); } this.dragService.init(this.el.nativeElement); this.eventList.push( this.eventManager.addEventListener(this.document.querySelector('.nav-trigger'), 'click', this.boxResize.bind(this, true)) diff --git a/src/frontend/src/app/shared/unauthorized/unauthorized.component.ts b/src/frontend/src/app/shared/unauthorized/unauthorized.component.ts index b51eff82c..a97cd1095 100644 --- a/src/frontend/src/app/shared/unauthorized/unauthorized.component.ts +++ b/src/frontend/src/app/shared/unauthorized/unauthorized.component.ts @@ -25,7 +25,7 @@ export class UnauthorizedComponent implements OnInit, OnDestroy { if (this.leftSeconds <= 0) { // 未授权重定向到登录页面 // document.location.href - let currentUrl = document.location.origin; + const currentUrl = document.location.origin; setTimeout(() => { document.location.href = `${currentUrl}/sign-in`; }, defaultLeftTime); diff --git a/src/frontend/src/app/shared/utils.ts b/src/frontend/src/app/shared/utils.ts index a95bae143..bbf2087e6 100644 --- a/src/frontend/src/app/shared/utils.ts +++ b/src/frontend/src/app/shared/utils.ts @@ -15,14 +15,14 @@ export const isNotEmpty = function (obj: any): boolean { return !isEmpty(obj); }; -export const isArrayEmpty = function (obj: any): boolean { - return !isArrayNotEmpty(obj); -}; - export const isArrayNotEmpty = function (obj: any): boolean { return obj != null && obj.length > 0; }; +export const isArrayEmpty = function (obj: any): boolean { + return !isArrayNotEmpty(obj); +}; + /** * Simple object check. * @param item From 5116ee157e630f3b8daa18037c5ceacf96e251da Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 11 Jan 2019 11:49:26 +0800 Subject: [PATCH 002/112] frontend:remove share/switch --- src/frontend/src/app/shared/shared.module.ts | 3 - .../app/shared/switch/switch.component.html | 5 -- .../app/shared/switch/switch.component.scss | 44 ----------- .../src/app/shared/switch/switch.component.ts | 77 ------------------- 4 files changed, 129 deletions(-) delete mode 100644 src/frontend/src/app/shared/switch/switch.component.html delete mode 100644 src/frontend/src/app/shared/switch/switch.component.scss delete mode 100644 src/frontend/src/app/shared/switch/switch.component.ts diff --git a/src/frontend/src/app/shared/shared.module.ts b/src/frontend/src/app/shared/shared.module.ts index a4d152c6d..5dc6dd08a 100644 --- a/src/frontend/src/app/shared/shared.module.ts +++ b/src/frontend/src/app/shared/shared.module.ts @@ -24,7 +24,6 @@ import { AceEditorComponent } from './ace-editor/ace-editor.component'; import { AceEditorBoxComponent } from './ace-editor/ace-editor-box/ace-editor-box.component'; import { AceEditorService } from './ace-editor/ace-editor.service'; import { ModalOperateComponent } from './modal-operate/modal-operate.component'; -import { SwitchComponent } from './switch/switch.component'; import { ProgressComponent } from './progress/progress.component'; import { FloatWindowComponent } from './float-window/float-window.component'; import { FloatWindowItemComponent } from './float-window/float-window-item/float-window-item.component'; @@ -71,7 +70,6 @@ import { ResourceLimitModule } from './component/resource-limit/resource-limit.m PaginateComponent, BreadcrumbComponent, AceEditorComponent, - SwitchComponent, AceEditorBoxComponent, ModalOperateComponent, ProgressComponent, @@ -103,7 +101,6 @@ import { ResourceLimitModule } from './component/resource-limit/resource-limit.m MessageComponent, TabsComponent, TabComponent, - SwitchComponent, BreadcrumbComponent, PaginateComponent, DualListBoxModule, diff --git a/src/frontend/src/app/shared/switch/switch.component.html b/src/frontend/src/app/shared/switch/switch.component.html deleted file mode 100644 index 5127ec30f..000000000 --- a/src/frontend/src/app/shared/switch/switch.component.html +++ /dev/null @@ -1,5 +0,0 @@ - - {{span1Text}} - {{span2Text}} - - \ No newline at end of file diff --git a/src/frontend/src/app/shared/switch/switch.component.scss b/src/frontend/src/app/shared/switch/switch.component.scss deleted file mode 100644 index 35cc8bc3e..000000000 --- a/src/frontend/src/app/shared/switch/switch.component.scss +++ /dev/null @@ -1,44 +0,0 @@ -.swith-box { - display: block; - position: relative; - border: 1px solid #ccc; - border-radius: 4px; - overflow: hidden; - cursor: pointer; - width: 130px; - line-height: normal; -} - -.swith-box button { - position: absolute; - transition: all .3s; - outline: none; - border: none; - background: rgba(0, 0, 0, 0.2); - left: 0; - top: 0; - height: 100%; - width: 50%; - padding: 0; - margin: 0; -} - -.swith-box span { - display: inline-block; - width: 50%; - color: rgb(86, 86, 86); - padding: 5px 0; - white-space: nowrap; - line-height: 1; - user-select: none; - text-align: center; -} - -.invisible { - visibility: hidden; -} - -.switch-active { - color: #000 !important; - font-weight: 800; -} diff --git a/src/frontend/src/app/shared/switch/switch.component.ts b/src/frontend/src/app/shared/switch/switch.component.ts deleted file mode 100644 index 11a04b034..000000000 --- a/src/frontend/src/app/shared/switch/switch.component.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { Component, ElementRef, EventEmitter, forwardRef, Input, OnInit, Output, Renderer2, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; - -@Component({ - selector: 'wayne-switch', - templateUrl: './switch.component.html', - styleUrls: ['./switch.component.scss'], - providers: [{ - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => SwitchComponent), - multi: true - }] -}) -/** - * - */ -export class SwitchComponent implements OnInit, ControlValueAccessor { - choosed: any; - @Input('key1') span1Text: string; - @Input('key2') span2Text: string; - @Input('value1') span1Value: any; - @Input('value2') span2Value: any; - // model -> view function - @ViewChild('span1') span1: ElementRef; - @ViewChild('span2') span2: ElementRef; - @ViewChild('button') button: ElementRef; - @Output() change = new EventEmitter(); - - get span1Width(): string { - return this.span1.nativeElement.clientWidth; - } - - get buttonWidth(): string { - if (this.choosed === this.span1Value) { - this._render.setStyle(this.button.nativeElement, 'left', `0px`); - return this.span1Width + 'px'; - } else if (this.choosed === this.span2Value) { - this._render.setStyle(this.button.nativeElement, 'left', `${this.span1Width}px`); - return this.span2Width + 'px'; - } else { - return 0 + 'px'; - } - } - - get span2Width(): string { - return this.span2.nativeElement.clientWidth; - } - - updateEmit = (_: any) => { - }; - - constructor(private _render: Renderer2) { - } - - ngOnInit() { - } - - changeItem() { - this.choosed = this.choosed === this.span1Value ? this.span2Value : this.span1Value; - this.updateEmit(this.choosed); - this.change.emit(this.choosed); - } - - writeValue(value: any): void { - if (value !== this.choosed) { - this.choosed = value; - } - } - - registerOnChange(fn: (_: any) => {}): void { - this.updateEmit = fn; - } - - // this is invalid so given an empty result - registerOnTouched(fn: any): void { - } -} From 6168734d3a2e726035c717f8a2e632333143b02b Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 11 Jan 2019 16:06:58 +0800 Subject: [PATCH 003/112] frontend:update let to const --- .../src/app/admin/admin.component.spec.ts | 4 +- .../create-edit-apikey.component.html | 2 +- .../create-edit-apikey.component.ts | 6 +- .../list-apikey/list-apikey.component.html | 2 +- .../list-apikey/list-apikey.component.ts | 6 +- .../src/app/admin/app/app.component.ts | 6 +- .../create-edit-app.component.html | 2 +- .../create-edit-app.component.ts | 8 +-- .../admin/app/list-app/list-app.component.ts | 2 +- .../app/trash-app/trash-app.component.ts | 8 +-- .../app/admin/auditlog/auditlog.component.ts | 4 +- .../list-cluster/list-cluster.component.ts | 2 +- .../trash-cluster/trash-cluster.component.ts | 8 +-- .../src/app/admin/config/config.component.ts | 4 +- .../create-edit-config.component.ts | 4 +- .../list-config/list-config.component.ts | 2 +- .../admin/configmap/configmap.component.ts | 6 +- .../create-edit-configmap.component.html | 2 +- .../create-edit-configmap.component.ts | 8 +-- .../list-configmap.component.ts | 2 +- .../trash-configmap.component.ts | 8 +-- .../configmaptpl/configmaptpl.component.ts | 8 +-- .../create-edit-configmaptpl.component.html | 2 +- .../create-edit-configmaptpl.component.ts | 8 +-- .../list-configmaptpl.component.ts | 2 +- .../trash-configmaptpl.component.ts | 8 +-- .../create-edit-cronjob.component.html | 2 +- .../create-edit-cronjob.component.ts | 8 +-- .../app/admin/cronjob/cronjob.component.ts | 8 +-- .../list-cronjob/list-cronjob.component.ts | 2 +- .../trash-cronjob/trash-cronjob.component.ts | 8 +-- .../create-edit-cronjobtpl.component.html | 2 +- .../create-edit-cronjobtpl.component.ts | 8 +-- .../admin/cronjobtpl/cronjobtpl.component.ts | 8 +-- .../list-cronjobtpl.component.ts | 2 +- .../trash-cronjobtpl.component.ts | 8 +-- .../create-edit-daemonset.component.html | 2 +- .../create-edit-daemonset.component.ts | 8 +-- .../admin/daemonset/daemonset.component.ts | 6 +- .../list-daemonset.component.ts | 2 +- .../trash-daemonset.component.ts | 8 +-- .../create-edit-daemonsettpl.component.html | 2 +- .../create-edit-daemonsettpl.component.ts | 6 +- .../daemonsettpl/daemonsettpl.component.ts | 8 +-- .../list-daemonsettpl.component.ts | 2 +- .../trash-daemonsettpl.component.ts | 8 +-- .../create-edit-deployment.component.html | 2 +- .../create-edit-deployment.component.ts | 8 +-- .../deployment/deployment.component.spec.ts | 4 +- .../admin/deployment/deployment.component.ts | 8 +-- .../list-deployment.component.ts | 4 +- .../trash-deployment.component.ts | 8 +-- .../create-edit-deploymenttpl.component.html | 2 +- .../create-edit-deploymenttpl.component.ts | 6 +- .../deploymenttpl/deploymenttpl.component.ts | 8 +-- .../list-deploymenttpl.component.ts | 2 +- .../trash-deploymenttpl.component.ts | 8 +-- .../create-edit-group.component.html | 2 +- .../create-edit-group.component.ts | 14 ++-- .../app/admin/group/group.component.spec.ts | 4 +- .../src/app/admin/group/group.component.ts | 2 +- .../group/list-group/list-group.component.ts | 2 +- .../create-edit-ingress.component.html | 2 +- .../app/admin/ingress/ingress.component.ts | 2 +- .../create-edit-ingresstpl.component.html | 2 +- .../create-edit-ingresstpl.component.ts | 2 +- .../admin/ingresstpl/ingresstpl.component.ts | 4 +- .../kubernetes/node/list-nodes/inventory.ts | 4 +- .../node/list-nodes/list-nodes.component.ts | 6 +- .../create-edit-persistentvolume.component.ts | 2 +- .../persistentvolume.component.ts | 2 +- .../create-edit-namespace.component.ts | 4 +- .../list-namespace.component.ts | 2 +- .../namespace/namespace.component.spec.ts | 4 +- .../admin/namespace/namespace.component.ts | 6 +- .../trash-namespace.component.ts | 6 +- .../src/app/admin/nav/nav.component.spec.ts | 4 +- .../create-notification.component.spec.ts | 4 +- .../list-notification.component.spec.ts | 4 +- .../list-notification.component.ts | 2 +- .../notification.component.spec.ts | 4 +- .../notification/notification.component.ts | 2 +- .../notification/notification.module.spec.ts | 2 +- .../create-edit-permission.component.ts | 8 +-- .../list-permission.component.ts | 2 +- .../permission/permission.component.spec.ts | 4 +- .../admin/permission/permission.component.ts | 2 +- ...-edit-persistentvolumeclaim.component.html | 2 +- ...te-edit-persistentvolumeclaim.component.ts | 8 +-- .../list-persistentvolumeclaim.component.ts | 2 +- .../persistentvolumeclaim.component.ts | 8 +-- .../trash-persistentvolumeclaim.component.ts | 8 +-- ...it-persistentvolumeclaimtpl.component.html | 2 +- ...edit-persistentvolumeclaimtpl.component.ts | 8 +-- ...list-persistentvolumeclaimtpl.component.ts | 2 +- .../persistentvolumeclaimtpl.component.ts | 8 +-- ...rash-persistentvolumeclaimtpl.component.ts | 8 +-- .../create-edit-secret.component.html | 2 +- .../create-edit-secret.component.ts | 8 +-- .../list-secret/list-secret.component.ts | 2 +- .../app/admin/secret/secret.component.spec.ts | 4 +- .../src/app/admin/secret/secret.component.ts | 6 +- .../trash-secret/trash-secret.component.ts | 6 +- .../create-edit-secrettpl.component.html | 2 +- .../create-edit-secrettpl.component.ts | 10 +-- .../list-secrettpl.component.ts | 2 +- .../admin/secrettpl/secrettpl.component.ts | 6 +- .../trash-secrettpl.component.ts | 6 +- .../create-edit-statefulset.component.html | 2 +- .../create-edit-statefulset.component.ts | 8 +-- .../list-statefulset.component.ts | 2 +- .../statefulset/statefulset.component.ts | 6 +- .../trash-statefulset.component.ts | 8 +-- .../create-edit-statefulsettpl.component.html | 2 +- .../create-edit-statefulsettpl.component.ts | 6 +- .../list-statefulsettpl.component.ts | 2 +- .../statefulsettpl.component.ts | 8 +-- .../trash-statefulsettpl.component.ts | 8 +-- .../create-edit-user.component.ts | 14 ++-- .../user/list-user/list-user.component.ts | 2 +- .../reset-password.component.ts | 8 +-- .../src/app/admin/user/user.component.spec.ts | 4 +- .../src/app/admin/user/user.component.ts | 2 +- src/frontend/src/app/app.module.ts | 2 +- .../app/portal/app-apikey/apikey.component.ts | 8 +-- .../create-edit-apikey.component.ts | 6 +- .../list-apikey/list-apikey.component.html | 2 +- .../list-apikey/list-apikey.component.ts | 2 +- .../app/portal/app-user/app-user.component.ts | 8 +-- .../create-edit-app-user.component.ts | 12 ++-- .../list-app-user/list-app-user.component.ts | 2 +- .../app-webhook/app-webhook.component.ts | 8 +-- .../create-edit-app-webhook.component.ts | 4 +- .../list-app-webhook.component.ts | 2 +- .../create-edit-app.component.ts | 10 +-- .../app/detail-app/detail-app.component.ts | 10 +-- .../list-cluster/list-cluster.component.ts | 2 +- .../autoscale/autoscale.component.spec.ts | 4 +- .../create-edit-autoscale.component.spec.ts | 4 +- ...create-edit-autoscaletpl.component.spec.ts | 4 +- .../list-autoscale.component.spec.ts | 4 +- .../publish-tpl/publish-tpl.component.spec.ts | 4 +- .../autoscale/status/status.component.spec.ts | 4 +- .../src/app/portal/base/base.component.ts | 12 ++-- .../publish-history.service.ts | 2 +- .../portal/configmap/configmap.component.ts | 46 ++++++------- .../create-edit-configmap.component.ts | 8 +-- .../list-configmap.component.html | 4 +- .../list-configmap.component.ts | 6 +- .../publish-tpl/publish-tpl.component.ts | 24 +++---- .../create-edit-cronjob.component.ts | 24 +++---- .../app/portal/cronjob/cronjob.component.ts | 58 ++++++++-------- .../list-cronjob/list-cronjob.component.html | 4 +- .../list-cronjob/list-cronjob.component.ts | 8 +-- .../list-event/list-event.component.ts | 6 +- .../cronjob/list-job/list-job.component.ts | 2 +- .../cronjob/list-pod/list-pod.component.ts | 18 ++--- .../publish-tpl/publish-tpl.component.ts | 18 ++--- .../create-edit-daemonset.component.ts | 18 ++--- .../portal/daemonset/daemonset.component.ts | 56 ++++++++-------- .../list-daemonset.component.ts | 10 +-- .../list-event/list-event.component.ts | 6 +- .../daemonset/list-pod/list-pod.component.ts | 26 +++---- .../publish-tpl/publish-tpl.component.ts | 20 +++--- .../create-edit-deploymenttpl.component.html | 2 +- .../portal/deployment/deployment.component.ts | 67 ++++++++++--------- .../list-deployment.component.ts | 12 ++-- .../list-event/list-event.component.ts | 6 +- .../deployment/list-pod/list-pod.component.ts | 30 ++++----- .../publish-tpl/publish-tpl.component.ts | 40 +++++------ .../namespace-apikey/apikey.component.ts | 8 +-- .../create-edit-apikey.component.ts | 6 +- .../list-apikey/list-apikey.component.html | 2 +- .../list-apikey/list-apikey.component.ts | 2 +- .../history/history.component.ts | 4 +- .../namespace-report.component.ts | 2 +- .../resource/resource.component.ts | 16 +++-- .../create-edit-namespace-user.component.ts | 12 ++-- .../list-namespace-user.component.ts | 2 +- .../namespace-user.component.ts | 8 +-- ...create-edit-namespace-webhook.component.ts | 4 +- .../list-namespace-webhook.component.ts | 2 +- .../namespace-webhook.component.ts | 8 +-- .../src/app/portal/nav/nav.component.ts | 8 +-- ...te-edit-persistentvolumeclaim.component.ts | 8 +-- .../list-persistentvolumeclaim.component.html | 6 +- .../list-persistentvolumeclaim.component.ts | 2 +- .../persistentvolumeclaim.component.ts | 28 ++++---- .../publish-tpl/publish-tpl.component.ts | 24 +++---- ...napshot-persistentvolumeclaim.component.ts | 12 ++-- .../pod-logging/pod-logging.component.ts | 28 ++++---- .../pod-terminal/pod-terminal.component.ts | 36 +++++----- .../src/app/portal/portal.component.spec.ts | 4 +- .../src/app/portal/portal.component.ts | 2 +- .../create-edit-secret.component.ts | 8 +-- .../list-secret/list-secret.component.html | 4 +- .../publish-tpl/publish-tpl.component.ts | 24 +++---- .../src/app/portal/secret/secret.component.ts | 44 ++++++------ .../portal/sidenav/sidenav.component.spec.ts | 4 +- .../create-edit-statefulset.component.ts | 38 +++++------ .../list-event/list-event.component.ts | 6 +- .../list-pod/list-pod.component.ts | 26 +++---- .../list-statefulset.component.ts | 10 +-- .../publish-tpl/publish-tpl.component.ts | 36 +++++----- .../statefulset/statefulset.component.ts | 59 ++++++++-------- .../ace-editor-box.component.ts | 36 +++++----- .../shared/ace-editor/ace-editor.component.ts | 4 +- .../src/app/shared/ace-editor/ace-editor.ts | 2 +- .../src/app/shared/ace-editor/modalInfo.ts | 2 +- .../auth-module/sign-in/sign-in.component.ts | 16 ++--- .../auth/admin-auth-check-guard.service.ts | 4 +- .../shared/auth/auth-check-guard.service.ts | 18 ++--- .../src/app/shared/auth/cache.service.ts | 4 +- .../resource/create-edit-resource-template.ts | 2 +- .../shared/base/resource/publish-template.ts | 2 +- .../breadcrumb/breadcrumb.component.spec.ts | 4 +- .../app/shared/checkbox/checkbox.component.ts | 2 +- .../app/shared/client/v1/apikey.service.ts | 10 +-- .../app/shared/client/v1/app-user.service.ts | 12 ++-- .../src/app/shared/client/v1/app.service.ts | 12 ++-- .../app/shared/client/v1/auditlog.service.ts | 8 +-- .../app/shared/client/v1/autoscale.service.ts | 2 +- .../client/v1/available-port.service.ts | 8 +-- .../shared/client/v1/breadcrumb.service.ts | 4 +- .../app/shared/client/v1/cluster.service.ts | 10 +-- .../app/shared/client/v1/config.service.ts | 10 +-- .../app/shared/client/v1/configmap.service.ts | 10 +-- .../shared/client/v1/configmaptpl.service.ts | 10 +-- .../app/shared/client/v1/cronjob.service.ts | 10 +-- .../shared/client/v1/cronjobtpl.service.ts | 10 +-- .../app/shared/client/v1/daemonset.service.ts | 10 +-- .../shared/client/v1/daemonsettpl.service.ts | 10 +-- .../shared/client/v1/deployment.service.ts | 10 +-- .../shared/client/v1/deploymenttpl.service.ts | 10 +-- .../app/shared/client/v1/edge-node.service.ts | 8 +-- .../src/app/shared/client/v1/group.service.ts | 10 +-- .../app/shared/client/v1/ingress.service.ts | 4 +- .../app/shared/client/v1/kubernetes/common.ts | 2 +- .../shared/client/v1/kubernetes/deployment.ts | 2 +- .../shared/client/v1/kubernetes/namespace.ts | 2 +- .../client/v1/namespace-user.service.ts | 10 +-- .../app/shared/client/v1/namespace.service.ts | 10 +-- .../shared/client/v1/permission.service.ts | 10 +-- .../v1/persistentvolumeclaim.service.ts | 10 +-- .../v1/persistentvolumeclaimtpl.service.ts | 18 ++--- .../app/shared/client/v1/public.service.ts | 4 +- .../app/shared/client/v1/publish.service.ts | 8 +-- .../app/shared/client/v1/secret.service.ts | 10 +-- .../app/shared/client/v1/secrettpl.service.ts | 10 +-- .../shared/client/v1/select-copy.service.ts | 8 +-- .../shared/client/v1/statefulset.service.ts | 10 +-- .../client/v1/statefulsettpl.service.ts | 10 +-- .../app/shared/client/v1/storage.service.ts | 2 +- .../app/shared/client/v1/tab-drag.service.ts | 38 ++++++----- .../src/app/shared/client/v1/tip.directive.ts | 6 +- .../src/app/shared/client/v1/tip.service.ts | 12 ++-- .../app/shared/client/v1/used-port.service.ts | 12 ++-- .../src/app/shared/client/v1/user.service.ts | 10 +-- .../app/shared/client/v1/webhook.service.ts | 20 +++--- .../confirmation-dialog.component.ts | 10 +-- .../shared/dropdown/dropdown.component.html | 2 +- .../app/shared/dropdown/dropdown.component.ts | 21 ++++-- .../dual-list-box/dual-list-box.component.ts | 10 +-- .../float-window-item.component.ts | 6 +- .../float-window/float-window.component.ts | 4 +- .../shared/footer/footer.component.spec.ts | 4 +- .../global-message/message.component.ts | 4 +- .../src/app/shared/global-message/message.ts | 2 +- .../src/app/shared/input/input.component.ts | 6 +- .../shared/interceptor/auth-interceptor.ts | 4 +- .../message-handler.service.ts | 4 +- .../modal-operate.component.spec.ts | 4 +- .../src/app/shared/model/v1/cronjobtpl.ts | 2 +- .../src/app/shared/model/v1/deploymenttpl.ts | 2 +- .../app/shared/model/v1/kubernetes/node.ts | 6 +- .../shared/model/v1/kubernetes/statefulset.ts | 26 +++++-- .../paginate/paginate.component.spec.ts | 4 +- .../src/app/shared/select/select.component.ts | 4 +- src/frontend/src/app/shared/utils.ts | 2 +- 279 files changed, 1193 insertions(+), 1154 deletions(-) diff --git a/src/frontend/src/app/admin/admin.component.spec.ts b/src/frontend/src/app/admin/admin.component.spec.ts index 40e571315..94533453e 100644 --- a/src/frontend/src/app/admin/admin.component.spec.ts +++ b/src/frontend/src/app/admin/admin.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AdminComponent } from './admin.component'; describe('AdminComponent', () => { - let component: AdminComponent; - let fixture: ComponentFixture; + const component: AdminComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html index c5a4fbe0e..ab695f307 100644 --- a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html +++ b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.html @@ -26,7 +26,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.ts b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.ts index a3ea78757..aceb38b04 100644 --- a/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.ts +++ b/src/frontend/src/app/admin/apikey/create-edit-apikey/create-edit-apikey.component.ts @@ -24,8 +24,8 @@ export class CreateEditApiKeyComponent implements OnInit { currentForm: NgForm; apiKey = new ApiKey(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; groups = Array(); title: string; actionType: ActionType; @@ -40,7 +40,7 @@ export class CreateEditApiKeyComponent implements OnInit { this.apiKeyTypes = ApiKeyType; this.groupService.listGroup(new PageState({pageSize: 1000}), 2).subscribe( response => { - let data = response.data; + const data = response.data; this.groups = data.list; }, error => { diff --git a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html index 255789e6f..0472062e1 100644 --- a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html +++ b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html @@ -43,7 +43,7 @@ {{apiKey.deleted ? "否" : "是"}} {{apiKey.resourceId}} {{apiKey.createTime | date:'yyyy-MM-dd HH:mm:ss'}} - {{apiKey.expireIn == 0 ? "永久有效" : apiKey.expireIn}} + {{apiKey.expireIn === 0 ? "永久有效" : apiKey.expireIn}} {{apiKey.user}} {{apiKey.description}} diff --git a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts index c2f9a108e..834de0c71 100644 --- a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts +++ b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts @@ -16,7 +16,7 @@ export class ListApiKeyComponent implements OnInit { @Input() apiKeys: ApiKey[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); @@ -32,8 +32,8 @@ export class ListApiKeyComponent implements OnInit { } getApiKeyType(apiKey: ApiKey) { - for (let type of ApiKeyType) { - if (type.id == apiKey.type) { + for (const type of ApiKeyType) { + if (type.id === apiKey.type) { return type.name; } } diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index 6e31d4398..43b8f9928 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -41,7 +41,7 @@ export class AppComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.APP) { - let appId = message.data; + const appId = message.data; this.appService.deleteById(appId, 0) .subscribe( response => { @@ -83,7 +83,7 @@ export class AppComponent implements OnInit { this.appService.listPage(this.pageState, this.namespaceId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedApps = data.list; @@ -103,7 +103,7 @@ export class AppComponent implements OnInit { } deleteApp(app: App) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除项目确认', '你确认删除项目 ' + app.name + ' ？', app.id, diff --git a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.html b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.html index a879d82b9..6a6b5dbbe 100644 --- a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.html +++ b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.html @@ -9,7 +9,7 @@

{{appTitle}}

diff --git a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts index 8aa8406a4..7c5394899 100644 --- a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts +++ b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts @@ -31,9 +31,9 @@ export class CreateEditAppComponent { componentName = '项目'; app: App = new App(); namespaces: Namespace[]; - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; appTitle: string; actionType: ActionType; @@ -137,7 +137,7 @@ export class CreateEditAppComponent { } handleValidation(): void { - let cont = this.currentForm.controls['app_name']; + const cont = this.currentForm.controls['app_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/app/list-app/list-app.component.ts b/src/frontend/src/app/admin/app/list-app/list-app.component.ts index ea70ed5b4..cb7668c4a 100644 --- a/src/frontend/src/app/admin/app/list-app/list-app.component.ts +++ b/src/frontend/src/app/admin/app/list-app/list-app.component.ts @@ -16,7 +16,7 @@ export class ListAppComponent implements OnInit { @Input() apps: App[]; @Input() idFilterInit: string; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts b/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts index 89f9329a0..744889c5e 100644 --- a/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts +++ b/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts @@ -18,7 +18,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; export class TrashAppComponent implements OnInit, OnDestroy { apps: App[]; - currentPage: number = 1; + currentPage = 1; state: State; pageState: PageState = new PageState(); @@ -33,7 +33,7 @@ export class TrashAppComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_APP) { - let appId = message.data; + const appId = message.data; this.appService.deleteById(appId, 0, false) .subscribe( response => { @@ -74,7 +74,7 @@ export class TrashAppComponent implements OnInit, OnDestroy { .listPage(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.apps = data.list; @@ -84,7 +84,7 @@ export class TrashAppComponent implements OnInit, OnDestroy { } deleteApp(app: App) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除项目确认', '你确认永久删除项目 ' + app.name + ' ？删除后将不可恢复！', app.id, diff --git a/src/frontend/src/app/admin/auditlog/auditlog.component.ts b/src/frontend/src/app/admin/auditlog/auditlog.component.ts index 462dc8990..2a9a2e39b 100644 --- a/src/frontend/src/app/admin/auditlog/auditlog.component.ts +++ b/src/frontend/src/app/admin/auditlog/auditlog.component.ts @@ -12,7 +12,7 @@ import { MessageHandlerService } from '../../shared/message-handler/message-hand export class AuditLogComponent implements OnInit { pageState: PageState = new PageState(); auditLogs: AuditLog[]; - currentPage: number = 1; + currentPage = 1; state: State; constructor(private auditLogService: AuditLogService, @@ -50,7 +50,7 @@ export class AuditLogComponent implements OnInit { this.auditLogService.listPage(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.auditLogs = data.list; diff --git a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts index 8c2f2938e..06a18894a 100644 --- a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts @@ -16,7 +16,7 @@ export class ListClusterComponent implements OnInit { @Input() clusters: Cluster[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts index 4a1692546..7445e42e4 100644 --- a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts @@ -17,7 +17,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { clusters: Cluster[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -29,7 +29,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_CLUSTER) { - let name = message.data; + const name = message.data; this.clusterService .deleteByName(name, false) .subscribe( @@ -69,7 +69,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { this.clusterService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.clusters = data.list; @@ -79,7 +79,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { } deleteCluster(cluster: Cluster) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除集群确认', '你确认永久删除集群 ' + cluster.name + ' ？删除后将不可恢复！', cluster.name, diff --git a/src/frontend/src/app/admin/config/config.component.ts b/src/frontend/src/app/admin/config/config.component.ts index 643a0fc8e..057b3578e 100644 --- a/src/frontend/src/app/admin/config/config.component.ts +++ b/src/frontend/src/app/admin/config/config.component.ts @@ -68,7 +68,7 @@ export class ConfigComponent implements OnInit { this.configService.list(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.configs = data.list; @@ -88,7 +88,7 @@ export class ConfigComponent implements OnInit { } deleteConfig(config: Config) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置确认', '你确认删除配置 ' + config.name + ' ？', config.id, diff --git a/src/frontend/src/app/admin/config/create-edit-config/create-edit-config.component.ts b/src/frontend/src/app/admin/config/create-edit-config/create-edit-config.component.ts index 27e060358..45b90705f 100644 --- a/src/frontend/src/app/admin/config/create-edit-config/create-edit-config.component.ts +++ b/src/frontend/src/app/admin/config/create-edit-config/create-edit-config.component.ts @@ -22,8 +22,8 @@ export class CreateEditConfigComponent { currentForm: NgForm; config: Config = new Config(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; title: string; actionType: ActionType; diff --git a/src/frontend/src/app/admin/config/list-config/list-config.component.ts b/src/frontend/src/app/admin/config/list-config/list-config.component.ts index 079a87640..c40708be4 100644 --- a/src/frontend/src/app/admin/config/list-config/list-config.component.ts +++ b/src/frontend/src/app/admin/config/list-config/list-config.component.ts @@ -12,7 +12,7 @@ export class ListConfigComponent implements OnInit { @Input() configs: Config[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/configmap/configmap.component.ts b/src/frontend/src/app/admin/configmap/configmap.component.ts index 98b70f65a..274a3b7b1 100644 --- a/src/frontend/src/app/admin/configmap/configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/configmap.component.ts @@ -37,7 +37,7 @@ export class ConfigMapComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CONFIGMAP) { - let id = message.data; + const id = message.data; this.configMapService.deleteById(id, 0) .subscribe( response => { @@ -68,7 +68,7 @@ export class ConfigMapComponent implements OnInit { this.configMapService.list(this.pageState, 'false', '0') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.configMaps = data.list; @@ -88,7 +88,7 @@ export class ConfigMapComponent implements OnInit { } deleteConfigMap(configMap: ConfigMap) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置集确认', '你确认删除配置集 ' + configMap.name + ' ？', configMap.id, diff --git a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.html b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.html index dddd4b573..a642f3ad0 100644 --- a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.html +++ b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.html @@ -8,7 +8,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts index e96242900..e53923826 100644 --- a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts @@ -30,9 +30,9 @@ export class CreateEditConfigMapComponent implements OnInit { aceBox: any; configMap: ConfigMap = new ConfigMap(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; actionType: ActionType; @@ -139,7 +139,7 @@ export class CreateEditConfigMapComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts index 7c857848c..599935b82 100644 --- a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts @@ -17,7 +17,7 @@ export class ListConfigMapComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts index 61bc33d89..a7fab4712 100644 --- a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts @@ -19,7 +19,7 @@ export class TrashConfigMapComponent implements OnInit, OnDestroy { configMaps: ConfigMap[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -33,7 +33,7 @@ export class TrashConfigMapComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_CONFIGMAP) { - let configMap = message.data; + const configMap = message.data; this.configMapService.deleteById(configMap.id, 0, false) .subscribe( response => { @@ -72,7 +72,7 @@ export class TrashConfigMapComponent implements OnInit, OnDestroy { this.configMapService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.configMaps = data.list; @@ -82,7 +82,7 @@ export class TrashConfigMapComponent implements OnInit, OnDestroy { } deleteConfigMap(configMap: ConfigMap) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置集确认', '你确认永久删除配置集 ' + configMap.name + ' ？删除后将不可恢复！', configMap, diff --git a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts index 11751c6c0..c2ee5a670 100644 --- a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts @@ -38,7 +38,7 @@ export class ConfigMapTplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CONFIGMAP_TPL) { - let id = message.data; + const id = message.data; this.configMapTplService.deleteById(id, 0) .subscribe( response => { @@ -56,7 +56,7 @@ export class ConfigMapTplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.configmapId = params['cid']; - if (typeof (this.configmapId) == 'undefined') { + if (typeof (this.configmapId) === 'undefined') { this.configmapId = ''; } }); @@ -76,7 +76,7 @@ export class ConfigMapTplComponent implements OnInit { this.configMapTplService.listPage(this.pageState, 0, this.configmapId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.configMapTpls = data.list; @@ -96,7 +96,7 @@ export class ConfigMapTplComponent implements OnInit { } deleteConfigMapTpl(configMapTpl: ConfigMapTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置集模版确认', '你确认删除配置集模版 ' + configMapTpl.name + ' ？', configMapTpl.id, diff --git a/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.html b/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.html index c03dfce38..bf2763728 100644 --- a/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.html +++ b/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.html @@ -12,7 +12,7 @@

{{title}} name="configmap_id"> diff --git a/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.ts index 53212a2c1..b8793f477 100644 --- a/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/create-edit-configmaptpl/create-edit-configmaptpl.component.ts @@ -26,8 +26,8 @@ export class CreateEditConfigMapTplComponent implements OnInit { currentForm: NgForm; configMapTpl: ConfigMapTpl = new ConfigMapTpl(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; title: string; actionType: ActionType; @@ -97,8 +97,8 @@ export class CreateEditConfigMapTplComponent implements OnInit { this.isSubmitOnGoing = false; return; } - for (let configMap of this.configMaps) { - if (configMap.id == this.configMapTpl.configMapId) { + for (const configMap of this.configMaps) { + if (configMap.id === this.configMapTpl.configMapId) { this.configMapTpl.name = configMap.name; } } diff --git a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts index 0f7ab1b10..4bf4c2478 100644 --- a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts @@ -14,7 +14,7 @@ export class ListConfigMapTplComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts index 574399ac0..1314600a5 100644 --- a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts @@ -20,7 +20,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { configMapTpls: ConfigMapTpl[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_CONFIGMAP_TPL) { - let id = message.data; + const id = message.data; this.configMapTplService.deleteById(id, 0, false) .subscribe( response => { @@ -73,7 +73,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { this.configMapTplService.listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.configMapTpls = data.list; @@ -83,7 +83,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { } deleteConfigMapTpl(configMapTpl: ConfigMapTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置集确认', '你确认永久删除配置集模版 ' + configMapTpl.name + ' ？删除后将不可恢复！', configMapTpl.id, diff --git a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html index ce1b4f118..ca7fda371 100644 --- a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html @@ -8,7 +8,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts index beb0b84eb..13c8946cf 100644 --- a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts @@ -30,9 +30,9 @@ export class CreateEditCronjobComponent implements OnInit { aceBox: any; cronjob: Cronjob = new Cronjob(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; componentName: string = '计划任务'; title: string; @@ -139,7 +139,7 @@ export class CreateEditCronjobComponent implements OnInit { } handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/cronjob/cronjob.component.ts b/src/frontend/src/app/admin/cronjob/cronjob.component.ts index 3d5b88606..6f1a98a38 100644 --- a/src/frontend/src/app/admin/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/cronjob.component.ts @@ -41,7 +41,7 @@ export class CronjobComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CRONJOB) { - let id = message.data; + const id = message.data; this.cronjobService.deleteById(id, 0) .subscribe( response => { @@ -59,7 +59,7 @@ export class CronjobComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.appId = params['aid']; - if (typeof (this.appId) == 'undefined') { + if (typeof (this.appId) === 'undefined') { this.appId = ''; } }); @@ -78,7 +78,7 @@ export class CronjobComponent implements OnInit { this.cronjobService.list(this.pageState, 'false', this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.cronjobs = data.list; @@ -98,7 +98,7 @@ export class CronjobComponent implements OnInit { } deleteCronjob(cronjob: Cronjob) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '你确认删除' + this.componentName + cronjob.name + ' ？', cronjob.id, diff --git a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts index 4c29b10d7..8d0c0e146 100644 --- a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts @@ -16,7 +16,7 @@ export class ListCronjobComponent implements OnInit { @Input() cronjobs: Cronjob[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts index 8f06f137f..e21509745 100644 --- a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts @@ -19,7 +19,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { cronjobs: Cronjob[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -35,7 +35,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_CRONJOB) { - let id = message.data; + const id = message.data; this.cronjobService.deleteById(id, 0, false) .subscribe( response => { @@ -75,7 +75,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { this.cronjobService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.cronjobs = data.list; @@ -85,7 +85,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { } deleteCronjob(cronjob: Cronjob) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '你确认永久删除' + this.componentName + cronjob.name + ' ？删除后将不可恢复！', cronjob.id, diff --git a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html index 6a0c6f03d..db0a83afc 100644 --- a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html @@ -11,7 +11,7 @@

{{title}} diff --git a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts index ba55430e0..1dca12309 100644 --- a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts @@ -28,8 +28,8 @@ export class CreateEditCronjobTplComponent implements OnInit { currentForm: NgForm; cronjobTpl: CronjobTpl = new CronjobTpl(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; componentName = '计划任务'; title: string; @@ -101,8 +101,8 @@ export class CreateEditCronjobTplComponent implements OnInit { this.isSubmitOnGoing = false; return; } - for (let cronjob of this.cronjobs) { - if (cronjob.id == this.cronjobTpl.cronjobId) { + for (const cronjob of this.cronjobs) { + if (cronjob.id === this.cronjobTpl.cronjobId) { this.cronjobTpl.name = cronjob.name; } } diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts index 02a6eb96e..863014c55 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts @@ -39,7 +39,7 @@ export class CronjobTplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CRONJOB_TPL) { - let id = message.data; + const id = message.data; this.cronjobTplService.deleteById(id, 0) .subscribe( response => { @@ -57,7 +57,7 @@ export class CronjobTplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.cronjobId = params['cid']; - if (typeof (this.cronjobId) == 'undefined') { + if (typeof (this.cronjobId) === 'undefined') { this.cronjobId = ''; } }); @@ -81,7 +81,7 @@ export class CronjobTplComponent implements OnInit { this.cronjobTplService.listPage(this.pageState, 0, this.cronjobId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.cronjobTpls = data.list; @@ -101,7 +101,7 @@ export class CronjobTplComponent implements OnInit { } deleteCronjobTpl(cronjobTpl: CronjobTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '你确认删除' + this.componentName + cronjobTpl.name + ' ？', cronjobTpl.id, diff --git a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts index e51cfe893..2ef0930b3 100644 --- a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts @@ -15,7 +15,7 @@ export class ListCronjobTplComponent implements OnInit { @Input() cronjobTpls: CronjobTpl[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts index 30c5e3c34..3ce9fbcf4 100644 --- a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts @@ -19,7 +19,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { cronjobTpls: CronjobTpl[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; componentName = '计划任务模板'; @@ -34,7 +34,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_CRONJOB_TPL) { - let id = message.data; + const id = message.data; this.cronjobTplService.deleteById(id, 0, false) .subscribe( response => { @@ -74,7 +74,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { this.cronjobTplService.listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.cronjobTpls = data.list; @@ -84,7 +84,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { } deleteCronjobTpl(cronjobTpl: CronjobTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '你确认永久删除' + this.componentName + cronjobTpl.name + ' ？删除后将不可恢复！', cronjobTpl.id, diff --git a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.html b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.html index 933f5b426..533afd27b 100644 --- a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.html @@ -8,7 +8,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts index a74a18bac..01821d897 100644 --- a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts @@ -30,9 +30,9 @@ export class CreateEditDaemonsetComponent implements OnInit { aceBox: any; daemonset: DaemonSet = new DaemonSet(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; resourceName = '守护进程集'; @@ -144,7 +144,7 @@ export class CreateEditDaemonsetComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['daemonset_name']; + const cont = this.currentForm.controls['daemonset_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/daemonset/daemonset.component.ts b/src/frontend/src/app/admin/daemonset/daemonset.component.ts index a47f8d4fd..713185ad6 100644 --- a/src/frontend/src/app/admin/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/daemonset.component.ts @@ -40,7 +40,7 @@ export class DaemonsetComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DAEMONSET) { - let id = message.data; + const id = message.data; this.daemonsetService.deleteById(id, 0) .subscribe( response => { @@ -83,7 +83,7 @@ export class DaemonsetComponent implements OnInit { this.daemonsetService.listPage(this.pageState, this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedDaemonsets = data.list; @@ -103,7 +103,7 @@ export class DaemonsetComponent implements OnInit { } deleteDaemonset(daemonset: DaemonSet) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集确认', '你确认删除守护进程集 ' + daemonset.name + ' ？', daemonset.id, diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts index 11e327ddd..da601a61b 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts @@ -17,7 +17,7 @@ export class ListDaemonsetComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts index 1d22b0454..9752783f8 100644 --- a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts @@ -20,7 +20,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { daemonsets: DaemonSet[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_DAEMONSET_TPL) { - let id = message.data; + const id = message.data; this.daemonsetService.deleteById(id, 0, false) .subscribe( response => { @@ -77,7 +77,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { this.daemonsetService.listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.daemonsets = data.list; @@ -87,7 +87,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { } deleteDaemonset(daemonset: DaemonSet) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集确认', '你确认永久删除守护进程集 ' + daemonset.name + ' ？删除后将不可恢复！', daemonset.id, diff --git a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html index e317c3b2e..79ba119c3 100644 --- a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.html @@ -13,7 +13,7 @@

{{title}} name="daemonset_app_id"> diff --git a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts index bc69fce55..4762112a6 100644 --- a/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts @@ -28,7 +28,7 @@ export class CreateEditDaemonsettplComponent implements OnInit { currentForm: NgForm; daemonsetTpl: DaemonSetTemplate = new DaemonSetTemplate(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; actionType: ActionType; @@ -99,8 +99,8 @@ export class CreateEditDaemonsettplComponent implements OnInit { return; } this.daemonsetTpl.template = this.aceBox.getValue(); - for (let daemonset of this.daemonsets) { - if (daemonset.id == this.daemonsetTpl.daemonSetId) { + for (const daemonset of this.daemonsets) { + if (daemonset.id === this.daemonsetTpl.daemonSetId) { this.daemonsetTpl.name = daemonset.name; } } diff --git a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts index cc39d37d7..04119a6b6 100644 --- a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts @@ -38,7 +38,7 @@ export class DaemonsettplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DAEMONSET_TPL) { - let id = message.data; + const id = message.data; this.daemonsetTplService.deleteById(id, 0) .subscribe( response => { @@ -56,7 +56,7 @@ export class DaemonsettplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.daemonsetId = params['did']; - if (typeof (this.daemonsetId) == 'undefined') { + if (typeof (this.daemonsetId) === 'undefined') { this.daemonsetId = 0; } }); @@ -80,7 +80,7 @@ export class DaemonsettplComponent implements OnInit { this.daemonsetTplService.listPage(this.pageState, this.daemonsetId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedDaemonsets = data.list; @@ -100,7 +100,7 @@ export class DaemonsettplComponent implements OnInit { } deleteDaemonset(tpl: DaemonSetTemplate) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集模版确认', '你确认删除守护进程集模版 ' + tpl.name + ' ？', tpl.id, diff --git a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts index d26e27d9c..4fbab0c34 100644 --- a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts @@ -14,7 +14,7 @@ export class ListDaemonsettplComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts index 9144cbe42..30ae43f9b 100644 --- a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts @@ -20,7 +20,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { daemonsetTpls: DaemonSetTemplate[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_DAEMONSET_TPL) { - let id = message.data; + const id = message.data; this.daemonsetTplService.deleteById(id, 0, false) .subscribe( response => { @@ -74,7 +74,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { .listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.daemonsetTpls = data.list; @@ -84,7 +84,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { } deleteDaemonsetTpl(template: DaemonSetTemplate) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集模版确认', '你确认永久删除守护进程集模版 ' + template.name + ' ？删除后将不可恢复！', template.id, diff --git a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.html b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.html index d769e1c60..e5b8f21e4 100644 --- a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.html +++ b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.html @@ -10,7 +10,7 @@

{{deploymentTitle}}

diff --git a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts index a36f1ec88..b016deb40 100644 --- a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts @@ -31,9 +31,9 @@ export class CreateEditDeploymentComponent implements OnInit { aceBox: any; deployment: Deployment = new Deployment(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; deploymentTitle: string; actionType: ActionType; @@ -144,7 +144,7 @@ export class CreateEditDeploymentComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['deployment_name']; + const cont = this.currentForm.controls['deployment_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/deployment/deployment.component.spec.ts b/src/frontend/src/app/admin/deployment/deployment.component.spec.ts index 9b80d407a..b29a48bc0 100644 --- a/src/frontend/src/app/admin/deployment/deployment.component.spec.ts +++ b/src/frontend/src/app/admin/deployment/deployment.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { DeploymentComponent } from './deployment.component'; describe('KubeDeploymentComponent', () => { - let component: DeploymentComponent; - let fixture: ComponentFixture; + const component: DeploymentComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/deployment/deployment.component.ts b/src/frontend/src/app/admin/deployment/deployment.component.ts index 95c97d615..f7aecb54f 100644 --- a/src/frontend/src/app/admin/deployment/deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/deployment.component.ts @@ -40,7 +40,7 @@ export class DeploymentComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DEPLOYMENT) { - let deploymentId = message.data; + const deploymentId = message.data; this.deploymentService.deleteById(deploymentId, 0) .subscribe( response => { @@ -58,7 +58,7 @@ export class DeploymentComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.appId = params['aid']; - if (typeof (this.appId) == 'undefined') { + if (typeof (this.appId) === 'undefined') { this.appId = ''; } }); @@ -76,7 +76,7 @@ export class DeploymentComponent implements OnInit { } this.deploymentService.list(this.pageState, 'false', this.appId).subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedDeployments = data.list; @@ -96,7 +96,7 @@ export class DeploymentComponent implements OnInit { } deleteDeployment(deployment: Deployment) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除部署确认', '你确认删除部署 ' + deployment.name + ' ？', deployment.id, diff --git a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts index bef6e0aae..fc365890b 100644 --- a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts @@ -16,9 +16,9 @@ export class ListDeploymentComponent implements OnInit { @Input() deployments: Deployment[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; - testInfo: number = 0; + testInfo = 0; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); diff --git a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts index 696f07519..8b824fbf0 100644 --- a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts @@ -19,7 +19,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { deployments: Deployment[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_DEPLOYMENT) { - let deploymentId = message.data; + const deploymentId = message.data; this.deploymentService.deleteById(deploymentId, 0, false) .subscribe( response => { @@ -71,7 +71,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { this.deploymentService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.deployments = data.list; @@ -81,7 +81,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { } deleteDeployment(deployment: Deployment) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除部署确认', '你确认永久删除部署 ' + deployment.name + ' ？删除后将不可恢复！', deployment.id, diff --git a/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html b/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html index 357e5416f..ff6655d31 100644 --- a/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html +++ b/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html @@ -13,7 +13,7 @@

{{deploymentTplTitle}} name="deployment_app_id"> diff --git a/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts index 546f28cd4..362100603 100644 --- a/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts @@ -28,7 +28,7 @@ export class CreateEditDeploymentTplComponent implements OnInit { currentForm: NgForm; deploymentTpl: DeploymentTpl = new DeploymentTpl(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; deploymentTplTitle: string; actionType: ActionType; @@ -100,8 +100,8 @@ export class CreateEditDeploymentTplComponent implements OnInit { return; } - for (let deployment of this.deployments) { - if (deployment.id == this.deploymentTpl.deploymentId) { + for (const deployment of this.deployments) { + if (deployment.id === this.deploymentTpl.deploymentId) { this.deploymentTpl.name = deployment.name; } } diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts index 22dd1ac8e..6f61f3130 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts @@ -38,7 +38,7 @@ export class DeploymentTplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DEPLOYMENT_TPL) { - let id = message.data; + const id = message.data; this.deploymentTplService.deleteById(id, 0) .subscribe( response => { @@ -56,7 +56,7 @@ export class DeploymentTplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.deploymentId = params['did']; - if (typeof (this.deploymentId) == 'undefined') { + if (typeof (this.deploymentId) === 'undefined') { this.deploymentId = ''; } }); @@ -76,7 +76,7 @@ export class DeploymentTplComponent implements OnInit { this.deploymentTplService.listPage(this.pageState, 0, this.deploymentId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedDeployments = data.list; @@ -96,7 +96,7 @@ export class DeploymentTplComponent implements OnInit { } deleteDeployment(tpl: DeploymentTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除部署模版确认', '你确认删除部署模版 ' + tpl.name + ' ？', tpl.id, diff --git a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts index 30610affc..0898e7e52 100644 --- a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts @@ -13,7 +13,7 @@ export class ListDeploymentTplComponent implements OnInit { @Input() deploymentTpls: DeploymentTpl[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts index a488b6358..b8686ffb3 100644 --- a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts @@ -19,7 +19,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { deploymentTpls: DeploymentTpl[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_DEPLOYMENT_TPL) { - let id = message.data; + const id = message.data; this.deploymentTplService.deleteById(id, 0, false) .subscribe( response => { @@ -77,7 +77,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { .listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.deploymentTpls = data.list; @@ -87,7 +87,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { } deleteDeploymentTpl(deploymentTpl: DeploymentTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除部署模版确认', '你确认永久删除部署模版 ' + deploymentTpl.name + ' ？删除后将不可恢复！', deploymentTpl.id, diff --git a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.html b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.html index e92f877e1..d7bdb5502 100644 --- a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.html +++ b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.html @@ -9,7 +9,7 @@

{{groupTitle}}

diff --git a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts index bdbef2f29..05258a021 100644 --- a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts +++ b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts @@ -25,9 +25,9 @@ export class CreateEditGroupComponent { currentForm: NgForm; group: Group = new Group(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; groupTitle: string; actionType: ActionType; @@ -51,7 +51,7 @@ export class CreateEditGroupComponent { this.permissionService.listPermission(new PageState({pageSize: 500})).subscribe( response => { this.basePermissions = response.data.list; - for (let x in this.basePermissions) { + for (const x in this.basePermissions) { this.mapPermissions.set(this.basePermissions[x].id.toString(), this.basePermissions[x]); } }, @@ -70,7 +70,7 @@ export class CreateEditGroupComponent { status => { this.group = status.data; for (let key in this.allPermissions) { - for (let index in this.group.permissions) { + for (const index in this.group.permissions) { const source = this.allPermissions[key]; const detail = this.group.permissions[index]; if (JSON.stringify(source) === JSON.stringify(detail)) { @@ -102,7 +102,7 @@ export class CreateEditGroupComponent { } this.group.permissions = new Array(); this.isSubmitOnGoing = true; - for (let k in this.selectPermissions) { + for (const k in this.selectPermissions) { this.group.permissions.push(this.mapPermissions.get(this.selectPermissions[k])); } @@ -150,7 +150,7 @@ export class CreateEditGroupComponent { // Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['group_name']; + const cont = this.currentForm.controls['group_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/group/group.component.spec.ts b/src/frontend/src/app/admin/group/group.component.spec.ts index fcffe5515..f034a9875 100644 --- a/src/frontend/src/app/admin/group/group.component.spec.ts +++ b/src/frontend/src/app/admin/group/group.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { GroupComponent } from './group.component'; describe('GroupComponent', () => { - let component: GroupComponent; - let fixture: ComponentFixture; + const component: GroupComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/group/group.component.ts b/src/frontend/src/app/admin/group/group.component.ts index f7ac0d606..9758eba7b 100644 --- a/src/frontend/src/app/admin/group/group.component.ts +++ b/src/frontend/src/app/admin/group/group.component.ts @@ -67,7 +67,7 @@ export class GroupComponent implements OnInit { this.groupService.listGroup(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedGroups = data.list; diff --git a/src/frontend/src/app/admin/group/list-group/list-group.component.ts b/src/frontend/src/app/admin/group/list-group/list-group.component.ts index 683cc6dc5..a17f60639 100644 --- a/src/frontend/src/app/admin/group/list-group/list-group.component.ts +++ b/src/frontend/src/app/admin/group/list-group/list-group.component.ts @@ -16,7 +16,7 @@ export class ListGroupComponent implements OnInit { @Input() groups: Group[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.html b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.html index a6bfefe96..084f60822 100644 --- a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.html +++ b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.html @@ -8,7 +8,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/ingress/ingress.component.ts b/src/frontend/src/app/admin/ingress/ingress.component.ts index 8085ae656..af4ed0fec 100644 --- a/src/frontend/src/app/admin/ingress/ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/ingress.component.ts @@ -43,7 +43,7 @@ export class IngressComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.INGRESS) { - let id = message.data; + const id = message.data; this.ingressService.deleteById(id, 0) .subscribe( response => { diff --git a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.html b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.html index 7b4e4ac54..319b4ff03 100644 --- a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.html +++ b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.html @@ -10,7 +10,7 @@

{{title}}
diff --git a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts index dc1ba5093..03eaff3bb 100644 --- a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts @@ -98,7 +98,7 @@ export class CreateEditIngressTplComponent implements OnInit{ return; } this.ingressTpl.template = this.aceBox.getValue(); - for (let ingress of this.ingresses) { + for (const ingress of this.ingresses) { if (ingress.id === this.ingressTpl.ingressId) { this.ingressTpl.name = ingress.name; } diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index 6948b4d24..df89370fa 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -43,7 +43,7 @@ export class IngressTplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.SERVICE_TPL) { - let id = message.data; + const id = message.data; this.ingressTplService.deleteById(id, 0) .subscribe( response => { @@ -81,7 +81,7 @@ export class IngressTplComponent implements OnInit, OnDestroy { this.ingressTplService.listPage(this.pageState, 0, this.serviceId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.ingressTpls = data.list; diff --git a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts index 57fe3a898..39b4dd92d 100644 --- a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts +++ b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts @@ -58,9 +58,9 @@ export class NameFilter implements StringFilter { export class LabelFilter implements StringFilter { accepts(node: Node, search: string): boolean { - let keys = Object.keys(node.labels); + const keys = Object.keys(node.labels); for (let key of keys) { - let value = node.labels[key]; + const value = node.labels[key]; if ((key + ':' + value).indexOf(search) >= 0) { return true; } diff --git a/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts b/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts index 0d4efa6a6..eb450bd45 100644 --- a/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts +++ b/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts @@ -26,9 +26,9 @@ export class ListNodesComponent implements OnInit { @Input() cluster: string; @Input() showState: object; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; - currentPage: number = 1; - _pageSize: number = 10; + sorted = false; + currentPage = 1; + _pageSize = 10; nameComparator = new NameComparator(); readyComparator = new ReadyComparator(); osImageComparator = new OsImageComparator(); diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts index 544f222a1..131950193 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts @@ -120,7 +120,7 @@ export class CreateEditPersistentVolumeComponent implements OnInit { get labels(): FormArray { return this.currentForm.get('labels') as FormArray; - }; + } onAddLabel(index: number) { const selectors = this.currentForm.get(`labels`) as FormArray; diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.ts index ec121326f..2d146fdb0 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.ts @@ -160,7 +160,7 @@ export class PersistentVolumeComponent implements OnInit, OnDestroy { } } for (const pv of pvs) { - if (isNotEmpty(pv.spec.rbd) && rbdImages[pv.spec.rbd.image] && rbdImages[pv.spec.rbd.image].type == 'rbd') { + if (isNotEmpty(pv.spec.rbd) && rbdImages[pv.spec.rbd.image] && rbdImages[pv.spec.rbd.image].type === 'rbd') { pv.spec.rbd.created = true; } else if (isNotEmpty(pv.spec.cephfs)) { const name = this.getCephfsName(pv.spec.cephfs.path); diff --git a/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.ts b/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.ts index 6661ccbcc..3b09ab63c 100644 --- a/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.ts @@ -160,7 +160,7 @@ export class CreateEditNamespaceComponent { if (clusterMeta && clusterMeta.checked) { this.namespaceClient.create(this.ns.metaDataObj.namespace, cluster).subscribe( next => { - if (next.data === null) { + if (next.data == null) { this.messageHandlerService.showSuccess(`集群 ${cluster} 已存在对应的 kubernetes namespace！`); } else { this.messageHandlerService.showSuccess(`集群 ${cluster} 创建 kubernetes namespace 成功！`); @@ -194,7 +194,7 @@ export class CreateEditNamespaceComponent { if (clusterMeta && clusterMeta.checked) { this.namespaceClient.create(this.ns.metaDataObj.namespace, cluster).subscribe( next => { - if (next.data === null) { + if (next.data == null) { this.messageHandlerService.showSuccess(`集群 ${cluster} 已存在对应的 kubernetes namespace！`); } else { this.messageHandlerService.showSuccess(`集群 ${cluster} 创建 kubernetes namespace 成功！`); diff --git a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts index 31c465f52..f0fe763d0 100644 --- a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts @@ -14,7 +14,7 @@ export class ListNamespaceComponent implements OnInit { @Input() namespaces: Namespace[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/namespace/namespace.component.spec.ts b/src/frontend/src/app/admin/namespace/namespace.component.spec.ts index 775dcec69..daaba8e40 100644 --- a/src/frontend/src/app/admin/namespace/namespace.component.spec.ts +++ b/src/frontend/src/app/admin/namespace/namespace.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NamespaceComponent } from './namespace.component'; describe('NamespaceComponent', () => { - let component: NamespaceComponent; - let fixture: ComponentFixture; + const component: NamespaceComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/namespace/namespace.component.ts b/src/frontend/src/app/admin/namespace/namespace.component.ts index 706794bc4..4af4f143d 100644 --- a/src/frontend/src/app/admin/namespace/namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/namespace.component.ts @@ -40,7 +40,7 @@ export class NamespaceComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.NAMESPACE) { - let namespaceId = message.data; + const namespaceId = message.data; this.namespaceService.deleteNamespace(namespaceId) .subscribe( response => { @@ -82,12 +82,12 @@ export class NamespaceComponent implements OnInit { this.namespaceService.listNamespace(this.pageState, 'false') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedNamespaces = data.list; if (this.changedNamespaces && this.changedNamespaces.length > 0) { - for (let ns of this.changedNamespaces) { + for (const ns of this.changedNamespaces) { if (!ns.metaData) { ns.metaData = '{}'; } diff --git a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts index ea5729eb8..a5e3ce438 100644 --- a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts @@ -16,7 +16,7 @@ import { PageState } from '../../../shared/page/page-state'; export class TrashNamespaceComponent implements OnInit, OnDestroy { namespaces: Namespace[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -28,7 +28,7 @@ export class TrashNamespaceComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_NAMESPACE) { - let namespaceId = message.data; + const namespaceId = message.data; this.namespaceService.deleteNamespace(namespaceId, false) .subscribe( response => { @@ -67,7 +67,7 @@ export class TrashNamespaceComponent implements OnInit, OnDestroy { this.namespaceService.listNamespace(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.namespaces = data.list; diff --git a/src/frontend/src/app/admin/nav/nav.component.spec.ts b/src/frontend/src/app/admin/nav/nav.component.spec.ts index 0836cdfac..4959d89c3 100644 --- a/src/frontend/src/app/admin/nav/nav.component.spec.ts +++ b/src/frontend/src/app/admin/nav/nav.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NavComponent } from './nav.component'; describe('NavComponent', () => { - let component: NavComponent; - let fixture: ComponentFixture; + const component: NavComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/notification/create-notification/create-notification.component.spec.ts b/src/frontend/src/app/admin/notification/create-notification/create-notification.component.spec.ts index 1619c0416..98d29d1ea 100644 --- a/src/frontend/src/app/admin/notification/create-notification/create-notification.component.spec.ts +++ b/src/frontend/src/app/admin/notification/create-notification/create-notification.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CreateNotificationComponent } from './create-notification.component'; describe('CreateNotificationComponent', () => { - let component: CreateNotificationComponent; - let fixture: ComponentFixture; + const component: CreateNotificationComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.spec.ts b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.spec.ts index b308c7de9..72e2f7230 100644 --- a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.spec.ts +++ b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ListNotificationComponent } from './list-notification.component'; describe('ListNotificationComponent', () => { - let component: ListNotificationComponent; - let fixture: ComponentFixture; + const component: ListNotificationComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.ts b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.ts index 0ab4dd49e..8f7b481a9 100644 --- a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.ts +++ b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.ts @@ -16,7 +16,7 @@ export class ListNotificationComponent implements OnInit { @Input() notifications: Notification[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: ClrDatagridStateInterface; notification: Notification = new Notification(); diff --git a/src/frontend/src/app/admin/notification/notification.component.spec.ts b/src/frontend/src/app/admin/notification/notification.component.spec.ts index a76fe1ec2..f79c9babe 100644 --- a/src/frontend/src/app/admin/notification/notification.component.spec.ts +++ b/src/frontend/src/app/admin/notification/notification.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NotificationComponent } from './notification.component'; describe('NotificationComponent', () => { - let component: NotificationComponent; - let fixture: ComponentFixture; + const component: NotificationComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/notification/notification.component.ts b/src/frontend/src/app/admin/notification/notification.component.ts index 87efbc89b..8f8a12ffa 100644 --- a/src/frontend/src/app/admin/notification/notification.component.ts +++ b/src/frontend/src/app/admin/notification/notification.component.ts @@ -53,7 +53,7 @@ export class NotificationComponent implements OnInit { this.notificationService.query(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.notifications = data.list; diff --git a/src/frontend/src/app/admin/notification/notification.module.spec.ts b/src/frontend/src/app/admin/notification/notification.module.spec.ts index d57daa778..dc464c0d1 100644 --- a/src/frontend/src/app/admin/notification/notification.module.spec.ts +++ b/src/frontend/src/app/admin/notification/notification.module.spec.ts @@ -1,7 +1,7 @@ import { NotificationModule } from './notification.module'; describe('NotificationModule', () => { - let notificationModule: NotificationModule; + const notificationModule: NotificationModule; beforeEach(() => { notificationModule = new NotificationModule(); diff --git a/src/frontend/src/app/admin/permission/create-edit-permission/create-edit-permission.component.ts b/src/frontend/src/app/admin/permission/create-edit-permission/create-edit-permission.component.ts index 7c534d432..f54a63965 100644 --- a/src/frontend/src/app/admin/permission/create-edit-permission/create-edit-permission.component.ts +++ b/src/frontend/src/app/admin/permission/create-edit-permission/create-edit-permission.component.ts @@ -23,9 +23,9 @@ export class CreateEditPermissionComponent { componentName = '操作权限'; permission: Permission = new Permission(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; permissionTitle: string; actionType: ActionType; @@ -109,7 +109,7 @@ export class CreateEditPermissionComponent { } handleValidation(): void { - let cont = this.currentForm.controls['permission_name']; + const cont = this.currentForm.controls['permission_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts index c13cdbc4d..c472545b2 100644 --- a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts +++ b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts @@ -15,7 +15,7 @@ export class ListPermissionComponent implements OnInit { @Input() permissions: Permission[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/permission/permission.component.spec.ts b/src/frontend/src/app/admin/permission/permission.component.spec.ts index e46943005..1822088f3 100644 --- a/src/frontend/src/app/admin/permission/permission.component.spec.ts +++ b/src/frontend/src/app/admin/permission/permission.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PermissionComponent } from './permission.component'; describe('PermissionComponent', () => { - let component: PermissionComponent; - let fixture: ComponentFixture; + const component: PermissionComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/permission/permission.component.ts b/src/frontend/src/app/admin/permission/permission.component.ts index 6a3fd48d5..60f6c0461 100644 --- a/src/frontend/src/app/admin/permission/permission.component.ts +++ b/src/frontend/src/app/admin/permission/permission.component.ts @@ -69,7 +69,7 @@ export class PermissionComponent implements OnInit { this.permissionService.listPermission(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedPermissions = data.list; diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html index 6ffbb6443..dc23d8a80 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.html @@ -8,7 +8,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts index 782400c41..f21083dcd 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts @@ -30,9 +30,9 @@ export class CreateEditPersistentVolumeClaimComponent implements OnInit { aceBox: any; pvc: PersistentVolumeClaim = new PersistentVolumeClaim(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; actionType: ActionType; @@ -141,7 +141,7 @@ export class CreateEditPersistentVolumeClaimComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index 81e72a05d..8da7a8feb 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -14,7 +14,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit { @Input() pvcs: PersistentVolumeClaim[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts index ac03f9769..117cee34c 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -41,7 +41,7 @@ export class PersistentVolumeClaimComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM) { - let id = message.data; + const id = message.data; this.pvcService.deleteById(id, 0) .subscribe( response => { @@ -59,7 +59,7 @@ export class PersistentVolumeClaimComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.appId = params['aid']; - if (typeof (this.appId) == 'undefined') { + if (typeof (this.appId) === 'undefined') { this.appId = ''; } }); @@ -78,7 +78,7 @@ export class PersistentVolumeClaimComponent implements OnInit { this.pvcService.list(this.pageState, 'false', this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.pvcs = data.list; @@ -98,7 +98,7 @@ export class PersistentVolumeClaimComponent implements OnInit { } deletePvc(pvc: PersistentVolumeClaim) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除PVC确认', '你确认删除PVC ' + pvc.name + ' ？', pvc.id, diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts index 8c542c4e4..8a10f2156 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts @@ -19,7 +19,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { pvcs: PersistentVolumeClaim[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_PERSISTENT_VOLUME_CLAIM) { - let id = message.data; + const id = message.data; this.pvcService.deleteById(id, 0, false) .subscribe( response => { @@ -71,7 +71,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.pvcService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.pvcs = data.list; @@ -81,7 +81,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { } deletePvc(pvc: PersistentVolumeClaim) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除PVC确认', '你确认永久删除PVC ' + pvc.name + ' ？删除后将不可恢复！', pvc.id, diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html b/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html index ef31ed61b..0a6bfa332 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html @@ -14,7 +14,7 @@

{{title}} diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts index f81e8a646..a2b6d2fba 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts @@ -28,8 +28,8 @@ export class CreateEditPersistentVolumeClaimTplComponent implements OnInit { currentForm: NgForm; pvcTpl: PersistentVolumeClaimTpl = new PersistentVolumeClaimTpl(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; title: string; actionType: ActionType; @@ -99,8 +99,8 @@ export class CreateEditPersistentVolumeClaimTplComponent implements OnInit { return; } this.pvcTpl.template = this.aceBox.getValue(); - for (let svc of this.pvcs) { - if (svc.id == this.pvcTpl.persistentVolumeClaimId) { + for (const svc of this.pvcs) { + if (svc.id === this.pvcTpl.persistentVolumeClaimId) { this.pvcTpl.name = svc.name; } } diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts index 080d6343d..24a6358d0 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts @@ -14,7 +14,7 @@ export class ListPersistentVolumeClaimTplComponent implements OnInit { @Input() pvcTpls: PersistentVolumeClaimTpl[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts index 45644ab99..24ebcd7e5 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts @@ -39,7 +39,7 @@ export class PersistentVolumeClaimTplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_TPL) { - let id = message.data; + const id = message.data; this.pvcTplService.deleteById(id, 0) .subscribe( response => { @@ -57,7 +57,7 @@ export class PersistentVolumeClaimTplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.pvcId = params['sid']; - if (typeof (this.pvcId) == 'undefined') { + if (typeof (this.pvcId) === 'undefined') { this.pvcId = ''; } }); @@ -76,7 +76,7 @@ export class PersistentVolumeClaimTplComponent implements OnInit { this.pvcTplService.list(this.pageState, 0, 'false', this.pvcId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.pvcTpls = data.list; @@ -96,7 +96,7 @@ export class PersistentVolumeClaimTplComponent implements OnInit { } deletePvcTpl(tpl: PersistentVolumeClaimTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除PVC模版确认', '你确认删除PVC模版 ' + tpl.name + ' ？', tpl.id, diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts index 2233c9a20..d024e2b32 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts @@ -19,7 +19,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy pvcTpls: PersistentVolumeClaimTpl[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_PERSISTENT_VOLUME_CLAIM_TPL) { - let id = message.data; + const id = message.data; this.pvcTplService.deleteById(id, 0, false) .subscribe( response => { @@ -71,7 +71,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy this.pvcTplService.list(this.pageState, 0, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.pvcTpls = data.list; @@ -81,7 +81,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy } deletePvcTpl(tpl: PersistentVolumeClaimTpl) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除PVC确认', '你确认永久删除PVC模版 ' + tpl.name + ' ？删除后将不可恢复！', tpl.id, diff --git a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.html b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.html index 32af26a00..d2927b01e 100644 --- a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.html +++ b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.html @@ -7,7 +7,7 @@

{{secretTitle}}

diff --git a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts index 98c1edb12..c2bfdfe59 100644 --- a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts +++ b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts @@ -30,9 +30,9 @@ export class CreateEditSecretComponent { aceBox: any; secret: Secret = new Secret(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; secretTitle: string; actionType: ActionType; @@ -140,7 +140,7 @@ export class CreateEditSecretComponent { // Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['secret_name']; + const cont = this.currentForm.controls['secret_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts index 298f51eff..4022e7e3f 100644 --- a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts +++ b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts @@ -18,7 +18,7 @@ export class ListSecretComponent implements OnInit { @Input() secrets: Secret[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/secret/secret.component.spec.ts b/src/frontend/src/app/admin/secret/secret.component.spec.ts index 36c76ac40..1fa453bc1 100644 --- a/src/frontend/src/app/admin/secret/secret.component.spec.ts +++ b/src/frontend/src/app/admin/secret/secret.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SecretComponent } from './secret.component'; describe('SecretComponent', () => { - let component: SecretComponent; - let fixture: ComponentFixture; + const component: SecretComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/secret/secret.component.ts b/src/frontend/src/app/admin/secret/secret.component.ts index 076d275cc..bc8b7a281 100644 --- a/src/frontend/src/app/admin/secret/secret.component.ts +++ b/src/frontend/src/app/admin/secret/secret.component.ts @@ -39,7 +39,7 @@ export class SecretComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.SECRET) { - let secretId = message.data; + const secretId = message.data; this.secretService.deleteById(secretId, 0) .subscribe( response => { @@ -57,7 +57,7 @@ export class SecretComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.appId = params['aid']; - if (typeof (this.appId) == 'undefined') { + if (typeof (this.appId) === 'undefined') { this.appId = ''; } }); @@ -76,7 +76,7 @@ export class SecretComponent implements OnInit { this.secretService.list(this.pageState, 'false', this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedSecrets = data.list; diff --git a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts index 19957b38f..a5a313139 100644 --- a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts +++ b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts @@ -18,7 +18,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; export class TrashSecretComponent implements OnInit, OnDestroy { secrets: Secret[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -31,7 +31,7 @@ export class TrashSecretComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_SECRET) { - let secretId = message.data; + const secretId = message.data; this.secretService.deleteById(secretId, 0, false) .subscribe( response => { @@ -71,7 +71,7 @@ export class TrashSecretComponent implements OnInit, OnDestroy { this.secretService.list(this.pageState, 'true') .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.secrets = data.list; diff --git a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html index 67b2cba5c..2e9755eb7 100644 --- a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html +++ b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.html @@ -10,7 +10,7 @@

{{secrettplTitle}}
diff --git a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts index 25cadf889..126932009 100644 --- a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts @@ -27,9 +27,9 @@ export class CreateEditSecretTplComponent { currentForm: NgForm; secrettpl: SecretTpl = new SecretTpl(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; secrettplTitle: string; actionType: ActionType; @@ -100,7 +100,7 @@ export class CreateEditSecretTplComponent { return; } this.secrettpl.template = this.aceBox.getValue(); - for (let secret of this.secrets) { + for (const secret of this.secrets) { if (secret.id === this.secrettpl.secretId) { this.secrettpl.name = secret.name; } @@ -149,7 +149,7 @@ export class CreateEditSecretTplComponent { // Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['secrettpl_name']; + const cont = this.currentForm.controls['secrettpl_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts index 7486f551f..fe395bf7f 100644 --- a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts @@ -15,7 +15,7 @@ export class ListSecretTplComponent implements OnInit { @Input() secrettpls: SecretTpl[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts index 38b0f918b..a3bbd8c7f 100644 --- a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts @@ -39,7 +39,7 @@ export class SecretTplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.SECRET_TPL) { - let secrettplId = message.data; + const secrettplId = message.data; this.secrettplService.deleteById(secrettplId, 0) .subscribe( response => { @@ -57,7 +57,7 @@ export class SecretTplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.secretId = params['sid']; - if (typeof (this.secretId) == 'undefined') { + if (typeof (this.secretId) === 'undefined') { this.secretId = ''; } }); @@ -77,7 +77,7 @@ export class SecretTplComponent implements OnInit { this.secrettplService.listPage(this.pageState, 0, this.secretId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedSecrettpls = data.list; diff --git a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts index 530ce0625..105722baa 100644 --- a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts @@ -18,7 +18,7 @@ import { PageState } from '../../../shared/page/page-state'; export class TrashSecretTplComponent implements OnInit, OnDestroy { secrettpls: SecretTpl[]; pageState: PageState = new PageState(); - currentPage: number = 1; + currentPage = 1; state: State; subscription: Subscription; @@ -31,7 +31,7 @@ export class TrashSecretTplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_SECRET_TPL) { - let secrettplId = message.data; + const secrettplId = message.data; this.secrettplService.deleteById(secrettplId, 0, false) .subscribe( response => { @@ -71,7 +71,7 @@ export class TrashSecretTplComponent implements OnInit, OnDestroy { this.secrettplService.listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.secrettpls = data.list; diff --git a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.html b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.html index 6c6754ee3..95725429e 100644 --- a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.html +++ b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.html @@ -9,7 +9,7 @@

{{title}}

diff --git a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts index 482f3b87d..7d5a385f4 100644 --- a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts @@ -31,9 +31,9 @@ export class CreateEditStatefulsetComponent implements OnInit { aceBox: any; statefulset: Statefulset = new Statefulset(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; resourceName = '状态副本集'; @@ -145,7 +145,7 @@ export class CreateEditStatefulsetComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['statefulset_name']; + const cont = this.currentForm.controls['statefulset_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts index 83ba0752c..b23befb4a 100644 --- a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts @@ -17,7 +17,7 @@ export class ListStatefulsetComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/statefulset/statefulset.component.ts b/src/frontend/src/app/admin/statefulset/statefulset.component.ts index 78616447f..c1a9a661e 100644 --- a/src/frontend/src/app/admin/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/statefulset.component.ts @@ -40,7 +40,7 @@ export class StatefulsetComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.STATEFULSET) { - let id = message.data; + const id = message.data; this.statefulsetService.deleteById(id, 0) .subscribe( response => { @@ -83,7 +83,7 @@ export class StatefulsetComponent implements OnInit { this.statefulsetService.listPage(this.pageState, this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedStatefulsets = data.list; @@ -103,7 +103,7 @@ export class StatefulsetComponent implements OnInit { } deleteStatefulset(statefulset: Statefulset) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集确认', '你确认删除状态副本集 ' + statefulset.name + ' ？', statefulset.id, diff --git a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts index e9a309749..384991740 100644 --- a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts @@ -20,7 +20,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { statefulsets: Statefulset[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_STATEFULSET) { - let id = message.data; + const id = message.data; this.statefulsetService.deleteById(id, 0, false) .subscribe( response => { @@ -77,7 +77,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { this.statefulsetService.listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.statefulsets = data.list; @@ -87,7 +87,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { } deleteStatefulset(statefulset: Statefulset) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集确认', '你确认永久删除状态副本集 ' + statefulset.name + ' ？删除后将不可恢复！', statefulset.id, diff --git a/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.html b/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.html index 0f88c2989..15679a120 100644 --- a/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.html +++ b/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.html @@ -13,7 +13,7 @@

{{title}} name="statefulset_app_id"> diff --git a/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts index 9ab288204..37c90b5a4 100644 --- a/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts @@ -28,7 +28,7 @@ export class CreateEditStatefulsettplComponent implements OnInit { currentForm: NgForm; statefulsetTpl: StatefulsetTemplate = new StatefulsetTemplate(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; actionType: ActionType; @@ -100,8 +100,8 @@ export class CreateEditStatefulsettplComponent implements OnInit { return; } this.statefulsetTpl.template = this.aceBox.getValue(); - for (let statefulset of this.statefulsets) { - if (statefulset.id == this.statefulsetTpl.statefulsetId) { + for (const statefulset of this.statefulsets) { + if (statefulset.id === this.statefulsetTpl.statefulsetId) { this.statefulsetTpl.name = statefulset.name; } } diff --git a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts index 8c354c25e..68e962e1b 100644 --- a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts @@ -14,7 +14,7 @@ export class ListStatefulsettplComponent implements OnInit { @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); diff --git a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts index 0e175fdaf..3f93fa509 100644 --- a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts @@ -38,7 +38,7 @@ export class StatefulsettplComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.STATEFULSET_TPL) { - let id = message.data; + const id = message.data; this.statefulsetTplService.deleteById(id, 0) .subscribe( response => { @@ -56,7 +56,7 @@ export class StatefulsettplComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { this.statefulsetId = params['did']; - if (typeof (this.statefulsetId) == 'undefined') { + if (typeof (this.statefulsetId) === 'undefined') { this.statefulsetId = 0; } }); @@ -80,7 +80,7 @@ export class StatefulsettplComponent implements OnInit { this.statefulsetTplService.listPage(this.pageState, this.statefulsetId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedStatefulsets = data.list; @@ -100,7 +100,7 @@ export class StatefulsettplComponent implements OnInit { } deleteStatefulset(tpl: StatefulsetTemplate) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集模版确认', '你确认删除状态副本集模版 ' + tpl.name + ' ？', tpl.id, diff --git a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts index 2b680c088..9c98d5324 100644 --- a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts @@ -20,7 +20,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { statefulsetTpls: StatefulsetTemplate[]; pageState: PageState = new PageState(); state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -32,7 +32,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.TRASH_STATEFULSET_TPL) { - let id = message.data; + const id = message.data; this.statefulsetTplService.deleteById(id, 0, false) .subscribe( response => { @@ -74,7 +74,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { .listPage(this.pageState, 0) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.statefulsetTpls = data.list; @@ -84,7 +84,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { } deleteStatefulsetTpl(template: StatefulsetTemplate) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集模版确认', '你确认永久删除状态副本集模版 ' + template.name + ' ？删除后将不可恢复！', template.id, diff --git a/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts b/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts index b1b2e4fd0..6681ce50e 100644 --- a/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts +++ b/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts @@ -22,11 +22,11 @@ export class CreateEditUserComponent { currentForm: NgForm; user: User = new User(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; - isDisplayValid: boolean = true; - isEmailValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; + isDisplayValid = true; + isEmailValid = true; userTitle: string; actionType: ActionType; @@ -117,14 +117,14 @@ export class CreateEditUserComponent { // Handle the form validation handleNameValidation(): void { - let cont = this.currentForm.controls['user_name']; + const cont = this.currentForm.controls['user_name']; if (cont) { this.isNameValid = cont.valid; } } handleEmailValidation(): void { - let cont = this.currentForm.controls['user_email']; + const cont = this.currentForm.controls['user_email']; if (cont) { this.isEmailValid = cont.valid; } diff --git a/src/frontend/src/app/admin/user/list-user/list-user.component.ts b/src/frontend/src/app/admin/user/list-user/list-user.component.ts index e258340d6..dc3507671 100644 --- a/src/frontend/src/app/admin/user/list-user/list-user.component.ts +++ b/src/frontend/src/app/admin/user/list-user/list-user.component.ts @@ -18,7 +18,7 @@ export class ListUserComponent implements OnInit { @Input() users: User[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts b/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts index 086e71bf0..7e3495f2e 100644 --- a/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts +++ b/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts @@ -18,9 +18,9 @@ export class ResetPasswordComponent { currentForm: NgForm; user: User = new User(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; userTitle: string; @@ -54,7 +54,7 @@ export class ResetPasswordComponent { this.isSubmitOnGoing = false; return; } - if (this.user.password == '') { + if (this.user.password === '') { this.alertMsg = '密码不能为空！'; this.isSubmitOnGoing = false; return; diff --git a/src/frontend/src/app/admin/user/user.component.spec.ts b/src/frontend/src/app/admin/user/user.component.spec.ts index caadda6e4..31d433627 100644 --- a/src/frontend/src/app/admin/user/user.component.spec.ts +++ b/src/frontend/src/app/admin/user/user.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { UserComponent } from './user.component'; describe('UserComponent', () => { - let component: UserComponent; - let fixture: ComponentFixture; + const component: UserComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/admin/user/user.component.ts b/src/frontend/src/app/admin/user/user.component.ts index 8e640b6a3..26879813d 100644 --- a/src/frontend/src/app/admin/user/user.component.ts +++ b/src/frontend/src/app/admin/user/user.component.ts @@ -71,7 +71,7 @@ export class UserComponent implements OnInit { this.userService.listUser(this.pageState) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedUsers = data.list; diff --git a/src/frontend/src/app/app.module.ts b/src/frontend/src/app/app.module.ts index 9cbee59ff..e27c63ebf 100644 --- a/src/frontend/src/app/app.module.ts +++ b/src/frontend/src/app/app.module.ts @@ -24,7 +24,7 @@ export function initUser(authService: AuthService, injector: Injector) { return () => authService.retrieveUser().then(() => { }).catch(error => { const router = injector.get(Router); - if (error.status == httpStatusCode.Unauthorized) { + if (error.status === httpStatusCode.Unauthorized) { router.navigate(['sign-in']); } console.log('init current user error.', error); diff --git a/src/frontend/src/app/portal/app-apikey/apikey.component.ts b/src/frontend/src/app/portal/app-apikey/apikey.component.ts index 19fdedb1e..64d6d7721 100644 --- a/src/frontend/src/app/portal/app-apikey/apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/apikey.component.ts @@ -53,7 +53,7 @@ export class AppApiKeyComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.API_KEY) { - let id = message.data; + const id = message.data; this.apiKeyService .deleteById(id, true, null, this.appId) .subscribe( @@ -77,7 +77,7 @@ export class AppApiKeyComponent implements OnInit, OnDestroy { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -117,7 +117,7 @@ export class AppApiKeyComponent implements OnInit, OnDestroy { .listPage(this.pageState, null, this.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedApiKeys = data.list; @@ -137,7 +137,7 @@ export class AppApiKeyComponent implements OnInit, OnDestroy { } deleteApiKey(apiKey: ApiKey) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除APIKey确认', '你确认删除APIKey ' + apiKey.name + ' ？', apiKey.id, diff --git a/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts b/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts index 4d395c404..203972994 100644 --- a/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts @@ -26,8 +26,8 @@ export class CreateEditApiKeyComponent implements OnInit { currentForm: NgForm; apiKey = new ApiKey(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; groups = Array(); title: string; actionType: ActionType; @@ -46,7 +46,7 @@ export class CreateEditApiKeyComponent implements OnInit { this.groupService.listGroup(new PageState({pageSize: 1000}), 2).subscribe( response => { - let data = response.data; + const data = response.data; this.groups = data.list; }, error => { diff --git a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html index 1bf9d1acc..7d738f34d 100644 --- a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html +++ b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html @@ -29,7 +29,7 @@ {{apiKey.name}} {{apiKey.group?.name}} {{apiKey.createTime | date:'yyyy-MM-dd HH:mm:ss'}} - {{apiKey.expireIn == 0 ? "permanent valid" : apiKey.expireIn}} + {{apiKey.expireIn === 0 ? "permanent valid" : apiKey.expireIn}} {{apiKey.user}} {{apiKey.description}} diff --git a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts index a8bcbb31c..637355dac 100644 --- a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts @@ -17,7 +17,7 @@ export class ListApiKeyComponent implements OnInit { @Input() apiKeys: ApiKey[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/portal/app-user/app-user.component.ts b/src/frontend/src/app/portal/app-user/app-user.component.ts index 0203ba0f3..461426eef 100644 --- a/src/frontend/src/app/portal/app-user/app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/app-user.component.ts @@ -52,7 +52,7 @@ export class AppUserComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.APP_USER) { - let appUser = message.data; + const appUser = message.data; this.appUserService.deleteById(appUser.id, appUser.app.id) .subscribe( response => { @@ -89,7 +89,7 @@ export class AppUserComponent implements OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -120,7 +120,7 @@ export class AppUserComponent implements OnInit { this.appUserService.list(this.pageState, this.listType, this.resourceId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.changedAppUsers = data.list; @@ -142,7 +142,7 @@ export class AppUserComponent implements OnInit { } deleteAppUser(appUser: AppUser) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '你确认删除 ' + this.componentName + appUser.user.name + ' ？', appUser, diff --git a/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts b/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts index 60a4de945..a4806191d 100644 --- a/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts @@ -28,9 +28,9 @@ export class CreateEditAppUserComponent { currentForm: NgForm; appUser: AppUser; - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; allGroups: Array; mapGroups: Map = new Map(); @@ -63,7 +63,7 @@ export class CreateEditAppUserComponent { this.groupService.listGroup(new PageState({pageSize: 500}), groupType[0].id).subscribe( response => { this.allGroups = response.data.list; - for (let x in this.allGroups) { + for (const x in this.allGroups) { this.mapGroups.set(this.allGroups[x].id.toString(), this.allGroups[x]); } }, @@ -82,7 +82,7 @@ export class CreateEditAppUserComponent { this.appUser = status.data; // 编辑用户时，需要调整allGroup与selectGroup内容 for (let key in this.allGroups) { - for (let index in this.appUser.groups) { + for (const index in this.appUser.groups) { const source = this.allGroups[key]; const detail = this.appUser.groups[index]; if (JSON.stringify(source) === JSON.stringify(detail)) { @@ -135,7 +135,7 @@ export class CreateEditAppUserComponent { } this.appUser.groups = new Array(); this.isSubmitOnGoing = true; - for (let k in this.selectGroups) { + for (const k in this.selectGroups) { this.appUser.groups.push(this.mapGroups.get(this.selectGroups[k])); } switch (this.actionType) { diff --git a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts index aecb51fd5..101848bee 100644 --- a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts @@ -15,7 +15,7 @@ export class ListAppUserComponent implements OnInit { @Input() listType: string; @Input() appUsers: AppUser[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: State; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts b/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts index 6b8f2c2a6..05b48b70d 100644 --- a/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts +++ b/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts @@ -54,7 +54,7 @@ export class AppWebHookComponent implements OnInit { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.WEBHOOK) { - let webHook = message.data; + const webHook = message.data; this.webHookService.delete(webHook) .subscribe( response => { @@ -76,7 +76,7 @@ export class AppWebHookComponent implements OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -112,7 +112,7 @@ export class AppWebHookComponent implements OnInit { this.webHookService.query(this.pageState, 1, this.contextService.appId) .subscribe( response => { - let data = response.data; + const data = response.data; this.pageState.page.totalPage = data.totalPage; this.pageState.page.totalCount = data.totalCount; this.webHooks = data.list; @@ -128,7 +128,7 @@ export class AppWebHookComponent implements OnInit { } deleteWebHook(webHook: WebHook) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.resourceLabel + '确认', '你确认删除 ' + this.resourceLabel + ':' + webHook.name + '?', webHook, diff --git a/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts b/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts index 631b44c95..2af3dc7e5 100644 --- a/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts +++ b/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts @@ -133,7 +133,7 @@ export class CreateEditAppWebHookComponent { } validateName(): boolean { - let ctl = this.currentForm.controls['webhook-name']; + const ctl = this.currentForm.controls['webhook-name']; if (ctl) { return ctl.valid; } @@ -141,7 +141,7 @@ export class CreateEditAppWebHookComponent { } validateUrl(): boolean { - let ctl = this.currentForm.controls['webhook-url']; + const ctl = this.currentForm.controls['webhook-url']; if (ctl) { return ctl.valid; } diff --git a/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.ts b/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.ts index d2ca22334..f162a3fa7 100644 --- a/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.ts +++ b/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.ts @@ -14,7 +14,7 @@ export class ListAppWebHookComponent implements OnInit { @Input() showState: object; @Input() webHooks: WebHook[]; @Input() page: Page; - currentPage: number = 1; + currentPage = 1; state: ClrDatagridStateInterface; @Output() paginate = new EventEmitter(); diff --git a/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts b/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts index dc8b4b786..46c9fd409 100644 --- a/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts +++ b/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts @@ -24,9 +24,9 @@ export class CreateEditAppComponent { currentForm: NgForm; app: App = new App(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; appTitle: string; actionType: ActionType; @@ -41,7 +41,7 @@ export class CreateEditAppComponent { if (!this.cacheService.currentNamespace) { return; } - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; this.createAppOpened = true; if (id) { this.actionType = ActionType.EDIT; @@ -118,7 +118,7 @@ export class CreateEditAppComponent { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['app_name']; + const cont = this.currentForm.controls['app_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts b/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts index 7a41a996f..036d2a824 100644 --- a/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts +++ b/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts @@ -71,14 +71,14 @@ export class DetailAppComponent implements OnInit, OnDestroy { ngOnInit(): void { this.initRedDot(); this.appId = this.route.parent.snapshot.params['id']; - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; this.appService.getById(this.appId, namespaceId).subscribe(response => { this.app = response.data; this.namespaceClient.getResourceUsage(namespaceId, response.data.name).subscribe( response => { this.resources = response.data; this.clusterList = Object.keys(this.resources).map(item => { - let a = new Cluster(); + const a = new Cluster(); a['cluster'] = item; a['resource'] = this.resources[item]; return a; @@ -124,7 +124,7 @@ export class DetailAppComponent implements OnInit, OnDestroy { // 这个组件需要的红点判断列表 const redList = ['detailShowCluster']; if (this.storage.get('red-dot')) { - let redDot = JSON.parse(this.storage.get('red-dot')); + const redDot = JSON.parse(this.storage.get('red-dot')); redList.forEach(item => { if (redDot[item]) { this.redDot[item] = false; @@ -141,13 +141,13 @@ export class DetailAppComponent implements OnInit, OnDestroy { setRedDot(value: string) { if (this.storage.get('red-dot')) { - let redDot = JSON.parse(this.storage.get('red-dot')); + const redDot = JSON.parse(this.storage.get('red-dot')); if (!redDot[value]) { redDot[value] = true; this.storage.save('red-dot', JSON.stringify(redDot)); } } else { - let redDot = new RedDot(); + const redDot = new RedDot(); redDot[value] = true; this.storage.save('red-dot', JSON.stringify(redDot)); } diff --git a/src/frontend/src/app/portal/app/list-cluster/list-cluster.component.ts b/src/frontend/src/app/portal/app/list-cluster/list-cluster.component.ts index fbe90d014..0525d02ac 100644 --- a/src/frontend/src/app/portal/app/list-cluster/list-cluster.component.ts +++ b/src/frontend/src/app/portal/app/list-cluster/list-cluster.component.ts @@ -14,7 +14,7 @@ export class ListClusterComponent { constructor() { } - modalOpened: boolean = false; + modalOpened = false; open() { this.modalOpened = true; diff --git a/src/frontend/src/app/portal/autoscale/autoscale.component.spec.ts b/src/frontend/src/app/portal/autoscale/autoscale.component.spec.ts index 0c5741184..586f466cd 100644 --- a/src/frontend/src/app/portal/autoscale/autoscale.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/autoscale.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AutoscaleComponent } from './autoscale.component'; describe('AutoscaleComponent', () => { - let component: AutoscaleComponent; - let fixture: ComponentFixture; + const component: AutoscaleComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts b/src/frontend/src/app/portal/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts index 1f160e60f..588fbd38e 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CreateEditAutoscaleComponent } from './create-edit-autoscale.component'; describe('CreateEditAutoscaleComponent', () => { - let component: CreateEditAutoscaleComponent; - let fixture: ComponentFixture; + const component: CreateEditAutoscaleComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts index 66df71de4..69fd04e7e 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CreateEditAutoscaletplComponent } from './create-edit-autoscaletpl.component'; describe('CreateEditAutoscaletplComponent', () => { - let component: CreateEditAutoscaletplComponent; - let fixture: ComponentFixture; + const component: CreateEditAutoscaletplComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.spec.ts b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.spec.ts index 4fb3fc471..ca33fd592 100644 --- a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ListAutoscaleComponent } from './list-autoscale.component'; describe('ListAutoscaleComponent', () => { - let component: ListAutoscaleComponent; - let fixture: ComponentFixture; + const component: ListAutoscaleComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/autoscale/publish-tpl/publish-tpl.component.spec.ts b/src/frontend/src/app/portal/autoscale/publish-tpl/publish-tpl.component.spec.ts index f601f3a60..97906a4c4 100644 --- a/src/frontend/src/app/portal/autoscale/publish-tpl/publish-tpl.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/publish-tpl/publish-tpl.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PublishTplComponent } from './publish-tpl.component'; describe('PublishTplComponent', () => { - let component: PublishTplComponent; - let fixture: ComponentFixture; + const component: PublishTplComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/autoscale/status/status.component.spec.ts b/src/frontend/src/app/portal/autoscale/status/status.component.spec.ts index ddf4f677e..a50aa83ae 100644 --- a/src/frontend/src/app/portal/autoscale/status/status.component.spec.ts +++ b/src/frontend/src/app/portal/autoscale/status/status.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { StatusComponent } from './status.component'; describe('StatusComponent', () => { - let component: StatusComponent; - let fixture: ComponentFixture; + const component: StatusComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/base/base.component.ts b/src/frontend/src/app/portal/base/base.component.ts index ac479b918..f9adf72f3 100644 --- a/src/frontend/src/app/portal/base/base.component.ts +++ b/src/frontend/src/app/portal/base/base.component.ts @@ -22,11 +22,11 @@ export class BaseComponent { private router: Router, private route: ActivatedRoute) { this.appId = this.route.snapshot.params['id']; - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; this.appService.getById(this.appId, namespaceId).subscribe( response => { - let wayneBetaUrl = this.authService.config['betaUrl']; - let app: App = response.data; + const wayneBetaUrl = this.authService.config['betaUrl']; + const app: App = response.data; // 缓存app信息到 appService 中 this.appService.app = response.data; if (this.appBetaMode(app.metaData) && wayneBetaUrl && window.location.origin != wayneBetaUrl) { @@ -34,7 +34,7 @@ export class BaseComponent { return; } // 为了防止本地开发时跳转，项目不是beta模式并且在beta域名下，跳转到正式环境 - if (!this.appBetaMode(app.metaData) && window.location.origin == wayneBetaUrl) { + if (!this.appBetaMode(app.metaData) && window.location.origin === wayneBetaUrl) { window.location.href = `${this.authService.config['appUrl']}${this.router.url}`; return; } @@ -56,8 +56,8 @@ export class BaseComponent { appBetaMode(metaData: string) { if (metaData) { - let meta = JSON.parse(metaData); - if (meta.mode == 'beta') { + const meta = JSON.parse(metaData); + if (meta.mode === 'beta') { return true; } } diff --git a/src/frontend/src/app/portal/common/publish-history/publish-history.service.ts b/src/frontend/src/app/portal/common/publish-history/publish-history.service.ts index 6138a5fe2..c401da691 100644 --- a/src/frontend/src/app/portal/common/publish-history/publish-history.service.ts +++ b/src/frontend/src/app/portal/common/publish-history/publish-history.service.ts @@ -11,7 +11,7 @@ export class PublishHistoryService { publishHistory$ = this.history.asObservable(); openModal(type: PublishType, resourceId: number) { - let publishHistory = new PublishHistory(); + const publishHistory = new PublishHistory(); publishHistory.type = type; publishHistory.resourceId = resourceId; this.history.next(publishHistory); diff --git a/src/frontend/src/app/portal/configmap/configmap.component.ts b/src/frontend/src/app/portal/configmap/configmap.component.ts index e3becbe7b..722d10ace 100644 --- a/src/frontend/src/app/portal/configmap/configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/configmap.component.ts @@ -55,7 +55,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { createEdit: CreateEditConfigMapComponent; configMapId: number; pageState: PageState = new PageState(); - isOnline: boolean = false; + isOnline = false; configMaps: ConfigMap[]; configMapTpls: ConfigMapTpl[]; app: App; @@ -84,13 +84,13 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { - if (over) this.tabChange(); + if (over) { this.tabChange(); } }); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CONFIGMAP) { - let configMapId = message.data; + const configMapId = message.data; this.configMapService.deleteById(configMapId, this.app.id) .subscribe( response => { @@ -118,7 +118,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -139,11 +139,11 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.configMapService.updateOrder(this.app.id, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -168,7 +168,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -184,14 +184,14 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { syncStatus(): void { if (this.configMapTpls && this.configMapTpls.length > 0) { for (let i = 0; i < this.configMapTpls.length; i++) { - let tpl = this.configMapTpls[i]; + const tpl = this.configMapTpls[i]; if (tpl.status && tpl.status.length > 0) { for (let j = 0; j < tpl.status.length; j++) { - let status = tpl.status[j]; - if (status.errNum > 2) continue; + const status = tpl.status[j]; + if (status.errNum > 2) { continue; } this.configMapClient.get(this.app.id, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - let code = response.statusCode | response.status; + const code = response.statusCode | response.status; if (code === httpStatusCode.NoContent) { this.configMapTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -235,8 +235,8 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { } initConfigMap(refreshTpl?: boolean) { - let appId = parseInt(this.route.parent.snapshot.params['id']); - let namespaceId = this.cacheService.namespaceId; + const appId = parseInt(this.route.parent.snapshot.params['id']); + const namespaceId = this.cacheService.namespaceId; this.configMapId = parseInt(this.route.snapshot.params['configMapId']); Observable.combineLatest( this.configMapService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', appId + ''), @@ -262,8 +262,8 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { if (!configMapId) { return this.configMaps[0].id; } - for (let c of this.configMaps) { - if (configMapId == c.id) { + for (const c of this.configMaps) { + if (configMapId === c.id) { return configMapId; } } @@ -314,11 +314,11 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { this.publishService.listStatus(PublishType.CONFIGMAP, this.configMapId) ).subscribe( response => { - let status = response[1].data; + const status = response[1].data; this.publishStatus = status; - let tplStatusMap = {}; + const tplStatusMap = {}; if (status && status.length > 0) { - for (let state of status) { + for (const state of status) { if (!tplStatusMap[state.templateId]) { tplStatusMap[state.templateId] = Array(); } @@ -328,7 +328,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { } this.tplStatusMap = tplStatusMap; - let tpls = response[0].data; + const tpls = response[0].data; this.pageState.page.totalPage = tpls.totalPage; this.pageState.page.totalCount = tpls.totalCount; this.buildTplList(tpls.list); @@ -341,11 +341,11 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { buildTplList(configMapTpls: ConfigMapTpl[]) { if (configMapTpls) { - for (let configMapTpl of configMapTpls) { - let metaData = configMapTpl.metaData ? configMapTpl.metaData : '{}'; + for (const configMapTpl of configMapTpls) { + const metaData = configMapTpl.metaData ? configMapTpl.metaData : '{}'; configMapTpl.clusters = JSON.parse(metaData).clusters; - let publishStatus = this.tplStatusMap[configMapTpl.id]; + const publishStatus = this.tplStatusMap[configMapTpl.id]; if (publishStatus && publishStatus.length > 0) { configMapTpl.status = publishStatus; } @@ -374,7 +374,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线配置集无法删除，请先下线配置集！'); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除配置集确认', '是否确认删除配置集?', this.configMapId, diff --git a/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts b/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts index 4004f7f85..4d4dd8e50 100644 --- a/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts @@ -26,9 +26,9 @@ export class CreateEditConfigMapComponent implements OnInit { componentName = '配置集'; configMap: ConfigMap = new ConfigMap(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; actionType: ActionType; @@ -126,7 +126,7 @@ export class CreateEditConfigMapComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html index 2d35a266d..6b71c0b50 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html @@ -46,9 +46,9 @@
- {{status.cluster}}  - +
diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts index 8819f8ac2..94cbe3b16 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts @@ -33,7 +33,7 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { @Input() configMapTpls: ConfigMapTpl[]; @Input() page: Page; state: State; - currentPage: number = 1; + currentPage = 1; @Output() paginate = new EventEmitter(); @Output() configmapTab = new EventEmitter(); @@ -53,7 +53,7 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CONFIGMAP_TPL) { - let tpl = message.data; + const tpl = message.data; this.configMapTplService.deleteById(tpl.id, this.app.id) .subscribe( response => { @@ -109,7 +109,7 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { } deleteConfigMapTpl(tpl: ConfigMapTpl): void { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '模版确认', `你确认删除` + this.componentName + `${tpl.name}？`, tpl, diff --git a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts index eee6302bc..18fbfe757 100644 --- a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts @@ -21,14 +21,14 @@ import { ActivatedRoute } from '@angular/router'; }) export class PublishConfigMapTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; configMapTpl: ConfigMapTpl; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; forceOffline: boolean; actionType: ResourcesActionType; @@ -49,26 +49,26 @@ export class PublishConfigMapTplComponent { this.clusters = Array(); this.configMapTpl = configMapTpl; this.forceOffline = false; - if (actionType == ResourcesActionType.PUBLISH) { + if (actionType === ResourcesActionType.PUBLISH) { this.title = '发布配置集[' + configMapTpl.name + ']'; if (!configMapTpl.metaData) { this.messageHandlerService.warning('请先选择可发布集群'); return; } this.modalOpened = true; - let metaData = JSON.parse(configMapTpl.metaData); - for (let cluster of metaData.clusters) { + const metaData = JSON.parse(configMapTpl.metaData); + for (const cluster of metaData.clusters) { if (this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[cluster]) { - let c = new Cluster(); + const c = new Cluster(); c.name = cluster; this.clusters.push(c); } } - } else if (actionType == ResourcesActionType.OFFLINE) { + } else if (actionType === ResourcesActionType.OFFLINE) { this.modalOpened = true; this.title = '下线配置集[' + configMapTpl.name + ']'; - for (let state of configMapTpl.status) { - let c = new Cluster(); + for (const state of configMapTpl.status) { + const c = new Cluster(); c.name = state.cluster; this.clusters.push(c); } @@ -83,8 +83,8 @@ export class PublishConfigMapTplComponent { getStatusByCluster(status: PublishStatus[], cluster: string): PublishStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -144,7 +144,7 @@ export class PublishConfigMapTplComponent { } deploy(cluster: Cluster) { - let kubeConfigMap: KubeConfigMap = JSON.parse(this.configMapTpl.template); + const kubeConfigMap: KubeConfigMap = JSON.parse(this.configMapTpl.template); kubeConfigMap.metadata.namespace = this.cacheService.kubeNamespace; this.configMapClient.deploy( this.appId, diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts index a75579adf..020930b25 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts @@ -28,9 +28,9 @@ export class CreateEditCronjobComponent implements OnInit { clusterMetas: {}; title: string; cronjob: Cronjob = new Cronjob(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; actionType: ActionType; modalOpened: boolean; app: App; @@ -52,7 +52,7 @@ export class CreateEditCronjobComponent implements OnInit { this.clusters = clusters; this.clusterMetas = {}; if (this.clusters && this.clusters.length > 0) { - for (let clu of this.clusters) { + for (const clu of this.clusters) { this.clusterMetas[clu.name] = new ClusterMeta(false); } } @@ -119,10 +119,10 @@ export class CreateEditCronjobComponent implements OnInit { this.isSubmitOnGoing = true; this.cronjob.appId = this.app.id; - let replicas = {}; - let suspends = {}; - for (let clu of this.clusters) { - let clusterMeta = this.clusterMetas[clu.name]; + const replicas = {}; + const suspends = {}; + for (const clu of this.clusters) { + const clusterMeta = this.clusterMetas[clu.name]; if (clusterMeta && clusterMeta.checked && clusterMeta.value) { replicas[clu.name] = clusterMeta.value; suspends[clu.name] = false; @@ -131,7 +131,7 @@ export class CreateEditCronjobComponent implements OnInit { if (!this.cronjob.metaData) { this.cronjob.metaData = '{}'; } - let metaData = JSON.parse(this.cronjob.metaData); + const metaData = JSON.parse(this.cronjob.metaData); metaData.replicas = replicas; metaData.suspends = suspends; metaData.resources = this.resourceLimitComponent.getValue(); @@ -186,8 +186,8 @@ export class CreateEditCronjobComponent implements OnInit { isClusterValid(): boolean { if (this.clusters) { - for (let clu of this.clusters) { - let clusterMeta = this.clusterMetas[clu.name]; + for (const clu of this.clusters) { + const clusterMeta = this.clusterMetas[clu.name]; if (clusterMeta && clusterMeta.checked && clusterMeta.value) { return true; } @@ -197,7 +197,7 @@ export class CreateEditCronjobComponent implements OnInit { } handleValidation(): void { - let cont = this.currentForm.controls['cronjob_name']; + const cont = this.currentForm.controls['cronjob_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/cronjob/cronjob.component.ts b/src/frontend/src/app/portal/cronjob/cronjob.component.ts index f623f188a..ff088be43 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.component.ts @@ -63,7 +63,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { createEditCronjob: CreateEditCronjobComponent; pageState: PageState = new PageState(); - isOnline: boolean = false; + isOnline = false; jobPageState: PageState = new PageState(); changedJobs: Job[]; @@ -105,13 +105,13 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { - if (over) this.tabChange(); + if (over) { this.tabChange(); } }); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CRONJOB) { - let cronjobId = message.data; + const cronjobId = message.data; this.cronjobService.deleteById(cronjobId, this.appId) .subscribe( response => { @@ -139,7 +139,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -166,11 +166,11 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.cronjobService.updateOrder(this.appId, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -195,7 +195,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -209,16 +209,16 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { syncStatus() { if (this.changedCronjobTpls && this.changedCronjobTpls.length > 0) { for (let i = 0; i < this.changedCronjobTpls.length; i++) { - let tpl = this.changedCronjobTpls[i]; + const tpl = this.changedCronjobTpls[i]; if (tpl.status && tpl.status.length > 0) { // 定时自动刷新获取Job列表 this.retrieveJob(); for (let j = 0; j < tpl.status.length; j++) { - let status = tpl.status[j]; - if (status.errNum > 2) continue; + const status = tpl.status[j]; + if (status.errNum > 2) { continue; } this.cronjobClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - let code = response.statusCode | response.status; + const code = response.statusCode | response.status; if (code === httpStatusCode.NoContent) { this.changedCronjobTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -275,7 +275,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { initCronjob(refreshTpl?: boolean) { this.appId = parseInt(this.route.parent.snapshot.params['id']); - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; this.cronjobId = parseInt(this.route.snapshot.params['cronjobId']); Observable.combineLatest( this.clusterService.getNames(), @@ -315,8 +315,8 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (!cronjobId) { return this.cronjobs[0].id; } - for (let cronjob of this.cronjobs) { - if (cronjobId == cronjob.id) { + for (const cronjob of this.cronjobs) { + if (cronjobId === cronjob.id) { return cronjobId; } } @@ -331,8 +331,8 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (!cronjobId) { return this.cronjobs[0].name; } - for (let cronjob of this.cronjobs) { - if (cronjobId == cronjob.id) { + for (const cronjob of this.cronjobs) { + if (cronjobId === cronjob.id) { return cronjob.name; } } @@ -388,7 +388,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线' + this.componentName + '无法删除，请先下线' + this.componentName); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除' + this.componentName + '确认', '是否确认删除' + this.componentName, this.cronjobId, @@ -417,9 +417,9 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { this.cronjobService.getById(this.cronjobId, this.appId), ).subscribe( response => { - let status = response[1].data; + const status = response[1].data; this.publishStatus = status; - let tpls = response[0].data; + const tpls = response[0].data; this.currentCronjob = response[2].data; this.pageState.page.totalPage = tpls.totalPage; this.pageState.page.totalCount = tpls.totalCount; @@ -446,7 +446,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { this.jobClient.listAllClusterByCronjobName(this.appId, this.cacheService.kubeNamespace, this.cronjobName) ).subscribe( response => { - let result = response[0]; + const result = response[0]; if (result == null) { this.jobPageState.page.totalPage = 0; this.jobPageState.page.totalCount = 0; @@ -457,7 +457,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (jobs) { this.jobPageState.page.totalPage = Math.ceil(jobs.length / this.jobPageState.page.pageSize); this.jobPageState.page.totalCount = jobs.length; - for (let x in jobs) { + for (const x in jobs) { // conditions有可能不存在 if (jobs[x]['kubeJob']['status']['conditions'] && jobs[x]['kubeJob']['status']['conditions'][0]['type']) { @@ -483,9 +483,9 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (!cronjobTpls) { return cronjobTpls; } - let tplStatusMap = {}; + const tplStatusMap = {}; if (status && status.length > 0) { - for (let state of status) { + for (const state of status) { if (!tplStatusMap[state.templateId]) { tplStatusMap[state.templateId] = Array(); } @@ -493,20 +493,20 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } } - let results = Array(); - for (let cronjobTpl of cronjobTpls) { + const results = Array(); + for (const cronjobTpl of cronjobTpls) { let kubeCronjob = new KubeCronJob(); kubeCronjob = JSON.parse(cronjobTpl.template); // build container info - let containers = kubeCronjob.spec.jobTemplate.spec.template.spec.containers; + const containers = kubeCronjob.spec.jobTemplate.spec.template.spec.containers; if (containers.length > 0) { - let containerVersions = Array(); - for (let con of containers) { + const containerVersions = Array(); + for (const con of containers) { containerVersions.push(con.image); } cronjobTpl.containerVersions = containerVersions; - let publishStatus = tplStatusMap[cronjobTpl.id]; + const publishStatus = tplStatusMap[cronjobTpl.id]; if (publishStatus && publishStatus.length > 0) { cronjobTpl.status = publishStatus; } diff --git a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html index b11169705..005127340 100644 --- a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html +++ b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html @@ -50,9 +50,9 @@
- {{status.cluster}}  - +
diff --git a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts index fb03b4d47..95930a07b 100644 --- a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts @@ -38,7 +38,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { publishCronjobTpl: PublishCronjobTplComponent; state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; componentName = '计划任务'; @@ -58,7 +58,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.CRONJOB_TPL) { - let tplId = message.data; + const tplId = message.data; this.cronjobTplService.deleteById(tplId, this.appId) .subscribe( response => { @@ -150,7 +150,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { restartCronjob(tpl: CronjobTpl) { this.cronjobService.getById(tpl.cronjobId, this.appId).subscribe( status => { - let cronjob = status.data; + const cronjob = status.data; this.publishCronjobTpl.newPublishTpl(cronjob, tpl, ResourcesActionType.RESTART); }, error => { @@ -161,7 +161,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { offlineCronjobTpl(tpl: CronjobTpl) { this.cronjobService.getById(tpl.cronjobId, this.appId).subscribe( status => { - let cronjob = status.data; + const cronjob = status.data; this.publishCronjobTpl.newPublishTpl(cronjob, tpl, ResourcesActionType.OFFLINE); }, error => { diff --git a/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts b/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts index 505612fd8..44de0a2c7 100644 --- a/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts @@ -14,12 +14,12 @@ import { SortOrder } from '@clr/angular'; }) export class ListEventComponent implements OnInit { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts index ca3b12286..4346f7f85 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts @@ -24,7 +24,7 @@ export class ListJobComponent implements OnInit, OnDestroy { @Input() page: Page; @Input() currentCronjobName: string; @Output() paginate = new EventEmitter(); - _pageSize: number = 10; + _pageSize = 10; @ViewChild(ListPodComponent) listPodComponent: ListPodComponent; @ViewChild(ListEventComponent) diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts index e15956aa6..46ea4ffe8 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts @@ -25,12 +25,12 @@ import { KubeJob } from '../../../shared/model/v1/kubernetes/job'; }) export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); currentCluster: string; @@ -55,7 +55,7 @@ export class ListPodComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.POD) { - let pod: Pod = message.data; + const pod: Pod = message.data; this.podClient .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) .subscribe( @@ -101,7 +101,7 @@ export class ListPodComponent implements OnInit, OnDestroy { } deletePod(pod: Pod) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除实例确认', `是否确认删除实例 ${pod.name}`, pod, @@ -112,14 +112,14 @@ export class ListPodComponent implements OnInit, OnDestroy { } enterContainer(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts index 055c88d4a..9b8d54562 100644 --- a/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts @@ -20,7 +20,7 @@ import { ActivatedRoute } from '@angular/router'; }) export class PublishCronjobTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; @@ -29,7 +29,7 @@ export class PublishCronjobTplComponent { cronjobTpl: CronjobTpl; clusterMetas = {}; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; actionType: ResourcesActionType; forceOffline: boolean; @@ -48,7 +48,7 @@ export class PublishCronjobTplComponent { newPublishTpl(cronjob: Cronjob, cronjobTpl: CronjobTpl, actionType: ResourcesActionType) { - let replicas = this.getReplicas(cronjob); + const replicas = this.getReplicas(cronjob); this.actionType = actionType; this.forceOffline = false; if (replicas != null) { @@ -58,7 +58,7 @@ export class PublishCronjobTplComponent { this.cronjobTpl = cronjobTpl; this.clusters = Array(); this.clusterMetas = {}; - if (actionType == ResourcesActionType.OFFLINE || actionType == ResourcesActionType.UPDATE) { + if (actionType === ResourcesActionType.OFFLINE || actionType === ResourcesActionType.UPDATE) { cronjobTpl.status.map(state => { this.clusters.push(state.cluster); this.clusterMetas[state.cluster] = new ClusterMeta(false); @@ -66,7 +66,7 @@ export class PublishCronjobTplComponent { } else if (actionType === ResourcesActionType.PUBLISH) { Object.getOwnPropertyNames(replicas).map(key => { if (this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[key]) { - let clusterMeta = new ClusterMeta(false); + const clusterMeta = new ClusterMeta(false); // 发布数量固定为1 // clusterMeta.value = replicas[key]; clusterMeta.value = 1; @@ -98,8 +98,8 @@ export class PublishCronjobTplComponent { getStatusByCluster(status: CronjobStatus[], cluster: string): CronjobStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -153,7 +153,7 @@ export class PublishCronjobTplComponent { offline() { Object.getOwnPropertyNames(this.clusterMetas).map(cluster => { if (this.clusterMetas[cluster].checked) { - const state = this.getStatusByCluster(this.cronjobTpl.status, cluster); + let state = this.getStatusByCluster(this.cronjobTpl.status, cluster); this.cronjobClient.deleteByName(this.appId, cluster, this.cacheService.kubeNamespace, this.cronjob.name).subscribe( response => { this.deletePublishStatus(state.id); @@ -203,7 +203,7 @@ export class PublishCronjobTplComponent { } deploy() { - let metaData = JSON.parse(this.cronjob.metaData); + const metaData = JSON.parse(this.cronjob.metaData); Object.getOwnPropertyNames(this.clusterMetas).map(cluster => { metaData['replicas'][cluster] = this.clusterMetas[cluster].value; }); diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts index 99878633c..7b63097f3 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts @@ -29,9 +29,9 @@ export class CreateEditDaemonSetComponent implements OnInit { resourceLimitComponent: ResourceLimitComponent; daemonSet = new DaemonSet(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; actionType: ActionType; app: App; @@ -52,7 +52,7 @@ export class CreateEditDaemonSetComponent implements OnInit { this.app = app; this.clusters = Array(); if (clusters && clusters.length > 0) { - for (let c of clusters) { + for (const c of clusters) { c.checked = false; this.clusters.push(c); } @@ -62,16 +62,16 @@ export class CreateEditDaemonSetComponent implements OnInit { this.title = 'DAEMONSET.EDIT'; this.daemonSetService.getById(id, this.app.id).subscribe( status => { - let data = status.data; + const data = status.data; this.daemonSet = data; if (!data.metaData) { data.metaData = '{}'; } - let metaData = JSON.parse(data.metaData); + const metaData = JSON.parse(data.metaData); if (metaData['clusters']) { - for (let cluster of metaData['clusters']) { + for (const cluster of metaData['clusters']) { for (let i = 0; i < this.clusters.length; i++) { - if (cluster == this.clusters[i].name) { + if (cluster === this.clusters[i].name) { this.clusters[i].checked = true; } } @@ -169,7 +169,7 @@ export class CreateEditDaemonSetComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/daemonset/daemonset.component.ts b/src/frontend/src/app/portal/daemonset/daemonset.component.ts index 962746d29..1e54f51ef 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.component.ts @@ -59,7 +59,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { pageState: PageState = new PageState(); changedDaemonSetTpls: DaemonSetTemplate[]; - isOnline: boolean = false; + isOnline = false; daemonSetId: number; app: App; appId: number; @@ -91,13 +91,13 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { - if (over) this.tabChange(); + if (over) { this.tabChange(); } }); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DAEMONSET) { - let daemonSetId = message.data; + const daemonSetId = message.data; this.daemonSetService.deleteById(daemonSetId, this.appId) .subscribe( response => { @@ -125,7 +125,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -152,11 +152,11 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.daemonSetService.updateOrder(this.appId, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -181,7 +181,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -195,27 +195,27 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { syncStatus() { if (this.changedDaemonSetTpls && this.changedDaemonSetTpls.length > 0) { for (let i = 0; i < this.changedDaemonSetTpls.length; i++) { - let tpl = this.changedDaemonSetTpls[i]; + const tpl = this.changedDaemonSetTpls[i]; if (tpl.status && tpl.status.length > 0) { for (let j = 0; j < tpl.status.length; j++) { - let status = tpl.status[j]; - if (status.errNum > 2) continue; + const status = tpl.status[j]; + if (status.errNum > 2) { continue; } this.daemonSetClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - let code = response.statusCode | response.status; + const code = response.statusCode | response.status; if (code === httpStatusCode.NoContent) { this.changedDaemonSetTpls[i].status[j].state = TemplateState.NOT_FOUND; return; } - let podInfo = response.data.pods; + const podInfo = response.data.pods; // 防止切换tab tpls数据发生变化导致报错 if (this.changedDaemonSetTpls && this.changedDaemonSetTpls[i] && this.changedDaemonSetTpls[i].status && this.changedDaemonSetTpls[i].status[j]) { let state = TemplateState.FAILD; - if (podInfo.current == podInfo.desired) { + if (podInfo.current === podInfo.desired) { state = TemplateState.SUCCESS; } this.changedDaemonSetTpls[i].status[j].state = state; @@ -264,7 +264,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { initDaemonSet(refreshTpl?: boolean) { this.appId = parseInt(this.route.parent.snapshot.params['id']); - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; this.daemonSetId = parseInt(this.route.snapshot.params['daemonSetId']); Observable.combineLatest( this.clusterService.getNames(), @@ -276,7 +276,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { this.daemonSets = response[1].data.list.sort((a, b) => a.order - b.order); this.initOrder(this.daemonSets); this.app = response[2].data; - let isRedirectUri = this.redirectUri(); + const isRedirectUri = this.redirectUri(); if (isRedirectUri) { this.navigateUri(); } @@ -301,8 +301,8 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { this.daemonSetId = this.daemonSets[0].id; return true; } - for (let daemon of this.daemonSets) { - if (this.daemonSetId == daemon.id) { + for (const daemon of this.daemonSets) { + if (this.daemonSetId === daemon.id) { return false; } } @@ -360,7 +360,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线守护进程集无法删除，请先下线守护进程集！'); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集确认', '是否确认删除守护进程集', this.daemonSetId, @@ -393,9 +393,9 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { this.publishService.listStatus(PublishType.DAEMONSET, this.daemonSetId) ).subscribe( response => { - let status = response[1].data; + const status = response[1].data; this.publishStatus = status; - let tpls = response[0].data; + const tpls = response[0].data; this.pageState.page.totalPage = tpls.totalPage; this.pageState.page.totalCount = tpls.totalCount; this.changedDaemonSetTpls = this.buildTplList(tpls.list, status); @@ -409,9 +409,9 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { if (!daemonSetTpls) { return daemonSetTpls; } - let tplStatusMap = {}; + const tplStatusMap = {}; if (status && status.length > 0) { - for (let state of status) { + for (const state of status) { if (!tplStatusMap[state.templateId]) { tplStatusMap[state.templateId] = Array(); } @@ -419,19 +419,19 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { } } - let results = Array(); - for (let daemonSetTpl of daemonSetTpls) { + const results = Array(); + for (const daemonSetTpl of daemonSetTpls) { let kubeDaemonSet = new KubeDaemonSet(); kubeDaemonSet = JSON.parse(daemonSetTpl.template); - let containers = kubeDaemonSet.spec.template.spec.containers; + const containers = kubeDaemonSet.spec.template.spec.containers; if (containers.length > 0) { - let containerVersions = Array(); - for (let con of containers) { + const containerVersions = Array(); + for (const con of containers) { containerVersions.push(con.image); } daemonSetTpl.containerVersions = containerVersions; - let publishStatus = tplStatusMap[daemonSetTpl.id]; + const publishStatus = tplStatusMap[daemonSetTpl.id]; if (publishStatus && publishStatus.length > 0) { daemonSetTpl.status = publishStatus; } diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts index f1a39bd9f..b54885a5e 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts @@ -50,7 +50,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { @ViewChild(PublishDaemonSetTplComponent) publishDaemonSetTpl: PublishDaemonSetTplComponent; state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -68,7 +68,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.DAEMONSET_TPL) { - let tplId = message.data; + const tplId = message.data; this.daemonSetTplService.deleteById(tplId, this.appId) .subscribe( response => { @@ -114,7 +114,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { } deleteDaemonSetTpl(tpl: DaemonSetTemplate): void { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除守护进程集模版确认', `你确认删除守护进程集模版${tpl.name}？`, tpl.id, @@ -139,7 +139,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { publishTpl(tpl: DaemonSetTemplate) { this.daemonSetService.getById(tpl.daemonSetId, this.appId).subscribe( status => { - let daemonSet = status.data; + const daemonSet = status.data; this.publishDaemonSetTpl.newPublishTpl(daemonSet, tpl, ResourcesActionType.PUBLISH); }, error => { @@ -150,7 +150,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { offlineDaemonSet(tpl: DaemonSetTemplate) { this.daemonSetService.getById(tpl.daemonSetId, this.appId).subscribe( status => { - let daemonSet = status.data; + const daemonSet = status.data; this.publishDaemonSetTpl.newPublishTpl(daemonSet, tpl, ResourcesActionType.OFFLINE); }, error => { diff --git a/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts b/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts index b4a2c7487..2db9d8cc3 100644 --- a/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts @@ -14,12 +14,12 @@ import { SortOrder } from '@clr/angular'; }) export class ListEventComponent implements OnInit { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts index 8725fe233..57c1a8307 100644 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts @@ -26,19 +26,19 @@ import { Cluster } from '../../../shared/model/v1/cluster'; }) export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); currentCluster: string; daemonSet: string; logSource: string; timer: any; - whetherHotReflash: boolean = true; + whetherHotReflash = true; subscription: Subscription; @@ -60,7 +60,7 @@ export class ListPodComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.POD) { - let pod: Pod = message.data; + const pod: Pod = message.data; this.podClient .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) .subscribe( @@ -89,9 +89,9 @@ export class ListPodComponent implements OnInit, OnDestroy { this.whetherHotReflash = true; this.clusterService.getByName(this.currentCluster).subscribe( response => { - let cluster: Cluster = response.data; + const cluster: Cluster = response.data; if (cluster.metaData) { - let metaData = JSON.parse(cluster.metaData); + const metaData = JSON.parse(cluster.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -129,7 +129,7 @@ export class ListPodComponent implements OnInit, OnDestroy { refresh() { this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, 'daemonSet', this.daemonSet).subscribe( response => { - let pods = response.data; + const pods = response.data; this.inventory.size = pods.length; this.inventory.reset(pods); this.pods = this.inventory.all; @@ -142,7 +142,7 @@ export class ListPodComponent implements OnInit, OnDestroy { } deletePod(pod: Pod) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除实例确认', `是否确认删除实例 ${pod.name}`, pod, @@ -154,16 +154,16 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts index a6b2afe51..214a7fc16 100644 --- a/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts @@ -22,7 +22,7 @@ import { KubeDaemonSet } from '../../../shared/model/v1/kubernetes/daemonset'; }) export class PublishDaemonSetTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; @@ -30,7 +30,7 @@ export class PublishDaemonSetTplComponent { daemonSet: DaemonSet; daemonSetTpl: DaemonSetTemplate; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; forceOffline: boolean; actionType: ResourcesActionType; @@ -53,21 +53,21 @@ export class PublishDaemonSetTplComponent { this.clusters = Array(); this.daemonSetTpl = daemonSetTpl; this.daemonSet = daemonSet; - if (actionType == ResourcesActionType.PUBLISH) { + if (actionType === ResourcesActionType.PUBLISH) { this.title = '发布守护进程集[' + this.daemonSet.name + ']'; if (!daemonSet.metaData) { this.messageHandlerService.warning('请先配置可发布集群'); return; } - let metaData = JSON.parse(daemonSet.metaData); - for (let cluster of metaData.clusters) { + const metaData = JSON.parse(daemonSet.metaData); + for (const cluster of metaData.clusters) { if (this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[cluster]) { this.clusters.push(new Cluster(cluster, false)); } } - } else if (actionType == ResourcesActionType.OFFLINE) { + } else if (actionType === ResourcesActionType.OFFLINE) { this.title = '下线守护进程集[' + this.daemonSet.name + ']'; - for (let state of daemonSetTpl.status) { + for (const state of daemonSetTpl.status) { this.clusters.push(new Cluster(state.cluster, false)); } } @@ -75,8 +75,8 @@ export class PublishDaemonSetTplComponent { getStatusByCluster(status: TemplateStatus[], cluster: string): TemplateStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -140,7 +140,7 @@ export class PublishDaemonSetTplComponent { } deploy() { - let observables = Array(); + const observables = Array(); this.clusters.map(cluster => { if (cluster.checked) { let kubeDaemonSet: KubeDaemonSet = JSON.parse(this.daemonSetTpl.template); diff --git a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html index ee39526d7..b2639e4f6 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html +++ b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html @@ -35,7 +35,7 @@

-
+
- diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index 346c18b5a..dce03e25e 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -140,7 +140,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.pvcTpls[i] && this.pvcTpls[i].status && this.pvcTpls[i].status[j] && - pvc.status.phase == 'Bound') { + pvc.status.phase === 'Bound') { this.pvcTpls[i].status[j].state = TemplateState.SUCCESS; } else { this.pvcTpls[i].status[j].state = TemplateState.FAILD; diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts index eb2a05420..8882909eb 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -59,13 +59,13 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { - if (over) this.tabChange(); + if (over) { this.tabChange(); } }); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM) { - let pvcId = message.data; + const pvcId = message.data; this.pvcService.deleteById(pvcId, this.app.id) .subscribe( response => { @@ -90,9 +90,9 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.appId = parseInt(this.route.parent.snapshot.params['id']); - let namespaceId = this.cacheService.namespaceId; - let pvcId = parseInt(this.route.snapshot.params['pvcId']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); + const namespaceId = this.cacheService.namespaceId; + let pvcId = parseInt(this.route.snapshot.params['pvcId'], 10); Observable.combineLatest( this.pvcService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), @@ -105,13 +105,13 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { pvcId = this.getPvcId(pvcId); if (pvcId) { this.pvcId = pvcId; - if (this.router.url.indexOf('status') == -1) { + if (this.router.url.indexOf('status') === -1) { this.navigateToList(this.app.id, pvcId); } this.publishService.listStatus(PublishType.PERSISTENT_VOLUME_CLAIM, this.pvcId).subscribe( - response => { - this.publishStatus = response.data; + next => { + this.publishStatus = next.data; }, error => { this.messageHandlerService.handleError(error); @@ -134,11 +134,11 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.pvcService.updateOrder(this.app.id, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -163,7 +163,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -189,8 +189,8 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { if (!pvcId) { return this.pvcs[0].id; } - for (let pvc of this.pvcs) { - if (pvcId == pvc.id) { + for (const pvc of this.pvcs) { + if (pvcId === pvc.id) { return pvcId; } } @@ -232,7 +232,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线PVC无法删除，请先下线PVC！'); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除PVC确认', '是否确认删除PVC?', this.pvcId, diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts index 8bf21b8d3..90eedffba 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts @@ -19,14 +19,14 @@ import { ActivatedRoute } from '@angular/router'; }) export class PublishPersistentVolumeClaimTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; pvcTpl: PersistentVolumeClaimTpl; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; forceOffline: boolean; actionType: ResourcesActionType; @@ -47,26 +47,26 @@ export class PublishPersistentVolumeClaimTplComponent { this.clusters = Array(); this.pvcTpl = pvcTpl; this.forceOffline = false; - if (actionType == ResourcesActionType.PUBLISH) { + if (actionType === ResourcesActionType.PUBLISH) { this.title = '发布PVC[' + pvcTpl.name + ']'; if (!pvcTpl.metaData) { this.messageHandlerService.warning('请先选择可发布集群'); return; } this.modalOpened = true; - let metaData = JSON.parse(pvcTpl.metaData); - for (let cluster of metaData.clusters) { + const metaData = JSON.parse(pvcTpl.metaData); + for (const cluster of metaData.clusters) { if (this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[cluster]) { - let c = new Cluster(); + const c = new Cluster(); c.name = cluster; this.clusters.push(c); } } - } else if (actionType == ResourcesActionType.OFFLINE) { + } else if (actionType === ResourcesActionType.OFFLINE) { this.modalOpened = true; this.title = '下线PVC[' + pvcTpl.name + ']'; - for (let state of pvcTpl.status) { - let c = new Cluster(); + for (const state of pvcTpl.status) { + const c = new Cluster(); c.name = state.cluster; this.clusters.push(c); } @@ -76,8 +76,8 @@ export class PublishPersistentVolumeClaimTplComponent { getStatusByCluster(status: PublishStatus[], cluster: string): PublishStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -141,7 +141,7 @@ export class PublishPersistentVolumeClaimTplComponent { } deploy(cluster: Cluster) { - let kubePvc = JSON.parse(this.pvcTpl.template); + const kubePvc = JSON.parse(this.pvcTpl.template); kubePvc.metadata.namespace = this.cacheService.kubeNamespace; this.persistentVolumeClaimClient.deploy( this.appId, diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts index a31171134..b52f68836 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts @@ -53,7 +53,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_SNAPSHOT) { let state = message.data.state; - let name = message.data.name; + const name = message.data.name; this.persistentVolumeClaimRobinClient.deleteSnapshot(this.appId, state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( response => { this.snapshotRefresh(); @@ -68,7 +68,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_SNAPSHOT_ROLLBACK) { let state = message.data.state; - let name = message.data.name; + const name = message.data.name; this.persistentVolumeClaimRobinClient.rollBackSnapshot(this.appId, state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( response => { this.messageHandlerService.showSuccess('回滚快照成功！'); @@ -100,7 +100,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy } snapshotRefresh() { - if (this.state.state == TemplateState.SUCCESS) { + if (this.state.state === TemplateState.SUCCESS) { this.persistentVolumeClaimRobinClient.listSnapshot(this.appId, this.state.cluster, this.state.pvc.metadata.namespace, this.state.pvc.metadata.name).subscribe( response => { this.state.snaps = response.data.snaps; @@ -113,7 +113,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy } deleteSnap(name: string) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除快照确认', `是否确认删除快照${name}?`, {'name': name, 'state': this.state}, @@ -124,7 +124,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy } deleteAllSnap() { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除快照确认', '是否确认删除所有快照，删除之后将无法恢复?', this.state, @@ -135,7 +135,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy } rollbackSnap(name: string) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '回滚快照确认', `是否确认到${name}版本`, {'name': name, 'state': this.state}, diff --git a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts index 51c54cd4b..433ac42ef 100644 --- a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts +++ b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts @@ -22,12 +22,12 @@ export class PodLoggingComponent implements OnInit, OnDestroy { selectedContainer: string; containers: ContainerStatus[]; log: string; - logTails: number = 10; + logTails = 10; resourceName: string; resourceType: string; pods: Pod[]; logSource: string; - isCopied: boolean = false; + isCopied = false; constructor(private route: ActivatedRoute, private router: Router, @@ -46,16 +46,16 @@ export class PodLoggingComponent implements OnInit, OnDestroy { this.appId = parseInt(this.route.snapshot.params['id']); this.cluster = this.route.snapshot.params['cluster']; this.namespace = this.route.snapshot.params['namespace']; - let podName = this.route.snapshot.params['podName']; - let container = this.route.snapshot.params['container']; + const podName = this.route.snapshot.params['podName']; + const container = this.route.snapshot.params['container']; this.nid = this.route.snapshot.params['nid']; this.resourceName = this.route.snapshot.params['resourceName']; this.resourceType = this.route.snapshot.params['resourceType']; this.clusterService.getByName(this.cluster).subscribe( response => { - let cluster: Cluster = response.data; + const cluster: Cluster = response.data; if (cluster.metaData) { - let metaData = JSON.parse(cluster.metaData); + const metaData = JSON.parse(cluster.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -69,9 +69,9 @@ export class PodLoggingComponent implements OnInit, OnDestroy { response => { this.pods = response.data; if (this.pods && this.pods.length > 0) { - let pod = this.getPodByName(podName); + const pod = this.getPodByName(podName); if (!pod) { - let url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -102,8 +102,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { initContainer(container: string) { this.containers = this.selectedPod.containerStatus; - for (let con of this.containers) { - if (container == con.name) { + for (const con of this.containers) { + if (container === con.name) { this.selectedContainer = container; this.containerChange(); return; @@ -120,7 +120,7 @@ export class PodLoggingComponent implements OnInit, OnDestroy { } containerChange() { - let url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); this.refreshLog(); } @@ -139,8 +139,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { getPodByName(podName: string) { if (podName) { - for (let pod of this.pods) { - if (pod.name == podName) { + for (const pod of this.pods) { + if (pod.name === podName) { return pod; } } @@ -153,7 +153,7 @@ export class PodLoggingComponent implements OnInit, OnDestroy { this.containers = this.selectedPod.containerStatus; if (this.containers && this.containers.length > 0) { this.selectedContainer = this.containers[0].name; - let url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } } diff --git a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts index 8bf890c84..0591ccc3a 100644 --- a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts +++ b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts @@ -44,8 +44,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { this.appId = parseInt(this.route.snapshot.params['id']); this.cluster = this.route.snapshot.params['cluster']; this.namespace = this.route.snapshot.params['namespace']; - let podName = this.route.snapshot.params['podName']; - let container = this.route.snapshot.params['container']; + const podName = this.route.snapshot.params['podName']; + const container = this.route.snapshot.params['container']; this.nid = this.route.snapshot.params['nid']; this.resourceName = this.route.snapshot.params['resourceName']; this.resourceType = this.route.snapshot.params['resourceType']; @@ -53,9 +53,9 @@ export class PodTerminalComponent implements OnInit, OnDestroy { response => { this.pods = response.data; if (this.pods && this.pods.length > 0) { - let pod = this.getPodByName(podName); + const pod = this.getPodByName(podName); if (!pod) { - let url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -70,8 +70,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { initContainer(container: string) { this.containers = this.selectedPod.containerStatus; - for (let con of this.containers) { - if (container == con.name) { + for (const con of this.containers) { + if (container === con.name) { this.selectedContainer = container; this.initTernimal(); return; @@ -82,15 +82,15 @@ export class PodTerminalComponent implements OnInit, OnDestroy { } containerChange() { - let url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } getPodByName(podName: string) { if (podName) { - for (let pod of this.pods) { - if (pod.name == podName) { + for (const pod of this.pods) { + if (pod.name === podName) { return pod; } } @@ -102,7 +102,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { podChange() { this.containers = this.selectedPod.containerStatus; this.selectedContainer = this.containers[0].name; - let url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -128,7 +128,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { connect() { this.podClient.createTerminal(this.appId, this.cluster, this.namespace, this.selectedPod.name, this.selectedContainer).subscribe( response => { - let session = response.data.sessionId; + const session = response.data.sessionId; const url = `/ws/pods/exec?${session}`; this.socket = new SockJS(url); this.socket.onopen = this.onConnectionOpen.bind(this, response.data); @@ -152,11 +152,11 @@ export class PodTerminalComponent implements OnInit, OnDestroy { // 修改窗口大小 onTerminalResize() { - let width = this.terminal.nativeElement.parentElement.clientWidth; - let height = this.terminal.nativeElement.parentElement.clientHeight; - let xterm = Terminal.apply(this.xterm); - let cols = (width - xterm.viewport.scrollBarWidth - 15) / xterm.renderer.dimensions.actualCellWidth; - let rows = height / xterm.renderer.dimensions.actualCellHeight; + const width = this.terminal.nativeElement.parentElement.clientWidth; + const height = this.terminal.nativeElement.parentElement.clientHeight; + const xterm = Terminal.apply(this.xterm); + const cols = (width - xterm.viewport.scrollBarWidth - 15) / xterm.renderer.dimensions.actualCellWidth; + const rows = height / xterm.renderer.dimensions.actualCellHeight; this.xterm.resize(parseInt(cols.toString()), parseInt(rows.toString())); } @@ -164,10 +164,10 @@ export class PodTerminalComponent implements OnInit, OnDestroy { // 获取服务端传来的信息 onConnectionMessage(evt) { try { - let msg = JSON.parse(evt.data); + const msg = JSON.parse(evt.data); switch (msg['Op']) { case 'stdout': - if (msg['Data'].toString().indexOf(`starting container process caused 'exec: \\'bash\\': executable file not found in $PATH'`) == -1) { + if (msg['Data'].toString().indexOf(`starting container process caused 'exec: \\'bash\\': executable file not found in $PATH'`) === -1) { if (msg['Data'].indexOf('wayne-init') > -1) { console.log('server ready.'); clearInterval(this.timer); diff --git a/src/frontend/src/app/portal/portal.component.spec.ts b/src/frontend/src/app/portal/portal.component.spec.ts index 853e0bef4..a83dafb39 100644 --- a/src/frontend/src/app/portal/portal.component.spec.ts +++ b/src/frontend/src/app/portal/portal.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PortalComponent } from './portal.component'; describe('PortalComponent', () => { - let component: PortalComponent; - let fixture: ComponentFixture; + const component: PortalComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/portal.component.ts b/src/frontend/src/app/portal/portal.component.ts index d1f344397..05eb39fdb 100644 --- a/src/frontend/src/app/portal/portal.component.ts +++ b/src/frontend/src/app/portal/portal.component.ts @@ -15,7 +15,7 @@ export class PortalComponent implements OnInit { } ngOnInit() { - if (this.router.url == '/portal') { + if (this.router.url === '/portal') { this.router.navigate([defaultRoutingUrl]); } } diff --git a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts index 15be574fe..148112fb2 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts +++ b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts @@ -26,9 +26,9 @@ export class CreateEditSecretComponent implements OnInit { componentName = '加密字典'; secret: Secret = new Secret(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; title: string; actionType: ActionType; @@ -126,7 +126,7 @@ export class CreateEditSecretComponent implements OnInit { //Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['name']; + const cont = this.currentForm.controls['name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html index ab8aacdca..6127f24f4 100644 --- a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html +++ b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html @@ -47,9 +47,9 @@
- {{status.cluster}}  - +
diff --git a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts index e06ca2995..45f1e00ec 100644 --- a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts @@ -21,14 +21,14 @@ import { ActivatedRoute } from '@angular/router'; }) export class PublishSecretTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; secretTpl: SecretTpl; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; forceOffline: boolean; actionType: ResourcesActionType; @@ -49,26 +49,26 @@ export class PublishSecretTplComponent { this.clusters = Array(); this.secretTpl = secretTpl; this.forceOffline = false; - if (actionType == ResourcesActionType.PUBLISH) { + if (actionType === ResourcesActionType.PUBLISH) { this.title = '发布加密字典[' + secretTpl.name + ']'; if (!secretTpl.metaData) { this.messageHandlerService.warning('请先选择可发布集群'); return; } this.modalOpened = true; - let metaData = JSON.parse(secretTpl.metaData); - for (let cluster of metaData.clusters) { + const metaData = JSON.parse(secretTpl.metaData); + for (const cluster of metaData.clusters) { if (this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[cluster]) { - let c = new Cluster(); + const c = new Cluster(); c.name = cluster; this.clusters.push(c); } } - } else if (actionType == ResourcesActionType.OFFLINE) { + } else if (actionType === ResourcesActionType.OFFLINE) { this.modalOpened = true; this.title = '下线加密字典[' + secretTpl.name + ']'; - for (let state of secretTpl.status) { - let c = new Cluster(); + for (const state of secretTpl.status) { + const c = new Cluster(); c.name = state.cluster; this.clusters.push(c); } @@ -77,8 +77,8 @@ export class PublishSecretTplComponent { getStatusByCluster(status: PublishStatus[], cluster: string): PublishStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -143,7 +143,7 @@ export class PublishSecretTplComponent { } deploy(cluster: Cluster) { - let kubeSecret: KubeSecret = JSON.parse(this.secretTpl.template); + const kubeSecret: KubeSecret = JSON.parse(this.secretTpl.template); kubeSecret.metadata.namespace = this.cacheService.kubeNamespace; this.secretClient.deploy( this.appId, diff --git a/src/frontend/src/app/portal/secret/secret.component.ts b/src/frontend/src/app/portal/secret/secret.component.ts index 9e4a63586..2f1e934ea 100644 --- a/src/frontend/src/app/portal/secret/secret.component.ts +++ b/src/frontend/src/app/portal/secret/secret.component.ts @@ -55,7 +55,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { createEdit: CreateEditSecretComponent; secretId: number; pageState: PageState = new PageState(); - isOnline: boolean = false; + isOnline = false; secrets: Secret[]; secretTpls: SecretTpl[]; app: App; @@ -85,13 +85,13 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { public translate: TranslateService, private messageHandlerService: MessageHandlerService) { this.tabScription = this.tabDragService.tabDragOverObservable.subscribe(over => { - if (over) this.tabChange(); + if (over) { this.tabChange(); } }); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.SECRET) { - let secretId = message.data; + const secretId = message.data; this.secretService.deleteById(secretId, this.app.id) .subscribe( response => { @@ -119,7 +119,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -140,11 +140,11 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.secretService.updateOrder(this.app.id, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -169,7 +169,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -189,14 +189,14 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { syncStatus(): void { if (this.secretTpls && this.secretTpls.length > 0) { for (let i = 0; i < this.secretTpls.length; i++) { - let tpl = this.secretTpls[i]; + const tpl = this.secretTpls[i]; if (tpl.status && tpl.status.length > 0) { for (let j = 0; j < tpl.status.length; j++) { - let status = tpl.status[j]; - if (status.errNum > 2) continue; + const status = tpl.status[j]; + if (status.errNum > 2) { continue; } this.secretClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - let code = response.statusCode | response.status; + const code = response.statusCode | response.status; if (code === httpStatusCode.NoContent) { this.secretTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -238,7 +238,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { initSecret(refreshTpl?: boolean) { this.appId = parseInt(this.route.parent.snapshot.params['id']); this.secretId = parseInt(this.route.snapshot.params['secretId']); - let namespaceId = this.cacheService.namespaceId; + const namespaceId = this.cacheService.namespaceId; Observable.combineLatest( this.secretService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId) @@ -263,8 +263,8 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { if (!secretId) { return this.secrets[0].id; } - for (let c of this.secrets) { - if (secretId == c.id) { + for (const c of this.secrets) { + if (secretId === c.id) { return secretId; } } @@ -315,11 +315,11 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { this.publishService.listStatus(PublishType.SECRET, this.secretId) ).subscribe( response => { - let status = response[1].data; + const status = response[1].data; this.publishStatus = status; - let tplStatusMap = {}; + const tplStatusMap = {}; if (status && status.length > 0) { - for (let state of status) { + for (const state of status) { if (!tplStatusMap[state.templateId]) { tplStatusMap[state.templateId] = Array(); } @@ -329,7 +329,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { } this.tplStatusMap = tplStatusMap; - let tpls = response[0].data; + const tpls = response[0].data; this.pageState.page.totalPage = tpls.totalPage; this.pageState.page.totalCount = tpls.totalCount; this.buildTplList(tpls.list); @@ -344,7 +344,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线加密字典无法删除，请先下线加密字典！'); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除加密字典确认', '是否确认删除加密字典?', this.secretId, @@ -357,11 +357,11 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { buildTplList(tpls: SecretTpl[]) { if (tpls) { - for (let tpl of tpls) { - let metaData = tpl.metaData ? tpl.metaData : '{}'; + for (const tpl of tpls) { + const metaData = tpl.metaData ? tpl.metaData : '{}'; tpl.clusters = JSON.parse(metaData).clusters; - let publishStatus = this.tplStatusMap[tpl.id]; + const publishStatus = this.tplStatusMap[tpl.id]; if (publishStatus && publishStatus.length > 0) { tpl.status = publishStatus; } diff --git a/src/frontend/src/app/portal/sidenav/sidenav.component.spec.ts b/src/frontend/src/app/portal/sidenav/sidenav.component.spec.ts index baf953169..b4d6f4b34 100644 --- a/src/frontend/src/app/portal/sidenav/sidenav.component.spec.ts +++ b/src/frontend/src/app/portal/sidenav/sidenav.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SidenavComponent } from './sidenav.component'; describe('SidenavComponent', () => { - let component: SidenavComponent; - let fixture: ComponentFixture; + const component: SidenavComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts b/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts index 9439f7d4c..a6b2bc43a 100644 --- a/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts @@ -29,9 +29,9 @@ export class CreateEditStatefulsetComponent implements OnInit { clusterMetas: {}; title: string; statefulset: Statefulset = new Statefulset(); - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; - isNameValid: boolean = true; + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; actionType: ActionType; modalOpened: boolean; app: App; @@ -52,7 +52,7 @@ export class CreateEditStatefulsetComponent implements OnInit { this.clusters = clusters; this.clusterMetas = {}; if (this.clusters && this.clusters.length > 0) { - for (let clu of this.clusters) { + for (const clu of this.clusters) { this.clusterMetas[clu.name] = new ClusterMeta(false); } } @@ -63,9 +63,9 @@ export class CreateEditStatefulsetComponent implements OnInit { status => { this.statefulset = status.data; if (this.clusters && this.clusters.length > 0) { - let replicas = JSON.parse(this.statefulset.metaData)['replicas']; - for (let clu of this.clusters) { - let culsterMeta = new ClusterMeta(false); + const replicas = JSON.parse(this.statefulset.metaData)['replicas']; + for (const clu of this.clusters) { + const culsterMeta = new ClusterMeta(false); if (replicas && replicas[clu.name]) { culsterMeta.checked = true; culsterMeta.value = replicas[clu.name]; @@ -90,22 +90,22 @@ export class CreateEditStatefulsetComponent implements OnInit { get replicaLimit(): number { let replicaLimit = defaultResources.replicaLimit; if (this.statefulset && this.statefulset.metaData) { - let metaData = JSON.parse(this.statefulset.metaData); + const metaData = JSON.parse(this.statefulset.metaData); if (metaData.resources && metaData.resources.replicaLimit) { - replicaLimit = parseInt(metaData.resources.replicaLimit); + replicaLimit = parseInt(metaData.resources.replicaLimit, 10); } } return replicaLimit; } replicaValidation(cluster: string): boolean { - let clusterMeta = this.clusterMetas[cluster]; + const clusterMeta = this.clusterMetas[cluster]; if (this.statefulset && this.statefulset.metaData && clusterMeta) { if (!clusterMeta.checked) { return true; } - return parseInt(clusterMeta.value) <= this.replicaLimit; + return parseInt(clusterMeta.value, 10) <= this.replicaLimit; } return false; } @@ -131,9 +131,9 @@ export class CreateEditStatefulsetComponent implements OnInit { this.isSubmitOnGoing = true; this.statefulset.appId = this.app.id; - let replicas = {}; - for (let clu of this.clusters) { - let clusterMeta = this.clusterMetas[clu.name]; + const replicas = {}; + for (const clu of this.clusters) { + const clusterMeta = this.clusterMetas[clu.name]; if (clusterMeta && clusterMeta.checked && clusterMeta.value) { replicas[clu.name] = clusterMeta.value; } @@ -190,8 +190,8 @@ export class CreateEditStatefulsetComponent implements OnInit { isClusterValid(): boolean { if (this.clusters) { - for (let clu of this.clusters) { - let clusterMeta = this.clusterMetas[clu.name]; + for (const clu of this.clusters) { + const clusterMeta = this.clusterMetas[clu.name]; if (clusterMeta && clusterMeta.checked && clusterMeta.value) { return true; } @@ -202,7 +202,7 @@ export class CreateEditStatefulsetComponent implements OnInit { isClusterReplicaValid(): boolean { if (this.clusters) { - for (let clu of this.clusters) { + for (const clu of this.clusters) { if (!this.replicaValidation(clu.name)) { return false; } @@ -211,9 +211,9 @@ export class CreateEditStatefulsetComponent implements OnInit { return true; } -//Handle the form validation +// Handle the form validation handleValidation(): void { - let cont = this.currentForm.controls['statefulset_name']; + const cont = this.currentForm.controls['statefulset_name']; if (cont) { this.isNameValid = cont.valid; } diff --git a/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts b/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts index b4a2c7487..2db9d8cc3 100644 --- a/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts @@ -14,12 +14,12 @@ import { SortOrder } from '@clr/angular'; }) export class ListEventComponent implements OnInit { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts index bf766cab7..701729f57 100644 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts @@ -27,19 +27,19 @@ import { AuthService } from '../../../shared/auth/auth.service'; }) export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing: boolean = false; - isSubmitOnGoing: boolean = false; + checkOnGoing = false; + isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; sortOrder: SortOrder = SortOrder.Unsorted; - sorted: boolean = false; + sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); currentCluster: string; statefulset: string; logSource: string; timer: any; - whetherHotReflash: boolean = true; + whetherHotReflash = true; subscription: Subscription; @@ -62,7 +62,7 @@ export class ListPodComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.POD) { - let pod: Pod = message.data; + const pod: Pod = message.data; this.podClient .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) .subscribe( @@ -91,9 +91,9 @@ export class ListPodComponent implements OnInit, OnDestroy { this.whetherHotReflash = true; this.clusterService.getByName(this.currentCluster).subscribe( response => { - let cluster: Cluster = response.data; + const cluster: Cluster = response.data; if (cluster.metaData) { - let metaData = JSON.parse(cluster.metaData); + const metaData = JSON.parse(cluster.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -131,7 +131,7 @@ export class ListPodComponent implements OnInit, OnDestroy { refresh() { this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, 'statefulset', this.statefulset).subscribe( response => { - let pods = response.data; + const pods = response.data; this.inventory.size = pods.length; this.inventory.reset(pods); this.pods = this.inventory.all; @@ -144,7 +144,7 @@ export class ListPodComponent implements OnInit, OnDestroy { } deletePod(pod: Pod) { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除实例确认', `是否确认删除实例 ${pod.name}`, pod, @@ -156,15 +156,15 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { - let appId = this.route.parent.snapshot.params['id']; - let url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const appId = this.route.parent.snapshot.params['id']; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts index 58aa566e2..4275d1d1f 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts @@ -51,7 +51,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { @ViewChild(PublishStatefulsetTplComponent) publishStatefulsetTpl: PublishStatefulsetTplComponent; state: State; - currentPage: number = 1; + currentPage = 1; subscription: Subscription; @@ -70,7 +70,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.STATEFULSET_TPL) { - let tplId = message.data; + const tplId = message.data; this.statefulsetTplService.deleteById(tplId, this.appId) .subscribe( response => { @@ -115,7 +115,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { } deleteStatefulsetTpl(tpl: StatefulsetTemplate): void { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集模版确认', `你确认删除状态副本集模版${tpl.name}？`, tpl.id, @@ -140,7 +140,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { publishTpl(tpl: StatefulsetTemplate) { this.statefulsetService.getById(tpl.statefulsetId, this.appId).subscribe( status => { - let statefulset = status.data; + const statefulset = status.data; this.publishStatefulsetTpl.newPublishTpl(statefulset, tpl, ResourcesActionType.PUBLISH); }, error => { @@ -151,7 +151,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { offlineStatefulset(tpl: StatefulsetTemplate) { this.statefulsetService.getById(tpl.statefulsetId, this.appId).subscribe( status => { - let statefulset = status.data; + const statefulset = status.data; this.publishStatefulsetTpl.newPublishTpl(statefulset, tpl, ResourcesActionType.OFFLINE); }, error => { diff --git a/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts index 5f86cd7e9..b07264a49 100644 --- a/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts @@ -24,7 +24,7 @@ import { ClusterMeta } from '../../../shared/model/v1/cluster'; }) export class PublishStatefulsetTplComponent { @Output() published = new EventEmitter(); - modalOpened: boolean = false; + modalOpened = false; publishForm: NgForm; @ViewChild('publishForm') currentForm: NgForm; @@ -33,7 +33,7 @@ export class PublishStatefulsetTplComponent { statefulsetTpl: StatefulsetTemplate; clusterMetas = {}; clusters = Array(); - isSubmitOnGoing: boolean = false; + isSubmitOnGoing = false; title: string; forceOffline: boolean; actionType: ResourcesActionType; @@ -46,16 +46,16 @@ export class PublishStatefulsetTplComponent { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } replicaValidation(cluster: string): boolean { - let clusterMeta = this.clusterMetas[cluster]; + const clusterMeta = this.clusterMetas[cluster]; if (this.statefulset && this.statefulset.metaData && clusterMeta) { if (!clusterMeta.checked) { return true; } - return parseInt(clusterMeta.value) <= this.replicaLimit; + return parseInt(clusterMeta.value, 10) <= this.replicaLimit; } return false; } @@ -63,17 +63,17 @@ export class PublishStatefulsetTplComponent { get replicaLimit(): number { let replicaLimit = defaultResources.replicaLimit; if (this.statefulset && this.statefulset.metaData) { - let metaData = JSON.parse(this.statefulset.metaData); + const metaData = JSON.parse(this.statefulset.metaData); if (metaData.resources && metaData.resources.replicaLimit) { - replicaLimit = parseInt(metaData.resources.replicaLimit); + replicaLimit = parseInt(metaData.resources.replicaLimit, 10); } } return replicaLimit; } newPublishTpl(statefulset: Statefulset, statefulsetTpl: StatefulsetTemplate, actionType: ResourcesActionType) { - let replicas = this.getReplicas(statefulset); + const replicas = this.getReplicas(statefulset); this.actionType = actionType; this.forceOffline = false; if (replicas != null) { @@ -83,16 +83,16 @@ export class PublishStatefulsetTplComponent { this.statefulsetTpl = statefulsetTpl; this.clusters = Array(); this.clusterMetas = {}; - if (actionType == ResourcesActionType.OFFLINE) { + if (actionType === ResourcesActionType.OFFLINE) { statefulsetTpl.status.map(state => { this.clusters.push(state.cluster); this.clusterMetas[state.cluster] = new ClusterMeta(false); }); } else { Object.getOwnPropertyNames(replicas).map(key => { - if ((actionType == ResourcesActionType.PUBLISH || this.getStatusByCluster(statefulsetTpl.status, key) != null) + if ((actionType === ResourcesActionType.PUBLISH || this.getStatusByCluster(statefulsetTpl.status, key) != null) && this.cacheService.namespace.metaDataObj && this.cacheService.namespace.metaDataObj.clusterMeta[key]) { - let clusterMeta = new ClusterMeta(false); + const clusterMeta = new ClusterMeta(false); clusterMeta.value = replicas[key]; this.clusterMetas[key] = clusterMeta; this.clusters.push(key); @@ -118,8 +118,8 @@ export class PublishStatefulsetTplComponent { getStatusByCluster(status: TemplateStatus[], cluster: string): TemplateStatus { if (status && status.length > 0) { - for (let state of status) { - if (state.cluster == cluster) { + for (const state of status) { + if (state.cluster === cluster) { return state; } } @@ -132,7 +132,7 @@ export class PublishStatefulsetTplComponent { this.messageHandlerService.showWarning('状态副本集实例数未配置，请先到编辑状态副本集配置实例数！'); return null; } - let replicas = JSON.parse(statefulset.metaData)['replicas']; + const replicas = JSON.parse(statefulset.metaData)['replicas']; if (!replicas) { this.messageHandlerService.showWarning('状态副本集实例数未配置，请先到编辑状态副本集配置实例数！'); return null; @@ -200,11 +200,11 @@ export class PublishStatefulsetTplComponent { } deploy() { - let observables = Array(); + const observables = Array(); Object.getOwnPropertyNames(this.clusterMetas).forEach(cluster => { if (this.clusterMetas[cluster].checked) { - let kubeStatefulSet: KubeStatefulSet = JSON.parse(this.statefulsetTpl.template); - if (this.actionType == ResourcesActionType.RESTART) { + const kubeStatefulSet: KubeStatefulSet = JSON.parse(this.statefulsetTpl.template); + if (this.actionType === ResourcesActionType.RESTART) { kubeStatefulSet.spec.template.metadata.labels['timestamp'] = new Date().getTime().toString(); } kubeStatefulSet.metadata.namespace = this.cacheService.kubeNamespace; @@ -232,7 +232,7 @@ export class PublishStatefulsetTplComponent { isClusterReplicaValid(): boolean { if (this.clusters) { - for (let clu of this.clusters) { + for (const clu of this.clusters) { if (!this.replicaValidation(clu)) { return false; } diff --git a/src/frontend/src/app/portal/statefulset/statefulset.component.ts b/src/frontend/src/app/portal/statefulset/statefulset.component.ts index 3bb525aad..9a0c576af 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/statefulset.component.ts @@ -59,7 +59,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit pageState: PageState = new PageState(); changedStatefulsetTpls: StatefulsetTemplate[]; - isOnline: boolean = false; + isOnline = false; statefulsetId: number; app: App; appId: number; @@ -133,7 +133,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit initShow() { this.showList = []; Object.keys(this.showState).forEach(key => { - if (!this.showState[key].hidden) this.showList.push(key); + if (!this.showState[key].hidden) { this.showList.push(key); } }); } @@ -160,11 +160,11 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit tabChange() { const orderList = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); - if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) return; + if (this.orderCache && JSON.stringify(this.orderCache) === JSON.stringify(orderList)) { return; } this.statefulsetService.updateOrder(this.appId, orderList).subscribe( response => { if (response.data === 'ok!') { @@ -189,7 +189,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit } else { this.orderCache = [].slice.call(this.el.nativeElement.querySelectorAll('.tabs-item')).map((item, index) => { return { - id: parseInt(item.id), + id: parseInt(item.id, 10), order: index }; }); @@ -203,27 +203,27 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit syncStatus() { if (this.changedStatefulsetTpls && this.changedStatefulsetTpls.length > 0) { for (let i = 0; i < this.changedStatefulsetTpls.length; i++) { - let tpl = this.changedStatefulsetTpls[i]; + const tpl = this.changedStatefulsetTpls[i]; if (tpl.status && tpl.status.length > 0) { for (let j = 0; j < tpl.status.length; j++) { - let status = tpl.status[j]; - if (status.errNum > 2) continue; + const status = tpl.status[j]; + if (status.errNum > 2) { continue; } this.statefulsetClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - let code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.changedStatefulsetTpls[i].status[j].state = TemplateState.NOT_FOUND; return; } - let podInfo = response.data.pods; + const podInfo = response.data.pods; // 防止切换tab tpls数据发生变化导致报错 if (this.changedStatefulsetTpls && this.changedStatefulsetTpls[i] && this.changedStatefulsetTpls[i].status && this.changedStatefulsetTpls[i].status[j]) { let state = TemplateState.FAILD; - if (podInfo.current == podInfo.desired) { + if (podInfo.current === podInfo.desired) { state = TemplateState.SUCCESS; } this.changedStatefulsetTpls[i].status[j].state = state; @@ -271,9 +271,9 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit } initStatefulset(refreshTpl?: boolean) { - this.appId = parseInt(this.route.parent.snapshot.params['id']); - let namespaceId = this.cacheService.namespaceId; - this.statefulsetId = parseInt(this.route.snapshot.params['statefulsetId']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); + const namespaceId = this.cacheService.namespaceId; + this.statefulsetId = parseInt(this.route.snapshot.params['statefulsetId'], 10); Observable.combineLatest( this.clusterService.getNames(), this.statefulsetService.listPage(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), this.appId, 'false'), @@ -284,7 +284,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit this.statefulsets = response[1].data.list.sort((a, b) => a.order - b.order); this.initOrder(this.statefulsets); this.app = response[2].data; - let isRedirectUri = this.redirectUri(); + const isRedirectUri = this.redirectUri(); if (isRedirectUri) { this.navigateUri(); } @@ -309,8 +309,8 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit this.statefulsetId = this.statefulsets[0].id; return true; } - for (let stateful of this.statefulsets) { - if (this.statefulsetId == stateful.id) { + for (const stateful of this.statefulsets) { + if (this.statefulsetId === stateful.id) { return false; } } @@ -360,7 +360,8 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit // 点击克隆状态副本集模版 cloneStatefulsetTpl(tpl: StatefulsetTemplate) { if (tpl) { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/statefulset/${this.statefulsetId}/tpl/${tpl.id}`]); + this.router.navigate( + [`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/statefulset/${this.statefulsetId}/tpl/${tpl.id}`]); } } @@ -368,7 +369,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit if (this.publishStatus && this.publishStatus.length > 0) { this.messageHandlerService.warning('已上线状态副本集无法删除，请先下线状态副本集！'); } else { - let deletionMessage = new ConfirmationMessage( + const deletionMessage = new ConfirmationMessage( '删除状态副本集确认', '是否确认删除状态副本集', this.statefulsetId, @@ -401,9 +402,9 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit this.publishService.listStatus(PublishType.STATEFULSET, this.statefulsetId) ).subscribe( response => { - let status = response[1].data; + const status = response[1].data; this.publishStatus = status; - let tpls = response[0].data; + const tpls = response[0].data; this.pageState.page.totalPage = tpls.totalPage; this.pageState.page.totalCount = tpls.totalCount; this.changedStatefulsetTpls = this.buildTplList(tpls.list, status); @@ -417,9 +418,9 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit if (!statefulsetTpls) { return statefulsetTpls; } - let tplStatusMap = {}; + const tplStatusMap = {}; if (status && status.length > 0) { - for (let state of status) { + for (const state of status) { if (!tplStatusMap[state.templateId]) { tplStatusMap[state.templateId] = Array(); } @@ -427,19 +428,19 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit } } - let results = Array(); - for (let statefulsetTpl of statefulsetTpls) { + const results = Array(); + for (const statefulsetTpl of statefulsetTpls) { let kubeStatefulset = new KubeStatefulSet(); kubeStatefulset = JSON.parse(statefulsetTpl.template); - let containers = kubeStatefulset.spec.template.spec.containers; + const containers = kubeStatefulset.spec.template.spec.containers; if (containers.length > 0) { - let containerVersions = Array(); - for (let con of containers) { + const containerVersions = Array(); + for (const con of containers) { containerVersions.push(con.image); } statefulsetTpl.containerVersions = containerVersions; - let publishStatus = tplStatusMap[statefulsetTpl.id]; + const publishStatus = tplStatusMap[statefulsetTpl.id]; if (publishStatus && publishStatus.length > 0) { statefulsetTpl.status = publishStatus; } diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts b/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts index bb28ffa1a..3296817c1 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts @@ -32,7 +32,8 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { ngOnInit() { this.aceEditorMsgSub = this.aceEditorService.aceMessageAnnouncedSource$.subscribe( message => { - let modalOpened = true, title: string, hiddenFooter: boolean; + const modalOpened = true + let title: string, hiddenFooter: boolean; this.aceMode = 'ace/mode/json'; // 这里分为三种情况，不传edit时候是嵌套在其他模板中，true为编辑模板，false为查看模板。 if (message.edit !== undefined) { @@ -44,9 +45,11 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { hiddenFooter = true; } title = message.title ? message.title : title; - let query = {modalOpened, title, hiddenFooter}; + const query = {modalOpened, title, hiddenFooter}; // 这里通过判断observers.length来判断是否存在父组件，非官方方法； - if (this.modalChange.observers.length) this.modalChange.emit(query); + if (this.modalChange.observers.length) { + this.modalChange.emit(query); + } } this.aceEditorMsg = message; this.editor = ace.edit(this.editorElement.nativeElement); @@ -54,7 +57,8 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { this.editor.$blockScrolling = Infinity; this.editor.setFontSize('16px'); this.editor.setShowPrintMargin(false); - this.editor.setValue(typeof this.aceEditorMsg.message === 'string' ? JSON.stringify(JSON.parse(this.aceEditorMsg.message), null, 2) : JSON.stringify(this.aceEditorMsg.message, null, 2)); + this.editor.setValue(typeof this.aceEditorMsg.message === 'string' ? + JSON.stringify(JSON.parse(this.aceEditorMsg.message), null, 2) : JSON.stringify(this.aceEditorMsg.message, null, 2)); this.setStorageMode(); } @@ -74,8 +78,8 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { } setStorageMode() { - let aceMode = localStorage.getItem('aceMode'); - if (aceMode && aceMode == 'ace/mode/yaml') { + const aceMode = localStorage.getItem('aceMode'); + if (aceMode && aceMode === 'ace/mode/yaml') { this.aceMode = aceMode; this.aceModeChange(); } @@ -90,11 +94,11 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { aceModeChange() { this.editor.getSession().setMode(this.aceMode); if (this.editor.getValue().trim() !== '') { - if (this.aceMode == 'ace/mode/json') { - let obj = YAML.load(this.editor.getValue()); + if (this.aceMode === 'ace/mode/json') { + const obj = YAML.load(this.editor.getValue()); this.editor.setValue(JSON.stringify(obj, null, 2)); } else { - let obj = JSON.parse(this.editor.getValue()); + const obj = JSON.parse(this.editor.getValue()); this.editor.setValue(YAML.dump(obj)); } } @@ -103,11 +107,11 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { format() { try { - if (this.aceMode == 'ace/mode/json') { - let obj = JSON.parse(this.editor.getValue()); + if (this.aceMode === 'ace/mode/json') { + const obj = JSON.parse(this.editor.getValue()); this.editor.setValue(JSON.stringify(obj, null, 2)); } else { - let obj = YAML.load(this.editor.getValue()); + const obj = YAML.load(this.editor.getValue()); this.editor.setValue(YAML.dump(obj)); } } catch (e) { @@ -115,7 +119,7 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { } getValue() { - if (this.aceMode == 'ace/mode/json') { + if (this.aceMode === 'ace/mode/json') { return this.editor.getValue(); } else { return JSON.stringify(YAML.load(this.editor.getValue())) || ''; @@ -128,8 +132,10 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { get isValid(): boolean { try { - if (this.editor.getValue().trim() === '') return true; - if (this.aceMode == 'ace/mode/json') { + if (this.editor.getValue().trim() === '') { + return true; + } + if (this.aceMode === 'ace/mode/json') { JSON.parse(this.editor.getValue()); } else { YAML.load(this.editor.getValue()); diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts index 3520c0d8a..6fca223a8 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts @@ -42,7 +42,7 @@ export class AceEditorComponent implements OnInit { } onSubmit() { - if (this.box.aceMode == 'ace/mode/json') { + if (this.box.aceMode === 'ace/mode/json') { this.outputObj.emit(JSON.parse(this.box.editor.getValue())); } else { this.outputObj.emit(YAML.load(this.box.editor.getValue())); @@ -52,7 +52,7 @@ export class AceEditorComponent implements OnInit { get isValid(): boolean { try { - if (this.box.aceMode == 'ace/mode/json') { + if (this.box.aceMode === 'ace/mode/json') { JSON.parse(this.box.editor.getValue()); } else { YAML.load(this.box.editor.getValue()); diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.ts b/src/frontend/src/app/shared/ace-editor/ace-editor.ts index c309a84a1..83af980df 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.ts @@ -7,7 +7,7 @@ export class AceEditorMsg { } static Instance(message: any, edit?: boolean, title?: string): AceEditorMsg { - let msg = new AceEditorMsg(); + const msg = new AceEditorMsg(); msg.title = title; msg.edit = edit; msg.message = message; diff --git a/src/frontend/src/app/shared/ace-editor/modalInfo.ts b/src/frontend/src/app/shared/ace-editor/modalInfo.ts index c39a8593a..87a5e1b4c 100644 --- a/src/frontend/src/app/shared/ace-editor/modalInfo.ts +++ b/src/frontend/src/app/shared/ace-editor/modalInfo.ts @@ -4,7 +4,7 @@ export class ModalInfo { hiddenFooter?: boolean; static emptyObject(): ModalInfo { - let result = new ModalInfo(); + const result = new ModalInfo(); result.title = '编辑模版'; result.modalOpened = true; result.hiddenFooter = false; diff --git a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts index aa615dffc..c179c74a1 100644 --- a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts +++ b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts @@ -33,8 +33,8 @@ export class SignInComponent implements OnInit { connectParticles: true }); - let sid = this.route.snapshot.queryParams['sid']; - let ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; + const sid = this.route.snapshot.queryParams['sid']; + const ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; if (sid) { localStorage.setItem(LoginTokenKey, sid); window.location.replace(ref); @@ -61,8 +61,8 @@ export class SignInComponent implements OnInit { } this.authoriseService.Login(this.username, this.password, type).subscribe( resp => { - let ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; - let data = resp.data; + const ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; + const data = resp.data; localStorage.setItem(LoginTokenKey, data.token); window.location.replace(ref); }, @@ -75,18 +75,18 @@ export class SignInComponent implements OnInit { } oauth2Login() { - let currentUrl = document.location.origin; - let ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; + const currentUrl = document.location.origin; + const ref = this.route.snapshot.queryParams['ref'] ? this.route.snapshot.queryParams['ref'] : '/'; window.location.replace(`/login/oauth2/oauth2?next=${currentUrl}/sign-in?ref=${ref}`); } getOAuth2Title() { - let oauth2Title = this.authService.config['system.oauth2-title']; + const oauth2Title = this.authService.config['system.oauth2-title']; return oauth2Title ? oauth2Title : 'OAuth 2.0 Login'; } getTitle() { - let imagePrefix = this.authService.config['system.title']; + const imagePrefix = this.authService.config['system.title']; return imagePrefix ? imagePrefix : 'Wayne'; } diff --git a/src/frontend/src/app/shared/auth/admin-auth-check-guard.service.ts b/src/frontend/src/app/shared/auth/admin-auth-check-guard.service.ts index c6e37f6b0..dd131af64 100644 --- a/src/frontend/src/app/shared/auth/admin-auth-check-guard.service.ts +++ b/src/frontend/src/app/shared/auth/admin-auth-check-guard.service.ts @@ -16,7 +16,7 @@ export class AdminAuthCheckGuard implements CanActivate, CanActivateChild { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { - //When routing change, clear + // When routing change, clear this.msgHandler.clear(); return new Promise((resolve, reject) => { @@ -43,7 +43,7 @@ export class AdminAuthCheckGuard implements CanActivate, CanActivateChild { resolve(false); } } - //Before activating, we firstly need to confirm whether the route is coming from peer part - admiral + // Before activating, we firstly need to confirm whether the route is coming from peer part - admiral return resolve(true); }); } diff --git a/src/frontend/src/app/shared/auth/auth-check-guard.service.ts b/src/frontend/src/app/shared/auth/auth-check-guard.service.ts index 8a3b088bf..9cd39c590 100644 --- a/src/frontend/src/app/shared/auth/auth-check-guard.service.ts +++ b/src/frontend/src/app/shared/auth/auth-check-guard.service.ts @@ -18,7 +18,7 @@ export class AuthCheckGuard implements CanActivate, CanActivateChild { } canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { - //When routing change, clear + // When routing change, clear this.msgHandler.clear(); return new Promise((resolve, reject) => { if (!this.authService.currentUser) { @@ -44,30 +44,30 @@ export class AuthCheckGuard implements CanActivate, CanActivateChild { setCache(state: RouterStateSnapshot) { if (state.url.indexOf('/portal/namespace/') > -1) { - let nid = parseInt(state.url.split('/')[3]); + const nid = parseInt(state.url.split('/')[3], 10); if (this.cacheService.namespaces.length > 0) { let namespace = this.defaultNamespace(); - for (let ns of this.cacheService.namespaces) { - if (ns.id == nid) { + for (const ns of this.cacheService.namespaces) { + if (ns.id === nid) { namespace = ns; } } this.cacheService.setNamespace(namespace); } } - let reg = new RegExp('^/portal/namespace/([0-9]*)/app/([0-9]*)'); + const reg = new RegExp('^/portal/namespace/([0-9]*)/app/([0-9]*)'); if (reg.test(state.url)) { - let appId = parseInt(state.url.split('/')[5]); + const appId = parseInt(state.url.split('/')[5], 10); this.cacheService.setAppId(appId); } } defaultNamespace(): any { - let namespaceId = localStorage.getItem('namespace'); + const namespaceId = localStorage.getItem('namespace'); if (namespaceId) { - for (let ns of this.cacheService.namespaces) { - if (ns.id.toString() == namespaceId) { + for (const ns of this.cacheService.namespaces) { + if (ns.id.toString() === namespaceId) { return ns; } } diff --git a/src/frontend/src/app/shared/auth/cache.service.ts b/src/frontend/src/app/shared/auth/cache.service.ts index 97eaabdcd..b06dba099 100644 --- a/src/frontend/src/app/shared/auth/cache.service.ts +++ b/src/frontend/src/app/shared/auth/cache.service.ts @@ -44,10 +44,10 @@ export class CacheService { } get kubeNamespace(): string { - let err = 'namespace元数据有误，请联系管理员！'; + const err = 'namespace元数据有误，请联系管理员！'; try { if (this.namespace.metaData) { - let metaData = JSON.parse(this.namespace.metaData); + const metaData = JSON.parse(this.namespace.metaData); return metaData.namespace; } else { this.alertError(err); diff --git a/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts b/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts index 9d4c740eb..269dc689c 100644 --- a/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts +++ b/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts @@ -118,7 +118,7 @@ export class CreateEditResourceTemplate { } isValidResource(): boolean { - if (this.kubeResource === null) { + if (this.kubeResource == null) { return false; } return true; diff --git a/src/frontend/src/app/shared/base/resource/publish-template.ts b/src/frontend/src/app/shared/base/resource/publish-template.ts index a3884004d..47678a9d1 100644 --- a/src/frontend/src/app/shared/base/resource/publish-template.ts +++ b/src/frontend/src/app/shared/base/resource/publish-template.ts @@ -107,7 +107,7 @@ export class PublishTemplate { } offline(cluster: Cluster) { - const state = this.getStatusByCluster(this.template.status, cluster.name); + let state = this.getStatusByCluster(this.template.status, cluster.name); this.resourceClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.template.name).subscribe( response => { this.deletePublishStatus(state.id); diff --git a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts index 051e4117f..9b2da8575 100644 --- a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts +++ b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BreadcrumbComponent } from './breadcrumb.component'; describe('BreadcrumbComponent', () => { - let component: BreadcrumbComponent; - let fixture: ComponentFixture; + const component: BreadcrumbComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/shared/checkbox/checkbox.component.ts b/src/frontend/src/app/shared/checkbox/checkbox.component.ts index a6d6cfe65..1e86789eb 100644 --- a/src/frontend/src/app/shared/checkbox/checkbox.component.ts +++ b/src/frontend/src/app/shared/checkbox/checkbox.component.ts @@ -11,7 +11,7 @@ export class CheckboxComponent implements OnInit { * 需要添加一个lable作为自己的value; */ _value: any = ''; - checked: boolean = false; + checked = false; inputElement: HTMLInputElement; constructor(private el: ElementRef) { diff --git a/src/frontend/src/app/shared/client/v1/apikey.service.ts b/src/frontend/src/app/shared/client/v1/apikey.service.ts index 63b91754a..789fe46d8 100644 --- a/src/frontend/src/app/shared/client/v1/apikey.service.ts +++ b/src/frontend/src/app/shared/client/v1/apikey.service.ts @@ -22,14 +22,14 @@ export class ApiKeyService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -42,7 +42,7 @@ export class ApiKeyService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -78,7 +78,7 @@ export class ApiKeyService { } deleteById(id: number, logical?: boolean, namespaceId?: number, appId?: number): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/app-user.service.ts b/src/frontend/src/app/shared/client/v1/app-user.service.ts index 3a0d78d22..de0a6f765 100644 --- a/src/frontend/src/app/shared/client/v1/app-user.service.ts +++ b/src/frontend/src/app/shared/client/v1/app-user.service.ts @@ -28,18 +28,18 @@ export class AppUserService { break; case 'app': params = params.set('appId', resourceId + ''); - appId = parseInt(resourceId); + appId = parseInt(resourceId, 10); break; } Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -53,7 +53,7 @@ export class AppUserService { } if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name' && pageState.sort.by !== 'user.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http.get(`/api/v1/apps/${appId}/users`, {params: params}) @@ -74,7 +74,7 @@ export class AppUserService { } deleteById(id: number, appId: number): Observable { - let options: any = {}; + const options: any = {}; return this.http.delete(`/api/v1/apps/${appId}/users/${id}`, options) .catch(error => Observable.throw(error)); diff --git a/src/frontend/src/app/shared/client/v1/app.service.ts b/src/frontend/src/app/shared/client/v1/app.service.ts index 9f20ab6b7..e0d996b57 100644 --- a/src/frontend/src/app/shared/client/v1/app.service.ts +++ b/src/frontend/src/app/shared/client/v1/app.service.ts @@ -25,15 +25,15 @@ export class AppService { params = params.set('sortby', '-id'); // query param Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -47,7 +47,7 @@ export class AppService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -64,7 +64,7 @@ export class AppService { if ((typeof (namespaceId) === 'undefined') || (!namespaceId)) { namespaceId = 0; } - let options: any = {}; + const options: any = {}; if (appId != null) { let params = new HttpParams(); params = params.set('app_id', appId + ''); @@ -101,7 +101,7 @@ export class AppService { } deleteById(id: number, namespaceId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/auditlog.service.ts b/src/frontend/src/app/shared/client/v1/auditlog.service.ts index 39b6ac00b..880027315 100644 --- a/src/frontend/src/app/shared/client/v1/auditlog.service.ts +++ b/src/frontend/src/app/shared/client/v1/auditlog.service.ts @@ -14,14 +14,14 @@ export class AuditLogService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -35,7 +35,7 @@ export class AuditLogService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } diff --git a/src/frontend/src/app/shared/client/v1/autoscale.service.ts b/src/frontend/src/app/shared/client/v1/autoscale.service.ts index 18bb81661..9374507d4 100644 --- a/src/frontend/src/app/shared/client/v1/autoscale.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscale.service.ts @@ -15,7 +15,7 @@ export class AutoscaleService { } // getNames(appId?: number): Observable { - // const params = new HttpParams(); + // let params = new HttpParams(); // if (typeof(appId) === 'undefined') { // appId = 0; // } diff --git a/src/frontend/src/app/shared/client/v1/available-port.service.ts b/src/frontend/src/app/shared/client/v1/available-port.service.ts index 0634f3de1..79295f2d0 100644 --- a/src/frontend/src/app/shared/client/v1/available-port.service.ts +++ b/src/frontend/src/app/shared/client/v1/available-port.service.ts @@ -29,14 +29,14 @@ export class AvailablePortService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -50,7 +50,7 @@ export class AvailablePortService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http diff --git a/src/frontend/src/app/shared/client/v1/breadcrumb.service.ts b/src/frontend/src/app/shared/client/v1/breadcrumb.service.ts index 133f19099..222229d35 100644 --- a/src/frontend/src/app/shared/client/v1/breadcrumb.service.ts +++ b/src/frontend/src/app/shared/client/v1/breadcrumb.service.ts @@ -41,8 +41,8 @@ export class BreadcrumbService { getFriendName(route: string) { let urlInfo: object = new Object(); - let routeEnd = route.substr(route.lastIndexOf('/') + 1, route.length); - let info: any = this.routesFriendlyNames.get(route); + const routeEnd = route.substr(route.lastIndexOf('/') + 1, route.length); + const info: any = this.routesFriendlyNames.get(route); if (info !== undefined) { urlInfo = Object.assign({}, info); } diff --git a/src/frontend/src/app/shared/client/v1/cluster.service.ts b/src/frontend/src/app/shared/client/v1/cluster.service.ts index 2b656d7b7..f17655aa5 100644 --- a/src/frontend/src/app/shared/client/v1/cluster.service.ts +++ b/src/frontend/src/app/shared/client/v1/cluster.service.ts @@ -29,15 +29,15 @@ export class ClusterService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('deleted', deleted); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -51,7 +51,7 @@ export class ClusterService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -75,7 +75,7 @@ export class ClusterService { } deleteByName(name: string, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/config.service.ts b/src/frontend/src/app/shared/client/v1/config.service.ts index 410a98696..0d1129b36 100644 --- a/src/frontend/src/app/shared/client/v1/config.service.ts +++ b/src/frontend/src/app/shared/client/v1/config.service.ts @@ -28,15 +28,15 @@ export class ConfigService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'id') { filterList.push(`${key}=${value}`); @@ -50,7 +50,7 @@ export class ConfigService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -74,7 +74,7 @@ export class ConfigService { } deleteById(id: number): Observable { - let options: any = {}; + const options: any = {}; return this.http .delete(`/api/v1/configs/${id}`, options) diff --git a/src/frontend/src/app/shared/client/v1/configmap.service.ts b/src/frontend/src/app/shared/client/v1/configmap.service.ts index effee861e..737e1d5e3 100644 --- a/src/frontend/src/app/shared/client/v1/configmap.service.ts +++ b/src/frontend/src/app/shared/client/v1/configmap.service.ts @@ -36,14 +36,14 @@ export class ConfigMapService { params = params.set('relate', 'all'); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -57,7 +57,7 @@ export class ConfigMapService { } // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -91,7 +91,7 @@ export class ConfigMapService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts b/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts index ce05b9c77..eb2b9b25c 100644 --- a/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts @@ -26,14 +26,14 @@ export class ConfigMapTplService { } params = params.set('cId', cId === undefined ? '' : cId.toString()); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -46,7 +46,7 @@ export class ConfigMapTplService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -71,7 +71,7 @@ export class ConfigMapTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/cronjob.service.ts b/src/frontend/src/app/shared/client/v1/cronjob.service.ts index 8287f221a..d34f0f77d 100644 --- a/src/frontend/src/app/shared/client/v1/cronjob.service.ts +++ b/src/frontend/src/app/shared/client/v1/cronjob.service.ts @@ -37,15 +37,15 @@ export class CronjobService { params = params.set('appId', appId + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -59,7 +59,7 @@ export class CronjobService { } // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -93,7 +93,7 @@ export class CronjobService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts b/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts index 5aa020439..bdf9bc2fd 100644 --- a/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts @@ -26,14 +26,14 @@ export class CronjobTplService { } params = params.set('cId', cId === undefined ? '' : cId.toString()); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -46,7 +46,7 @@ export class CronjobTplService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -71,7 +71,7 @@ export class CronjobTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/daemonset.service.ts b/src/frontend/src/app/shared/client/v1/daemonset.service.ts index 90315b6dc..2b690408a 100644 --- a/src/frontend/src/app/shared/client/v1/daemonset.service.ts +++ b/src/frontend/src/app/shared/client/v1/daemonset.service.ts @@ -36,15 +36,15 @@ export class DaemonSetService { if (deleted) params = params.set('deleted', deleted); // query param Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -59,7 +59,7 @@ export class DaemonSetService { // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -91,7 +91,7 @@ export class DaemonSetService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts b/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts index 9dc76b7c3..6f7786c49 100644 --- a/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts @@ -22,15 +22,15 @@ export class DaemonSetTplService { params = params.set('pageSize', pageState.page.pageSize + ''); // query param Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -45,7 +45,7 @@ export class DaemonSetTplService { // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -70,7 +70,7 @@ export class DaemonSetTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/deployment.service.ts b/src/frontend/src/app/shared/client/v1/deployment.service.ts index 8b5dc4fad..1782f2e08 100644 --- a/src/frontend/src/app/shared/client/v1/deployment.service.ts +++ b/src/frontend/src/app/shared/client/v1/deployment.service.ts @@ -37,14 +37,14 @@ export class DeploymentService { params = params.set('appId', appId + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -58,7 +58,7 @@ export class DeploymentService { } // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -93,7 +93,7 @@ export class DeploymentService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts index d9e12130d..41b1ab6fb 100644 --- a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts @@ -29,15 +29,15 @@ export class DeploymentTplService { params = params.set('needStatus', needStatus); } Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -50,7 +50,7 @@ export class DeploymentTplService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -74,7 +74,7 @@ export class DeploymentTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/edge-node.service.ts b/src/frontend/src/app/shared/client/v1/edge-node.service.ts index ab52db2f1..7107f5116 100644 --- a/src/frontend/src/app/shared/client/v1/edge-node.service.ts +++ b/src/frontend/src/app/shared/client/v1/edge-node.service.ts @@ -29,14 +29,14 @@ export class EdgeNodeService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -50,7 +50,7 @@ export class EdgeNodeService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http diff --git a/src/frontend/src/app/shared/client/v1/group.service.ts b/src/frontend/src/app/shared/client/v1/group.service.ts index 53cfb2e87..0185a13f4 100644 --- a/src/frontend/src/app/shared/client/v1/group.service.ts +++ b/src/frontend/src/app/shared/client/v1/group.service.ts @@ -24,14 +24,14 @@ export class GroupService { params = params.set('type', type + ''); } Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -45,7 +45,7 @@ export class GroupService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -70,7 +70,7 @@ export class GroupService { } deleteGroup(groupId: number): Observable { - let options: any = {}; + const options: any = {}; return this.http .delete(`/api/v1/groups/${groupId}`, options) diff --git a/src/frontend/src/app/shared/client/v1/ingress.service.ts b/src/frontend/src/app/shared/client/v1/ingress.service.ts index fa1238cfd..bfd6fce86 100644 --- a/src/frontend/src/app/shared/client/v1/ingress.service.ts +++ b/src/frontend/src/app/shared/client/v1/ingress.service.ts @@ -48,7 +48,7 @@ export class IngressService { filterList.push(`${key}__contains=${value}`); } } - }) + }); if (filterList.length) { params = params.set('filter', filterList.join(',')); } @@ -88,7 +88,7 @@ export class IngressService { if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); - options.params = params + options.params = params; } return this.http diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts index daf91dcd6..67b4e3120 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts @@ -31,7 +31,7 @@ export class KubernetesClient { } ListPage(pageState: PageState, cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { - const params = BaseClient.buildParam(pageState); + let params = BaseClient.buildParam(pageState); if ((typeof (appId) === 'undefined') || (!appId)) { appId = '0'; diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts index 3163c694c..82b813a9b 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts @@ -11,7 +11,7 @@ export class DeploymentClient { } listPage(pageState: PageState, cluster: string, namespace: string, appId?: string): Observable { - const params = BaseClient.buildParam(pageState); + let params = BaseClient.buildParam(pageState); if ((typeof (appId) === 'undefined') || (!appId)) { appId = '0'; diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts index 6bee83b6c..f901e1c23 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts @@ -17,7 +17,7 @@ export class NamespaceClient { } listPage(pageState: PageState, cluster: string): Observable { - const params = BaseClient.buildParam(pageState); + let params = BaseClient.buildParam(pageState); return this.http .get(`/api/v1/kubernetes/namespaces/clusters/${cluster}`, {params: params}) .catch(error => Observable.throw(error)); diff --git a/src/frontend/src/app/shared/client/v1/namespace-user.service.ts b/src/frontend/src/app/shared/client/v1/namespace-user.service.ts index 821dbd642..9c369a8d0 100644 --- a/src/frontend/src/app/shared/client/v1/namespace-user.service.ts +++ b/src/frontend/src/app/shared/client/v1/namespace-user.service.ts @@ -28,18 +28,18 @@ export class NamespaceUserService { break; case 'namespace': params = params.set('namespaceId', resourceId + ''); - namespaceId = parseInt(resourceId); + namespaceId = parseInt(resourceId, 10); break; } Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -83,7 +83,7 @@ export class NamespaceUserService { } deleteById(id: number, namespaceId: number): Observable { - let options: any = {}; + const options: any = {}; return this.http.delete(`/api/v1/namespaces/${namespaceId}/users/${id}`, options) .catch(error => Observable.throw(error)); diff --git a/src/frontend/src/app/shared/client/v1/namespace.service.ts b/src/frontend/src/app/shared/client/v1/namespace.service.ts index f3ef071e8..1e5afd379 100644 --- a/src/frontend/src/app/shared/client/v1/namespace.service.ts +++ b/src/frontend/src/app/shared/client/v1/namespace.service.ts @@ -22,14 +22,14 @@ export class NamespaceService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('deleted', deleted); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -43,7 +43,7 @@ export class NamespaceService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -74,7 +74,7 @@ export class NamespaceService { } deleteNamespace(nsId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/permission.service.ts b/src/frontend/src/app/shared/client/v1/permission.service.ts index 06e59febf..60826db6a 100644 --- a/src/frontend/src/app/shared/client/v1/permission.service.ts +++ b/src/frontend/src/app/shared/client/v1/permission.service.ts @@ -21,14 +21,14 @@ export class PermissionService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -41,7 +41,7 @@ export class PermissionService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -65,7 +65,7 @@ export class PermissionService { } deletePermission(permissionId: number): Observable { - let options: any = {}; + const options: any = {}; return this.http .delete(`/api/v1/permissions/${permissionId}`, options) diff --git a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts index b3a7e21e3..9253115a9 100644 --- a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts +++ b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts @@ -40,14 +40,14 @@ export class PersistentVolumeClaimService { params = params.set('relate', 'all'); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -61,7 +61,7 @@ export class PersistentVolumeClaimService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -95,7 +95,7 @@ export class PersistentVolumeClaimService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts b/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts index 5caca3e97..83c9c5d28 100644 --- a/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts @@ -38,14 +38,14 @@ export class PersistentVolumeClaimTplService { params = params.set('pvcId', pvcId); } Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -59,7 +59,7 @@ export class PersistentVolumeClaimTplService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -77,14 +77,14 @@ export class PersistentVolumeClaimTplService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -98,7 +98,7 @@ export class PersistentVolumeClaimTplService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -126,7 +126,7 @@ export class PersistentVolumeClaimTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/public.service.ts b/src/frontend/src/app/shared/client/v1/public.service.ts index 12fbc46df..51a770930 100644 --- a/src/frontend/src/app/shared/client/v1/public.service.ts +++ b/src/frontend/src/app/shared/client/v1/public.service.ts @@ -10,14 +10,14 @@ export class PublicService { } getShellToken(namespace: string, podName: string): Observable { - let headers = new HttpHeaders(); + const headers = new HttpHeaders(); const username = 'publicV1'; const password = 'a1b2c3d4E'; headers.append('Authorization', 'Basic ' + btoa(username + ':' + password)); headers.append('Content-Type', 'application/x-www-form-urlencoded'); const options: any = {'headers': headers}; - let urlSearchParams = new HttpParams(); + const urlSearchParams = new HttpParams(); urlSearchParams.append('namespace', namespace); urlSearchParams.append('podName', podName); return this.http diff --git a/src/frontend/src/app/shared/client/v1/publish.service.ts b/src/frontend/src/app/shared/client/v1/publish.service.ts index 5da0afecb..5c1edeb91 100644 --- a/src/frontend/src/app/shared/client/v1/publish.service.ts +++ b/src/frontend/src/app/shared/client/v1/publish.service.ts @@ -23,15 +23,15 @@ export class PublishService { params = params.set('resourceId', resourceId + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -45,7 +45,7 @@ export class PublishService { } // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } diff --git a/src/frontend/src/app/shared/client/v1/secret.service.ts b/src/frontend/src/app/shared/client/v1/secret.service.ts index 4e365acf7..7f4757e6e 100644 --- a/src/frontend/src/app/shared/client/v1/secret.service.ts +++ b/src/frontend/src/app/shared/client/v1/secret.service.ts @@ -37,14 +37,14 @@ export class SecretService { params = params.set('appId', appId + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -58,7 +58,7 @@ export class SecretService { } // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } if ((typeof (appId) === 'undefined') || (!appId)) { @@ -93,7 +93,7 @@ export class SecretService { deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/secrettpl.service.ts b/src/frontend/src/app/shared/client/v1/secrettpl.service.ts index de5ae41a8..3fa04449d 100644 --- a/src/frontend/src/app/shared/client/v1/secrettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/secrettpl.service.ts @@ -36,14 +36,14 @@ export class SecretTplService { } params = params.set('secretId', secretId === undefined ? '' : secretId.toString()); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -56,7 +56,7 @@ export class SecretTplService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -81,7 +81,7 @@ export class SecretTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/select-copy.service.ts b/src/frontend/src/app/shared/client/v1/select-copy.service.ts index 3737bf3fa..dcea2d493 100644 --- a/src/frontend/src/app/shared/client/v1/select-copy.service.ts +++ b/src/frontend/src/app/shared/client/v1/select-copy.service.ts @@ -7,10 +7,10 @@ import { CopyService } from './copy.service'; export class SelectCopyService implements OnDestroy, AfterViewInit { render: Renderer2; - range: number = 30; + range = 30; globalEventList: Array = new Array(); scrollBoxList: Array = new Array(); - isCopy: boolean = false; + isCopy = false; constructor( @Inject(DOCUMENT) private document: any, @@ -102,9 +102,9 @@ export class SelectCopyService implements OnDestroy, AfterViewInit { const target = event.target; if (this.getSelectText().trim() === '') return; if (this.isButton(target) || this.isCopyButton(target)) return; - let dom = this.render.createElement('div'); + const dom = this.render.createElement('div'); dom.id = 'copy-button'; - let result = this.buttonPosition(event, this.getSelectPosition()); + const result = this.buttonPosition(event, this.getSelectPosition()); dom.style.cssText = `width: 30px;height: 30px; position: fixed;z-index: 1051;left: ${result.left}px; top: ${result.top}px`; dom.innerHTML = ''; this.render.appendChild(this.document.body, dom); diff --git a/src/frontend/src/app/shared/client/v1/statefulset.service.ts b/src/frontend/src/app/shared/client/v1/statefulset.service.ts index c4734f65b..6ce457d5c 100644 --- a/src/frontend/src/app/shared/client/v1/statefulset.service.ts +++ b/src/frontend/src/app/shared/client/v1/statefulset.service.ts @@ -36,15 +36,15 @@ export class StatefulsetService { params = params.set('sortby', '-id'); // query param Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -59,7 +59,7 @@ export class StatefulsetService { // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'app.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -91,7 +91,7 @@ export class StatefulsetService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts b/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts index cb8682060..868420626 100644 --- a/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts @@ -22,15 +22,15 @@ export class StatefulsetTplService { params = params.set('pageSize', pageState.page.pageSize + ''); // query param Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -45,7 +45,7 @@ export class StatefulsetTplService { // sort param if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } @@ -70,7 +70,7 @@ export class StatefulsetTplService { } deleteById(id: number, appId: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); diff --git a/src/frontend/src/app/shared/client/v1/storage.service.ts b/src/frontend/src/app/shared/client/v1/storage.service.ts index 8ac88a20f..e62bf15bb 100644 --- a/src/frontend/src/app/shared/client/v1/storage.service.ts +++ b/src/frontend/src/app/shared/client/v1/storage.service.ts @@ -52,7 +52,7 @@ export class StorageService { if (day === undefined) { day = 100; } - let exp = new Date(); + const exp = new Date(); exp.setTime(exp.getTime() + day * 24 * 60 * 60 * 1000); document.cookie = `${key}=${value};expires=${exp.toUTCString()}`; } diff --git a/src/frontend/src/app/shared/client/v1/tab-drag.service.ts b/src/frontend/src/app/shared/client/v1/tab-drag.service.ts index 545fc07a6..4b6bbf998 100644 --- a/src/frontend/src/app/shared/client/v1/tab-drag.service.ts +++ b/src/frontend/src/app/shared/client/v1/tab-drag.service.ts @@ -8,12 +8,19 @@ import { TipService } from './tip.service'; */ @Injectable() export class TabDragService implements OnDestroy { + // dragenter tab切换 + private tabChange = new Subject(); + tabChangeObservable = this.tabChange.asObservable(); + // dragover + private tabDragOver = new Subject(); + tabDragOverObservable = this.tabDragOver.asObservable(); + target: any; parentNode: any; eventList: Array = new Array(); render: Renderer2; - tabDrag: boolean = false; - ms: number = 150; + tabDrag = false; + ms = 150; repainer: any; // 左右按钮 private controlTrans = new Subject(); @@ -23,18 +30,10 @@ export class TabDragService implements OnDestroy { this.controlTrans.next(direction); } - // dragenter tab切换 - private tabChange = new Subject(); - tabChangeObservable = this.tabChange.asObservable(); - tabChangeEvent(change: boolean) { this.tabChange.next(change); } - // dragover - private tabDragOver = new Subject(); - tabDragOverObservable = this.tabDragOver.asObservable(); - tabDragOverEvent(over: boolean) { this.tabDragOver.next(over); } @@ -95,11 +94,14 @@ export class TabDragService implements OnDestroy { // 组织默认事件可以帮助控制鼠标样式。 evt.preventDefault(); if (this.tabDrag) { - if (this.target.animated) return; + if (this.target.animated) { + return; + } let toElement = this.getBox(evt.target); if (this.isBoxItem(toElement) && toElement !== this.target) { const fromElement = this.target; - toElement = this.isBeforeItem(fromElement, toElement) ? this.getSilbingItem(fromElement, false) : this.getSilbingItem(fromElement, true); + toElement = this.isBeforeItem(fromElement, toElement) ? + this.getSilbingItem(fromElement, false) : this.getSilbingItem(fromElement, true); const fromRect = fromElement.getBoundingClientRect(); const toRect = toElement.getBoundingClientRect(); this.insertElement(toElement, fromElement); @@ -126,7 +128,8 @@ export class TabDragService implements OnDestroy { setTargetCss(target: Element) { this.setCss(target, 'background', '#f2f2f2'); this.setCss(target, 'border-radius', '4px'); - this.setCss(target, 'box-shadow', 'rgb(204, 204, 204) 0px 1px 5px inset, rgb(204, 204, 204) 1px 0px 5px inset, rgba(204, 204, 204, 0.8) -1px 0px 5px inset, rgb(204, 204, 204) -1px 0px 5px inset'); + this.setCss(target, 'box-shadow', 'rgb(204, 204, 204) 0px 1px 5px inset, ' + + 'rgb(204, 204, 204) 1px 0px 5px inset, rgba(204, 204, 204, 0.8) -1px 0px 5px inset, rgb(204, 204, 204) -1px 0px 5px inset'); } resetTargetCss(target: Element): void { @@ -136,7 +139,8 @@ export class TabDragService implements OnDestroy { } insertElement(anotherEl: Element, targetEl: Element): void { - this.render.insertBefore(this.parentNode, targetEl, this.isBeforeItem(targetEl, anotherEl) ? this.getBox(anotherEl).nextElementSibling : this.getBox(anotherEl)); + this.render.insertBefore(this.parentNode, targetEl, this.isBeforeItem(targetEl, anotherEl) ? + this.getBox(anotherEl).nextElementSibling : this.getBox(anotherEl)); } animate(prevRect: any, el: any) { @@ -155,7 +159,7 @@ export class TabDragService implements OnDestroy { } setCss(el, prop, val) { - var style = el && el.style; + const style = el && el.style; if (style) { if (val === void 0) { @@ -178,7 +182,9 @@ export class TabDragService implements OnDestroy { isTabChild(element: any): boolean { while (element.tagName.toLowerCase() !== 'body') { - if (element.tagName.toLowerCase === 'wayne-tab') return true; + if (element.tagName.toLowerCase === 'wayne-tab') { + return true; + } element = element.parentNode; } return false; diff --git a/src/frontend/src/app/shared/client/v1/tip.directive.ts b/src/frontend/src/app/shared/client/v1/tip.directive.ts index f0a22958d..dd5469a7d 100644 --- a/src/frontend/src/app/shared/client/v1/tip.directive.ts +++ b/src/frontend/src/app/shared/client/v1/tip.directive.ts @@ -44,7 +44,7 @@ export class TipDirective implements OnDestroy { @Input() set top(value: number | string) { - if (value || value == '0') { + if (value || value === '0') { this._top = parseInt(value + '', 10); if (this._hover) { this.tipService.close(this._text); @@ -55,7 +55,7 @@ export class TipDirective implements OnDestroy { @Input() set left(value: number | string) { - if (value || value == '0') { + if (value || value === '0') { this._left = parseInt(value + '', 10); if (this._hover) { this.tipService.close(this._text); @@ -72,7 +72,7 @@ export class TipDirective implements OnDestroy { enterEvent() { if (this._text) { const posiInfo = this.element.nativeElement.getClientRects()[0]; - let message = { + const message = { top: this._top ? posiInfo.top + this._top : posiInfo.top, left: this._left ? posiInfo.left + this._left : posiInfo.left, text: this._text diff --git a/src/frontend/src/app/shared/client/v1/tip.service.ts b/src/frontend/src/app/shared/client/v1/tip.service.ts index 410b3100c..9a1dc0125 100644 --- a/src/frontend/src/app/shared/client/v1/tip.service.ts +++ b/src/frontend/src/app/shared/client/v1/tip.service.ts @@ -5,9 +5,9 @@ import { Message } from '../../model/v1/tip'; @Injectable() export class TipService { - dragEvent: boolean = false; + dragEvent = false; private render: Renderer2; - private _enter: boolean = false; + private _enter = false; eventList: Array = new Array(); constructor(rendererFactory: RendererFactory2, @@ -25,9 +25,9 @@ export class TipService { */ if (this.dragEvent) return; if (!message.background) message.background = '#000'; - let tipDiv = this.render.createElement('div'); - let bodyHeight = this.document.querySelector('body').getBoundingClientRect().height; - let span = this.render.createElement('span'); + const tipDiv = this.render.createElement('div'); + const bodyHeight = this.document.querySelector('body').getBoundingClientRect().height; + const span = this.render.createElement('span'); tipDiv.className = 'tip-box'; tipDiv.innerText = message.text.length > 60 ? message.text.slice(0, 60) + '...' : message.text; tipDiv.style = `bottom: ${bodyHeight - message.top + 10}px; left: ${message.left}px; background: ${message.background}`; @@ -65,7 +65,7 @@ export class TipService { }); this.eventList = []; } - let tipDivs = this.document.querySelectorAll('div.tip-box'); + const tipDivs = this.document.querySelectorAll('div.tip-box'); text = text.length > 60 ? text.slice(0, 60) + '...' : text; Array.prototype.slice.call(tipDivs).forEach(item => { if (item.innerText === text) { diff --git a/src/frontend/src/app/shared/client/v1/used-port.service.ts b/src/frontend/src/app/shared/client/v1/used-port.service.ts index 6361914ea..7056f1bf3 100644 --- a/src/frontend/src/app/shared/client/v1/used-port.service.ts +++ b/src/frontend/src/app/shared/client/v1/used-port.service.ts @@ -21,14 +21,14 @@ export class UsedPortService { params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('sortby', '-id'); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -42,7 +42,7 @@ export class UsedPortService { } // sort param if (Object.keys(pageState.sort).length !== 0 && pageState.sort.by !== 'service.name') { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -52,7 +52,7 @@ export class UsedPortService { } deleteById(id: number, logical?: boolean): Observable { - let options: any = {}; + const options: any = {}; if (logical != null) { let params = new HttpParams(); params = params.set('logical', logical + ''); @@ -66,7 +66,7 @@ export class UsedPortService { } deleteByServiceId(serviceId: number): Observable { - let options: any = {}; + const options: any = {}; let params = new HttpParams(); params = params.set('serviceId', serviceId + ''); options.params = params; diff --git a/src/frontend/src/app/shared/client/v1/user.service.ts b/src/frontend/src/app/shared/client/v1/user.service.ts index f38c4a708..8ff68746d 100644 --- a/src/frontend/src/app/shared/client/v1/user.service.ts +++ b/src/frontend/src/app/shared/client/v1/user.service.ts @@ -21,14 +21,14 @@ export class UserService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); Object.getOwnPropertyNames(pageState.params).map(key => { - let value = pageState.params[key]; + const value = pageState.params[key]; if (isNotEmpty(value)) { params = params.set(key, value); } }); - let filterList: Array = []; + const filterList: Array = []; Object.getOwnPropertyNames(pageState.filters).map(key => { - let value = pageState.filters[key]; + const value = pageState.filters[key]; if (isNotEmpty(value)) { if (key === 'deleted' || key === 'id') { filterList.push(`${key}=${value}`); @@ -41,7 +41,7 @@ export class UserService { params = params.set('filter', filterList.join(',')); } if (Object.keys(pageState.sort).length !== 0) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; params = params.set('sortby', sortType); } return this.http @@ -85,7 +85,7 @@ export class UserService { } deleteUser(userId: number): Observable { - let options: any = {}; + const options: any = {}; return this.http .delete(`/api/v1/users/${userId}`, options) diff --git a/src/frontend/src/app/shared/client/v1/webhook.service.ts b/src/frontend/src/app/shared/client/v1/webhook.service.ts index 5fc683787..501896309 100644 --- a/src/frontend/src/app/shared/client/v1/webhook.service.ts +++ b/src/frontend/src/app/shared/client/v1/webhook.service.ts @@ -41,15 +41,17 @@ export class WebHookService { } }); - let filterList: Array = []; + const filterList: Array = []; if ('filters' in pageState) { - for (let key in pageState.filters) { - let value = pageState.filters[key]; - if (isNotEmpty(value)) { - if (key === 'name' || key === 'url') { - filterList.push(`${key}__contains=${value}`); - } else { - filterList.push(`${key}=${value}`); + for (const key in pageState.filters) { + if (pageState.hasOwnProperty(key)) { + const value = pageState.filters[key]; + if (isNotEmpty(value)) { + if (key === 'name' || key === 'url') { + filterList.push(`${key}__contains=${value}`); + } else { + filterList.push(`${key}=${value}`); + } } } } @@ -58,7 +60,7 @@ export class WebHookService { params = params = params.set('filter', filterList.join(',')); } if ('sort' in pageState) { - let sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; + const sortType: any = pageState.sort.reverse ? `-${pageState.sort.by}` : pageState.sort.by; if (sortType) { params = params = params.set('sortby', sortType); } diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index c3113dd45..b06f7eeb5 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -13,7 +13,7 @@ import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../ }) export class ConfirmationDialogComponent implements OnDestroy { - opened: boolean = false; + opened = false; dialogTitle: string = ''; dialogContent: string = ''; message: ConfirmationMessage; @@ -52,8 +52,8 @@ export class ConfirmationDialogComponent implements OnDestroy { return; } - let data: any = this.message.data ? this.message.data : {}; - let target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + const data: any = this.message.data ? this.message.data : {}; + const target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; this.confirmationService.cancel(new ConfirmationAcknowledgement( ConfirmationState.CANCEL, data, @@ -68,8 +68,8 @@ export class ConfirmationDialogComponent implements OnDestroy { return; } - let data: any = this.message.data ? this.message.data : {}; - let target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + const data: any = this.message.data ? this.message.data : {}; + const target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; this.confirmationService.confirm(new ConfirmationAcknowledgement( ConfirmationState.CONFIRMED, data, diff --git a/src/frontend/src/app/shared/dropdown/dropdown.component.html b/src/frontend/src/app/shared/dropdown/dropdown.component.html index 5300f54e8..520db9d99 100644 --- a/src/frontend/src/app/shared/dropdown/dropdown.component.html +++ b/src/frontend/src/app/shared/dropdown/dropdown.component.html @@ -1,7 +1,7 @@
-
diff --git a/src/frontend/src/app/shared/dropdown/dropdown.component.ts b/src/frontend/src/app/shared/dropdown/dropdown.component.ts index 1344c6592..5e964dd19 100644 --- a/src/frontend/src/app/shared/dropdown/dropdown.component.ts +++ b/src/frontend/src/app/shared/dropdown/dropdown.component.ts @@ -29,12 +29,12 @@ import { EventManager } from '@angular/platform-browser'; export class DropDownComponent implements OnInit { - showContent: boolean = false; + showContent = false; right: number | string = 0; width: number | string = 0; - maxHeight: number = 400; - marginRight: number = 0; - barState: string = 'hide'; + maxHeight = 400; + marginRight = 0; + barState = 'hide'; barStyle = { height: 0, top: 0 @@ -45,7 +45,7 @@ export class DropDownComponent implements OnInit { barTopCache: number; eventList: any[] = new Array(); // size 默认为空。如果传入small，则是最小自适应，传入middle，为50%宽度。 - @Input('size') size: string = ''; + @Input('size') size = ''; // 这里是处理当item是最接近右边栏时候。采用right定位，防止出现滚动条。 @Input('last') last; @@ -65,7 +65,12 @@ export class DropDownComponent implements OnInit { @HostListener('mouseenter') enterEvent() { const content = this.document.querySelector('.content-area'); - this.right = this.size === 'small' || this.size === 'middle' ? 0 : -(this.document.body.clientWidth - this.getElementLeft(this.el.nativeElement) - this.el.nativeElement.offsetWidth - (content.scrollHeight > content.clientHeight ? 30 : 15)); + if (this.size === 'small' || this.size === 'middle') { + this.right = 0; + } else { + this.right = -(this.document.body.clientWidth - this.getElementLeft(this.el.nativeElement) + - this.el.nativeElement.offsetWidth - (content.scrollHeight > content.clientHeight ? 30 : 15)); + } this.width = this.size === 'small' ? 'auto' : this.size === 'middle' ? @@ -99,7 +104,9 @@ export class DropDownComponent implements OnInit { } scrollEvent(evt) { - if (Object.prototype.toString.call(this.clickStart) !== '[object Null]') return; + if (Object.prototype.toString.call(this.clickStart) !== '[object Null]') { + return; + } evt.stopPropagation(); const target = evt.target; this.barStyle.top = Number((target.scrollTop / target.clientHeight * 100).toFixed(2)); diff --git a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts index 64d559d05..f902e7d3c 100644 --- a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts +++ b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts @@ -116,9 +116,9 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { * Move all items from available to selected */ moveAllItemsToSelected(): void { - let selectedItems = []; - let leftItems = []; - let reg = new RegExp(this.searchTermAvailable, 'gi'); + const selectedItems = []; + const leftItems = []; + const reg = new RegExp(this.searchTermAvailable, 'gi'); if (!this.availableItems.length) { return; } @@ -148,8 +148,8 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { if (!this.selectedItems.length) { return; } - let selectedItems = []; - let leftItems = []; + const selectedItems = []; + const leftItems = []; this.selectedItems.forEach(item => { if (item.text.indexOf(this.searchTermSelected.toLocaleUpperCase()) > -1) { selectedItems.push(item); diff --git a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts index 8c88861fe..807b30b51 100644 --- a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts @@ -44,10 +44,10 @@ export class FloatWindowItemComponent implements OnInit { } itemEnter(e) { - let item = e.target; - let itemInfo = item.getBoundingClientRect(); + const item = e.target; + const itemInfo = item.getBoundingClientRect(); if (this.tip !== undefined) { - let info = { + const info = { top: itemInfo.top, left: itemInfo.left + 13, text: this.tip diff --git a/src/frontend/src/app/shared/float-window/float-window.component.ts b/src/frontend/src/app/shared/float-window/float-window.component.ts index a459da3b8..9f1635061 100644 --- a/src/frontend/src/app/shared/float-window/float-window.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window.component.ts @@ -56,11 +56,11 @@ export class FloatWindowComponent { @HostListener('mousedown', ['$event']) downEvent(evt) { - let pos = { + const pos = { left: evt.offsetX, top: evt.offsetY }; - let target = this.getBox(evt.target); + const target = this.getBox(evt.target); const shadow = this.document.createElement('div'); shadow.style.cssText = 'position: fixed;width: 100%; height:100vh; z-index: 2; top: 0;'; this.document.body.appendChild(shadow); diff --git a/src/frontend/src/app/shared/footer/footer.component.spec.ts b/src/frontend/src/app/shared/footer/footer.component.spec.ts index 120f2ae36..28069f161 100644 --- a/src/frontend/src/app/shared/footer/footer.component.spec.ts +++ b/src/frontend/src/app/shared/footer/footer.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FooterComponent } from './footer.component'; describe('FooterComponent', () => { - let component: FooterComponent; - let fixture: ComponentFixture; + const component: FooterComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/shared/global-message/message.component.ts b/src/frontend/src/app/shared/global-message/message.component.ts index 65cd97143..71b91825c 100644 --- a/src/frontend/src/app/shared/global-message/message.component.ts +++ b/src/frontend/src/app/shared/global-message/message.component.ts @@ -46,9 +46,9 @@ export class MessageComponent implements OnInit, OnDestroy { msgSub: Subscription; clearSub: Subscription; // box的位置 - posiRight: number = 18; + posiRight = 18; - delayTime: number = 5000; + delayTime = 5000; constructor( private element: ElementRef, diff --git a/src/frontend/src/app/shared/global-message/message.ts b/src/frontend/src/app/shared/global-message/message.ts index 4b33ed061..2fe62d03e 100644 --- a/src/frontend/src/app/shared/global-message/message.ts +++ b/src/frontend/src/app/shared/global-message/message.ts @@ -26,7 +26,7 @@ export class Message { } static newMessage(statusCode: number, message: string, alertType: AlertType): Message { - let m = new Message(); + const m = new Message(); m.statusCode = statusCode; m.message = message; m.alertType = alertType; diff --git a/src/frontend/src/app/shared/input/input.component.ts b/src/frontend/src/app/shared/input/input.component.ts index 6359eeea9..522cc9621 100644 --- a/src/frontend/src/app/shared/input/input.component.ts +++ b/src/frontend/src/app/shared/input/input.component.ts @@ -17,9 +17,9 @@ export class InputComponent implements ControlValueAccessor { updateEmit = (_: any) => { }; value: string; - readOnly: boolean = false; - showSearch: boolean = false; - focusState: boolean = false; + readOnly = false; + showSearch = false; + focusState = false; @ViewChild('input') inputElement; @Input('placeholder') placeholder = ''; @Input('type') type = 'text'; diff --git a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts index 5962baeae..89f337d2d 100644 --- a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts +++ b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts @@ -19,7 +19,7 @@ export class AuthInterceptor implements HttpInterceptor { // HttpHeader object immutable - copy values const headerSettings: { [name: string]: string | string[]; } = {}; - for (const key of request.headers.keys()) { + for (let key of request.headers.keys()) { headerSettings[key] = request.headers.getAll(key); } if (token) { @@ -28,7 +28,7 @@ export class AuthInterceptor implements HttpInterceptor { headerSettings['Content-Type'] = 'application/json'; const newHeader = new HttpHeaders(headerSettings); - let changedRequest = request.clone({ + const changedRequest = request.clone({ headers: newHeader }); return next.handle(changedRequest).toPromise(); diff --git a/src/frontend/src/app/shared/message-handler/message-handler.service.ts b/src/frontend/src/app/shared/message-handler/message-handler.service.ts index 74c0e8718..7a7682df0 100644 --- a/src/frontend/src/app/shared/message-handler/message-handler.service.ts +++ b/src/frontend/src/app/shared/message-handler/message-handler.service.ts @@ -16,10 +16,10 @@ export class MessageHandlerService { if (!error) { return; } - let code = error.statusCode | error.status; + const code = error.statusCode | error.status; console.log(error); if (code === httpStatusCode.Unauthorized) { - let currentUrl = document.location.origin; + const currentUrl = document.location.origin; if (document.location.pathname != '/sign-in') { this.injector.get(Router).navigateByUrl(`sign-in?ref=${document.location.pathname}`); } diff --git a/src/frontend/src/app/shared/modal-operate/modal-operate.component.spec.ts b/src/frontend/src/app/shared/modal-operate/modal-operate.component.spec.ts index f4148501d..9897301bb 100644 --- a/src/frontend/src/app/shared/modal-operate/modal-operate.component.spec.ts +++ b/src/frontend/src/app/shared/modal-operate/modal-operate.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ModalOperateComponent } from './modal-operate.component'; describe('ModalOperateComponent', () => { - let component: ModalOperateComponent; - let fixture: ComponentFixture; + const component: ModalOperateComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/shared/model/v1/cronjobtpl.ts b/src/frontend/src/app/shared/model/v1/cronjobtpl.ts index c416fa67e..0daaf8427 100644 --- a/src/frontend/src/app/shared/model/v1/cronjobtpl.ts +++ b/src/frontend/src/app/shared/model/v1/cronjobtpl.ts @@ -35,7 +35,7 @@ export class CronjobStatus { } static fromPublishStatus(state: PublishStatus) { - let dStatus = new CronjobStatus(); + const dStatus = new CronjobStatus(); dStatus.id = state.id; dStatus.cronjobId = state.resourceId; dStatus.templateId = state.templateId; diff --git a/src/frontend/src/app/shared/model/v1/deploymenttpl.ts b/src/frontend/src/app/shared/model/v1/deploymenttpl.ts index cd32717ad..8ec79fd0d 100644 --- a/src/frontend/src/app/shared/model/v1/deploymenttpl.ts +++ b/src/frontend/src/app/shared/model/v1/deploymenttpl.ts @@ -33,7 +33,7 @@ export class DeploymentStatus { } static fromPublishStatus(state: PublishStatus) { - let dStatus = new DeploymentStatus(); + const dStatus = new DeploymentStatus(); dStatus.id = state.id; dStatus.deploymentId = state.resourceId; dStatus.templateId = state.templateId; diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts index e18cbd857..8eec9e9b1 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts @@ -85,7 +85,7 @@ export class DaemonEndpoint { constructor(init?: DaemonEndpoint) { if (!init) { return; } - if (init.port) { this.port = init.port; } + if (init.Port) { this.Port = init.Port; } } @@ -486,7 +486,9 @@ export class Time { constructor(init?: Time) { if (!init) { return; } - if (init.Time) this.Time = new Date(init.Time as any); + if (init.Time) { + this.Time = new Date(init.Time as any); + } } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts index decc1c375..8665513b3 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts @@ -295,8 +295,12 @@ export class PodAntiAffinity { constructor(init?: PodAntiAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -356,8 +360,12 @@ export class PodAffinity { constructor(init?: PodAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -450,8 +458,12 @@ export class NodeAffinity { constructor(init?: NodeAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -681,7 +693,7 @@ export class IntOrString { constructor(init?: IntOrString) { if (!init) { return; } - if (init.type) { this.type = init.type; } + if (init.Type) { this.Type = init.Type; } if (init.IntVal) { this.IntVal = init.IntVal; } if (init.StrVal) { this.StrVal = init.StrVal; } } diff --git a/src/frontend/src/app/shared/paginate/paginate.component.spec.ts b/src/frontend/src/app/shared/paginate/paginate.component.spec.ts index 0d2f89433..88fb6078d 100644 --- a/src/frontend/src/app/shared/paginate/paginate.component.spec.ts +++ b/src/frontend/src/app/shared/paginate/paginate.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PaginateComponent } from './paginate.component'; describe('PaginateComponent', () => { - let component: PaginateComponent; - let fixture: ComponentFixture; + const component: PaginateComponent; + const fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/src/frontend/src/app/shared/select/select.component.ts b/src/frontend/src/app/shared/select/select.component.ts index 5b608b7b6..36e221f6d 100644 --- a/src/frontend/src/app/shared/select/select.component.ts +++ b/src/frontend/src/app/shared/select/select.component.ts @@ -144,7 +144,7 @@ export class SelectComponent implements OnInit, AfterViewInit, ControlValueAcces this._filterValue = value; if (this.search) { this._options.forEach(item => { - if (value === null || value === undefined || item.el.nativeElement.innerText.indexOf(value) > -1) { + if (value == null || value === undefined || item.el.nativeElement.innerText.indexOf(value) > -1) { item.el.nativeElement.classList.remove('hide'); } else { item.el.nativeElement.classList.add('hide'); @@ -236,7 +236,7 @@ export class SelectComponent implements OnInit, AfterViewInit, ControlValueAcces } setActive(value: string) { - if (value === null) { + if (value == null) { return; } const textList = new Set(); diff --git a/src/frontend/src/app/shared/utils.ts b/src/frontend/src/app/shared/utils.ts index bbf2087e6..d017d1b55 100644 --- a/src/frontend/src/app/shared/utils.ts +++ b/src/frontend/src/app/shared/utils.ts @@ -45,7 +45,7 @@ export function mergeDeep(target, ...sources) { const source = sources.shift(); if (isObject(target) && isObject(source)) { - for (const key in source) { + for (let key in source) { if (isObject(source[key])) { if (!target[key]) { Object.assign(target, {[key]: {}}); From 68b2c2aeb93044465c387d36710fc3834e11196a Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 11 Jan 2019 16:17:44 +0800 Subject: [PATCH 004/112] frontend:remove //[end] --- .../app/shared/model/v1/kubernetes/cronjob.ts | 2 +- .../shared/model/v1/kubernetes/deployment.ts | 372 +++++++++--------- .../src/app/shared/model/v1/kubernetes/job.ts | 360 ++++++++--------- .../model/v1/kubernetes/persistentvolume.ts | 136 +++---- .../v1/kubernetes/persistentvolumeclaim.ts | 60 --- .../src/app/shared/model/v1/kubernetes/pod.ts | 4 - .../app/shared/model/v1/kubernetes/secret.ts | 20 - 7 files changed, 435 insertions(+), 519 deletions(-) diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts b/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts index 1d6de5af1..80c2f4d7f 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/cronjob.ts @@ -497,7 +497,7 @@ export class Quantity { - //[end] + } export class EmptyDirVolumeSource { diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts b/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts index 93f33b13a..f7a073a65 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/deployment.ts @@ -8,10 +8,10 @@ export class DeploymentCondition { lastTransitionTime: Time; reason: string; message: string; - //[DeploymentCondition:] - //[end] + + } export class DeploymentStatus { @@ -23,46 +23,46 @@ export class DeploymentStatus { unavailableReplicas: number; conditions: DeploymentCondition[]; collisionCount: number; - //[DeploymentStatus:] - //[end] + + } export class RollbackConfig { revision: number; - //[RollbackConfig:] - //[end] + + } export class RollingUpdateDeployment { maxUnavailable: IntOrString; maxSurge: IntOrString; - //[RollingUpdateDeployment:] - //[end] + + } export class DeploymentStrategy { type: string; rollingUpdate: RollingUpdateDeployment; - //[DeploymentStrategy:] - //[end] + + } export class HostAlias { ip: string; hostnames: string[]; - //[HostAlias:] - //[end] + + } export class Toleration { @@ -71,102 +71,102 @@ export class Toleration { value: string; effect: string; tolerationSeconds: number; - //[Toleration:] - //[end] + + } export class PodAntiAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAntiAffinity:] - //[end] + + } export class WeightedPodAffinityTerm { weight: number; podAffinityTerm: PodAffinityTerm; - //[WeightedPodAffinityTerm:] - //[end] + + } export class PodAffinityTerm { labelSelector: LabelSelector; namespaces: string[]; topologyKey: string; - //[PodAffinityTerm:] - //[end] + + } export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAffinity:] - //[end] + + } export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; - //[PreferredSchedulingTerm:] - //[end] + + } export class NodeSelectorRequirement { key: string; operator: string; values: string[]; - //[NodeSelectorRequirement:] - //[end] + + } export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; - //[NodeSelectorTerm:] - //[end] + + } export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; - //[NodeSelector:] - //[end] + + } export class NodeAffinity { requiredDuringSchedulingIgnoredDuringExecution: NodeSelector; preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; - //[NodeAffinity:] - //[end] + + } export class Affinity { nodeAffinity: NodeAffinity; podAffinity: PodAffinity; podAntiAffinity: PodAntiAffinity; - //[Affinity:] - //[end] + + } @@ -176,10 +176,10 @@ export class PodSecurityContext { runAsNonRoot: boolean; supplementalGroups: number[]; fsGroup: number; - //[PodSecurityContext:] - //[end] + + } export class SELinuxOptions { @@ -187,19 +187,19 @@ export class SELinuxOptions { role: string; type: string; level: string; - //[SELinuxOptions:] - //[end] + + } export class Capabilities { add: string[]; drop: string[]; - //[Capabilities:] - //[end] + + } export class SecurityContext { @@ -209,10 +209,10 @@ export class SecurityContext { runAsUser: number; runAsNonRoot: boolean; readOnlyRootFilesystem: boolean; - //[SecurityContext:] - //[end] + + } @@ -222,47 +222,47 @@ export class Handler { exec: ExecAction; httpGet: HTTPGetAction; tcpSocket: TCPSocketAction; - //[Handler:] - //[end] + + } export class Lifecycle { postStart: Handler; preStop: Handler; - //[Lifecycle:] + constructor() { } - //[end] + } export class TCPSocketAction { port: IntOrString; host: string; - //[TCPSocketAction:] - //[end] + + } export class HTTPHeader { name: string; value: string; - //[HTTPHeader:] - //[end] + + } export class IntOrString { - //[IntOrString:] - //[end] + + } export class HTTPGetAction { @@ -271,18 +271,18 @@ export class HTTPGetAction { host: string; scheme: string; httpHeaders: HTTPHeader[]; - //[HTTPGetAction:] - //[end] + + } export class ExecAction { command: string[]; - //[ExecAction:] - //[end] + + } export class Probe { @@ -294,10 +294,10 @@ export class Probe { periodSeconds: number; successThreshold: number; failureThreshold: number; - //[Probe:] - //[end] + + } export class VolumeMount { @@ -305,17 +305,17 @@ export class VolumeMount { readOnly: boolean; mountPath: string; subPath: string; - //[VolumeMount:] - //[end] + + } export class ResourceRequirements { limits?: { [key: string]: any }; requests?: { [key: string]: any }; - //[ResourceRequirements:] + constructor(init?: ResourceRequirements) { if (!init) { return; } @@ -330,27 +330,27 @@ export class ResourceRequirements { return result; } - //[end] + } export class SecretKeySelector { name: string; key: string; optional: boolean; - //[SecretKeySelector:] - //[end] + + } export class ConfigMapKeySelector { name: string; key: string; optional: boolean; - //[ConfigMapKeySelector:] - //[end] + + } @@ -359,48 +359,48 @@ export class EnvVarSource { resourceFieldRef: ResourceFieldSelector; configMapKeyRef: ConfigMapKeySelector; secretKeyRef: SecretKeySelector; - //[EnvVarSource:] - //[end] + + } export class EnvVar { name: string; value: string; valueFrom: EnvVarSource; - //[EnvVar:] - //[end] + + } export class SecretEnvSource { name: string; optional: boolean; - //[SecretEnvSource:] - //[end] + + } export class ConfigMapEnvSource { name: string; optional: boolean; - //[ConfigMapEnvSource:] - //[end] + + } export class EnvFromSource { prefix: string; configMapRef: ConfigMapEnvSource; secretRef: SecretEnvSource; - //[EnvFromSource:] - //[end] + + } export class ContainerPort { @@ -409,10 +409,10 @@ export class ContainerPort { containerPort: number; protocol: string; hostIP: string; - //[ContainerPort:] - //[end] + + } export class Container { @@ -436,10 +436,10 @@ export class Container { stdin: boolean; stdinOnce: boolean; tty: boolean; - //[Container:] - //[end] + + } export class StorageOSVolumeSource { @@ -448,10 +448,10 @@ export class StorageOSVolumeSource { fsType: string; readOnly: boolean; secretRef: LocalObjectReference; - //[StorageOSVolumeSource:] - //[end] + + } export class ScaleIOVolumeSource { @@ -465,76 +465,76 @@ export class ScaleIOVolumeSource { volumeName: string; fsType: string; readOnly: boolean; - //[ScaleIOVolumeSource:] - //[end] + + } export class PortworxVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[PortworxVolumeSource:] - //[end] + + } export class ConfigMapProjection { name: string; items: KeyToPath[]; optional: boolean; - //[ConfigMapProjection:] - //[end] + + } export class DownwardAPIProjection { items: DownwardAPIVolumeFile[]; - //[DownwardAPIProjection:] - //[end] + + } export class SecretProjection { name: string; items: KeyToPath[]; optional: boolean; - //[SecretProjection:] - //[end] + + } export class VolumeProjection { secret: SecretProjection; downwardAPI: DownwardAPIProjection; configMap: ConfigMapProjection; - //[VolumeProjection:] - //[end] + + } export class ProjectedVolumeSource { sources: VolumeProjection[]; defaultMode: number; - //[ProjectedVolumeSource:] - //[end] + + } export class PhotonPersistentDiskVolumeSource { pdID: string; fsType: string; - //[PhotonPersistentDiskVolumeSource:] - //[end] + + } export class AzureDiskVolumeSource { @@ -544,10 +544,10 @@ export class AzureDiskVolumeSource { fsType: string; readOnly: boolean; kind: string; - //[AzureDiskVolumeSource:] - //[end] + + } export class QuobyteVolumeSource { @@ -556,10 +556,10 @@ export class QuobyteVolumeSource { readOnly: boolean; user: string; group: string; - //[QuobyteVolumeSource:] - //[end] + + } export class VsphereVirtualDiskVolumeSource { @@ -567,10 +567,10 @@ export class VsphereVirtualDiskVolumeSource { fsType: string; storagePolicyName: string; storagePolicyID: string; - //[VsphereVirtualDiskVolumeSource:] - //[end] + + } export class ConfigMapVolumeSource { @@ -578,20 +578,20 @@ export class ConfigMapVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[ConfigMapVolumeSource:] - //[end] + + } export class AzureFileVolumeSource { secretName: string; shareName: string; readOnly: boolean; - //[AzureFileVolumeSource:] - //[end] + + } export class FCVolumeSource { @@ -599,29 +599,29 @@ export class FCVolumeSource { lun: number; fsType: string; readOnly: boolean; - //[FCVolumeSource:] - //[end] + + } export class ResourceFieldSelector { containerName: string; resource: string; divisor: Quantity; - //[ResourceFieldSelector:] - //[end] + + } export class ObjectFieldSelector { apiVersion: string; fieldPath: string; - //[ObjectFieldSelector:] - //[end] + + } export class DownwardAPIVolumeFile { @@ -629,28 +629,28 @@ export class DownwardAPIVolumeFile { fieldRef: ObjectFieldSelector; resourceFieldRef: ResourceFieldSelector; mode: number; - //[DownwardAPIVolumeFile:] - //[end] + + } export class DownwardAPIVolumeSource { items: DownwardAPIVolumeFile[]; defaultMode: number; - //[DownwardAPIVolumeSource:] - //[end] + + } export class FlockerVolumeSource { datasetName: string; datasetUUID: string; - //[FlockerVolumeSource:] - //[end] + + } export class CephFSVolumeSource { @@ -660,20 +660,20 @@ export class CephFSVolumeSource { secretFile: string; secretRef: LocalObjectReference; readOnly: boolean; - //[CephFSVolumeSource:] - //[end] + + } export class CinderVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[CinderVolumeSource:] - //[end] + + } export class FlexVolumeSource { @@ -682,10 +682,10 @@ export class FlexVolumeSource { secretRef: LocalObjectReference; readOnly: boolean; options: {}; - //[FlexVolumeSource:] - //[end] + + } export class RBDVolumeSource { @@ -697,37 +697,37 @@ export class RBDVolumeSource { keyring: string; secretRef: LocalObjectReference; readOnly: boolean; - //[RBDVolumeSource:] - //[end] + + } export class PersistentVolumeClaimVolumeSource { claimName: string; readOnly: boolean; - //[PersistentVolumeClaimVolumeSource:] - //[end] + + } export class GlusterfsVolumeSource { endpoints: string; path: string; readOnly: boolean; - //[GlusterfsVolumeSource:] - //[end] + + } export class LocalObjectReference { name: string; - //[LocalObjectReference:] - //[end] + + } export class ISCSIVolumeSource { @@ -741,30 +741,30 @@ export class ISCSIVolumeSource { chapAuthDiscovery: boolean; chapAuthSession: boolean; secretRef: LocalObjectReference; - //[ISCSIVolumeSource:] - //[end] + + } export class NFSVolumeSource { server: string; path: string; readOnly: boolean; - //[NFSVolumeSource:] - //[end] + + } export class KeyToPath { key: string; path: string; mode: number; - //[KeyToPath:] - //[end] + + } export class SecretVolumeSource { @@ -772,20 +772,20 @@ export class SecretVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[SecretVolumeSource:] - //[end] + + } export class GitRepoVolumeSource { repository: string; revision: string; directory: string; - //[GitRepoVolumeSource:] - //[end] + + } export class AWSElasticBlockStoreVolumeSource { @@ -793,10 +793,10 @@ export class AWSElasticBlockStoreVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[AWSElasticBlockStoreVolumeSource:] - //[end] + + } export class GCEPersistentDiskVolumeSource { @@ -804,34 +804,34 @@ export class GCEPersistentDiskVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[GCEPersistentDiskVolumeSource:] - //[end] + + } export class Quantity { - //[Quantity:] - //[end] + + } export class EmptyDirVolumeSource { medium: string; sizeLimit: Quantity; - //[EmptyDirVolumeSource:] - //[end] + + } export class HostPathVolumeSource { path: string; - //[HostPathVolumeSource:] - //[end] + + } export class Volume { @@ -863,10 +863,10 @@ export class Volume { portworxVolume: PortworxVolumeSource; scaleIO: ScaleIOVolumeSource; storageos: StorageOSVolumeSource; - //[Volume:] - //[end] + + } export class PodSpec { @@ -893,38 +893,38 @@ export class PodSpec { schedulerName: string; tolerations: Toleration[]; hostAliases: HostAlias[]; - //[PodSpec:] - //[end] + + } export class PodTemplateSpec { metadata: ObjectMeta; spec: PodSpec; - //[PodTemplateSpec:] - //[end] + + } export class LabelSelectorRequirement { key: string; operator: string; values: string[]; - //[LabelSelectorRequirement:] - //[end] + + } export class LabelSelector { matchLabels: {}; matchExpressions: LabelSelectorRequirement[]; - //[LabelSelector:] - //[end] + + } export class DeploymentSpec { @@ -937,20 +937,20 @@ export class DeploymentSpec { paused: boolean; rollbackTo: RollbackConfig; progressDeadlineSeconds: number; - //[DeploymentSpec:] - //[end] + + } export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - //[end] + + } export class StatusDetails { @@ -960,19 +960,19 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - //[end] + + } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - //[end] + + } export class Status { @@ -984,27 +984,27 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - //[end] + + } export class Initializer { name: string; - //[Initializer:] - //[end] + + } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - //[end] + + } export class OwnerReference { @@ -1014,17 +1014,17 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - //[end] + + } export class Time { - //[Time:] - //[end] + + } export class ObjectMeta { @@ -1044,10 +1044,10 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - //[end] + + } export class KubeDeployment { @@ -1056,8 +1056,8 @@ export class KubeDeployment { metadata: ObjectMeta; spec: DeploymentSpec; status: DeploymentStatus; - //[Deployment:] - //[end] + + } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/job.ts b/src/frontend/src/app/shared/model/v1/kubernetes/job.ts index 0b8c4da7f..41b2cc54e 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/job.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/job.ts @@ -8,10 +8,10 @@ export class JobCondition { lastTransitionTime: Time; reason: string; message: string; - //[JobCondition:] - //[end] + + } export class JobStatus { @@ -21,19 +21,19 @@ export class JobStatus { active: number; succeeded: number; failed: number; - //[JobStatus:] - //[end] + + } export class HostAlias { ip: string; hostnames: string[]; - //[HostAlias:] - //[end] + + } export class Toleration { @@ -42,102 +42,102 @@ export class Toleration { value: string; effect: string; tolerationSeconds: number; - //[Toleration:] - //[end] + + } export class PodAntiAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAntiAffinity:] - //[end] + + } export class WeightedPodAffinityTerm { weight: number; podAffinityTerm: PodAffinityTerm; - //[WeightedPodAffinityTerm:] - //[end] + + } export class PodAffinityTerm { labelSelector: LabelSelector; namespaces: string[]; topologyKey: string; - //[PodAffinityTerm:] - //[end] + + } export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - //[PodAffinity:] - //[end] + + } export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; - //[PreferredSchedulingTerm:] - //[end] + + } export class NodeSelectorRequirement { key: string; operator: string; values: string[]; - //[NodeSelectorRequirement:] - //[end] + + } export class NodeSelectorTerm { matchExpressions: NodeSelectorRequirement[]; - //[NodeSelectorTerm:] - //[end] + + } export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; - //[NodeSelector:] - //[end] + + } export class NodeAffinity { requiredDuringSchedulingIgnoredDuringExecution: NodeSelector; preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; - //[NodeAffinity:] - //[end] + + } export class Affinity { nodeAffinity: NodeAffinity; podAffinity: PodAffinity; podAntiAffinity: PodAntiAffinity; - //[Affinity:] - //[end] + + } @@ -147,10 +147,10 @@ export class PodSecurityContext { runAsNonRoot: boolean; supplementalGroups: number[]; fsGroup: number; - //[PodSecurityContext:] - //[end] + + } export class SELinuxOptions { @@ -158,19 +158,19 @@ export class SELinuxOptions { role: string; type: string; level: string; - //[SELinuxOptions:] - //[end] + + } export class Capabilities { add: string[]; drop: string[]; - //[Capabilities:] - //[end] + + } export class SecurityContext { @@ -180,10 +180,10 @@ export class SecurityContext { runAsUser: number; runAsNonRoot: boolean; readOnlyRootFilesystem: boolean; - //[SecurityContext:] - //[end] + + } @@ -193,45 +193,45 @@ export class Handler { exec: ExecAction; httpGet: HTTPGetAction; tcpSocket: TCPSocketAction; - //[Handler:] - //[end] + + } export class Lifecycle { postStart: Handler; preStop: Handler; - //[Lifecycle:] - //[end] + + } export class TCPSocketAction { port: IntOrString; host: string; - //[TCPSocketAction:] - //[end] + + } export class HTTPHeader { name: string; value: string; - //[HTTPHeader:] - //[end] + + } export class IntOrString { - //[IntOrString:] - //[end] + + } export class HTTPGetAction { @@ -240,18 +240,18 @@ export class HTTPGetAction { host: string; scheme: string; httpHeaders: HTTPHeader[]; - //[HTTPGetAction:] - //[end] + + } export class ExecAction { command: string[]; - //[ExecAction:] - //[end] + + } export class Probe { @@ -263,10 +263,10 @@ export class Probe { periodSeconds: number; successThreshold: number; failureThreshold: number; - //[Probe:] - //[end] + + } export class VolumeMount { @@ -274,39 +274,39 @@ export class VolumeMount { readOnly: boolean; mountPath: string; subPath: string; - //[VolumeMount:] - //[end] + + } export class ResourceRequirements { limits: {}; requests: {}; - //[ResourceRequirements:] - //[end] + + } export class SecretKeySelector { name: string; key: string; optional: boolean; - //[SecretKeySelector:] - //[end] + + } export class ConfigMapKeySelector { name: string; key: string; optional: boolean; - //[ConfigMapKeySelector:] - //[end] + + } @@ -315,48 +315,48 @@ export class EnvVarSource { resourceFieldRef: ResourceFieldSelector; configMapKeyRef: ConfigMapKeySelector; secretKeyRef: SecretKeySelector; - //[EnvVarSource:] - //[end] + + } export class EnvVar { name: string; value: string; valueFrom: EnvVarSource; - //[EnvVar:] - //[end] + + } export class SecretEnvSource { name: string; optional: boolean; - //[SecretEnvSource:] - //[end] + + } export class ConfigMapEnvSource { name: string; optional: boolean; - //[ConfigMapEnvSource:] - //[end] + + } export class EnvFromSource { prefix: string; configMapRef: ConfigMapEnvSource; secretRef: SecretEnvSource; - //[EnvFromSource:] - //[end] + + } export class ContainerPort { @@ -365,10 +365,10 @@ export class ContainerPort { containerPort: number; protocol: string; hostIP: string; - //[ContainerPort:] - //[end] + + } export class Container { @@ -392,10 +392,10 @@ export class Container { stdin: boolean; stdinOnce: boolean; tty: boolean; - //[Container:] - //[end] + + } export class StorageOSVolumeSource { @@ -404,10 +404,10 @@ export class StorageOSVolumeSource { fsType: string; readOnly: boolean; secretRef: LocalObjectReference; - //[StorageOSVolumeSource:] - //[end] + + } export class ScaleIOVolumeSource { @@ -421,76 +421,76 @@ export class ScaleIOVolumeSource { volumeName: string; fsType: string; readOnly: boolean; - //[ScaleIOVolumeSource:] - //[end] + + } export class PortworxVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[PortworxVolumeSource:] - //[end] + + } export class ConfigMapProjection { name: string; items: KeyToPath[]; optional: boolean; - //[ConfigMapProjection:] - //[end] + + } export class DownwardAPIProjection { items: DownwardAPIVolumeFile[]; - //[DownwardAPIProjection:] - //[end] + + } export class SecretProjection { name: string; items: KeyToPath[]; optional: boolean; - //[SecretProjection:] - //[end] + + } export class VolumeProjection { secret: SecretProjection; downwardAPI: DownwardAPIProjection; configMap: ConfigMapProjection; - //[VolumeProjection:] - //[end] + + } export class ProjectedVolumeSource { sources: VolumeProjection[]; defaultMode: number; - //[ProjectedVolumeSource:] - //[end] + + } export class PhotonPersistentDiskVolumeSource { pdID: string; fsType: string; - //[PhotonPersistentDiskVolumeSource:] - //[end] + + } export class AzureDiskVolumeSource { @@ -500,10 +500,10 @@ export class AzureDiskVolumeSource { fsType: string; readOnly: boolean; kind: string; - //[AzureDiskVolumeSource:] - //[end] + + } export class QuobyteVolumeSource { @@ -512,10 +512,10 @@ export class QuobyteVolumeSource { readOnly: boolean; user: string; group: string; - //[QuobyteVolumeSource:] - //[end] + + } export class VsphereVirtualDiskVolumeSource { @@ -523,10 +523,10 @@ export class VsphereVirtualDiskVolumeSource { fsType: string; storagePolicyName: string; storagePolicyID: string; - //[VsphereVirtualDiskVolumeSource:] - //[end] + + } export class ConfigMapVolumeSource { @@ -534,20 +534,20 @@ export class ConfigMapVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[ConfigMapVolumeSource:] - //[end] + + } export class AzureFileVolumeSource { secretName: string; shareName: string; readOnly: boolean; - //[AzureFileVolumeSource:] - //[end] + + } export class FCVolumeSource { @@ -555,29 +555,29 @@ export class FCVolumeSource { lun: number; fsType: string; readOnly: boolean; - //[FCVolumeSource:] - //[end] + + } export class ResourceFieldSelector { containerName: string; resource: string; divisor: Quantity; - //[ResourceFieldSelector:] - //[end] + + } export class ObjectFieldSelector { apiVersion: string; fieldPath: string; - //[ObjectFieldSelector:] - //[end] + + } export class DownwardAPIVolumeFile { @@ -585,28 +585,28 @@ export class DownwardAPIVolumeFile { fieldRef: ObjectFieldSelector; resourceFieldRef: ResourceFieldSelector; mode: number; - //[DownwardAPIVolumeFile:] - //[end] + + } export class DownwardAPIVolumeSource { items: DownwardAPIVolumeFile[]; defaultMode: number; - //[DownwardAPIVolumeSource:] - //[end] + + } export class FlockerVolumeSource { datasetName: string; datasetUUID: string; - //[FlockerVolumeSource:] - //[end] + + } export class CephFSVolumeSource { @@ -616,20 +616,20 @@ export class CephFSVolumeSource { secretFile: string; secretRef: LocalObjectReference; readOnly: boolean; - //[CephFSVolumeSource:] - //[end] + + } export class CinderVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[CinderVolumeSource:] - //[end] + + } export class FlexVolumeSource { @@ -638,10 +638,10 @@ export class FlexVolumeSource { secretRef: LocalObjectReference; readOnly: boolean; options: {}; - //[FlexVolumeSource:] - //[end] + + } export class RBDVolumeSource { @@ -653,37 +653,37 @@ export class RBDVolumeSource { keyring: string; secretRef: LocalObjectReference; readOnly: boolean; - //[RBDVolumeSource:] - //[end] + + } export class PersistentVolumeClaimVolumeSource { claimName: string; readOnly: boolean; - //[PersistentVolumeClaimVolumeSource:] - //[end] + + } export class GlusterfsVolumeSource { endpoints: string; path: string; readOnly: boolean; - //[GlusterfsVolumeSource:] - //[end] + + } export class LocalObjectReference { name: string; - //[LocalObjectReference:] - //[end] + + } export class ISCSIVolumeSource { @@ -697,30 +697,30 @@ export class ISCSIVolumeSource { chapAuthDiscovery: boolean; chapAuthSession: boolean; secretRef: LocalObjectReference; - //[ISCSIVolumeSource:] - //[end] + + } export class NFSVolumeSource { server: string; path: string; readOnly: boolean; - //[NFSVolumeSource:] - //[end] + + } export class KeyToPath { key: string; path: string; mode: number; - //[KeyToPath:] - //[end] + + } export class SecretVolumeSource { @@ -728,20 +728,20 @@ export class SecretVolumeSource { items: KeyToPath[]; defaultMode: number; optional: boolean; - //[SecretVolumeSource:] - //[end] + + } export class GitRepoVolumeSource { repository: string; revision: string; directory: string; - //[GitRepoVolumeSource:] - //[end] + + } export class AWSElasticBlockStoreVolumeSource { @@ -749,10 +749,10 @@ export class AWSElasticBlockStoreVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[AWSElasticBlockStoreVolumeSource:] - //[end] + + } export class GCEPersistentDiskVolumeSource { @@ -760,34 +760,34 @@ export class GCEPersistentDiskVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[GCEPersistentDiskVolumeSource:] - //[end] + + } export class Quantity { - //[Quantity:] - //[end] + + } export class EmptyDirVolumeSource { medium: string; sizeLimit: Quantity; - //[EmptyDirVolumeSource:] - //[end] + + } export class HostPathVolumeSource { path: string; - //[HostPathVolumeSource:] - //[end] + + } export class Volume { @@ -819,10 +819,10 @@ export class Volume { portworxVolume: PortworxVolumeSource; scaleIO: ScaleIOVolumeSource; storageos: StorageOSVolumeSource; - //[Volume:] - //[end] + + } export class PodSpec { @@ -849,38 +849,38 @@ export class PodSpec { schedulerName: string; tolerations: Toleration[]; hostAliases: HostAlias[]; - //[PodSpec:] - //[end] + + } export class PodTemplateSpec { metadata: ObjectMeta; spec: PodSpec; - //[PodTemplateSpec:] - //[end] + + } export class LabelSelectorRequirement { key: string; operator: string; values: string[]; - //[LabelSelectorRequirement:] - //[end] + + } export class LabelSelector { matchLabels: {}; matchExpressions: LabelSelectorRequirement[]; - //[LabelSelector:] - //[end] + + } export class JobSpec { @@ -890,20 +890,20 @@ export class JobSpec { selector: LabelSelector; manualSelector: boolean; template: PodTemplateSpec; - //[JobSpec:] - //[end] + + } export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - //[end] + + } export class StatusDetails { @@ -913,19 +913,19 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - //[end] + + } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - //[end] + + } export class Status { @@ -937,27 +937,27 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - //[end] + + } export class Initializer { name: string; - //[Initializer:] - //[end] + + } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - //[end] + + } export class OwnerReference { @@ -967,17 +967,17 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - //[end] + + } export class Time { - //[Time:] - //[end] + + } export class ObjectMeta { @@ -997,10 +997,10 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - //[end] + + } export class KubeJob { @@ -1009,8 +1009,8 @@ export class KubeJob { metadata: ObjectMeta; spec: JobSpec; status: JobStatus; - //[Job:] - //[end] + + } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolume.ts b/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolume.ts index 7e7c91915..1a73545db 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolume.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolume.ts @@ -5,10 +5,10 @@ export class PersistentVolumeStatus { phase: string; message: string; reason: string; - //[PersistentVolumeStatus:] - //[end] + + } export class ObjectReference { @@ -19,10 +19,10 @@ export class ObjectReference { apiVersion: string; resourceVersion: string; fieldPath: string; - //[ObjectReference:] - //[end] + + } export class StorageOSPersistentVolumeSource { @@ -31,18 +31,18 @@ export class StorageOSPersistentVolumeSource { fsType: string; readOnly: boolean; secretRef: ObjectReference; - //[StorageOSPersistentVolumeSource:] - //[end] + + } export class LocalVolumeSource { path: string; - //[LocalVolumeSource:] - //[end] + + } export class ScaleIOVolumeSource { @@ -56,29 +56,29 @@ export class ScaleIOVolumeSource { volumeName: string; fsType: string; readOnly: boolean; - //[ScaleIOVolumeSource:] - //[end] + + } export class PortworxVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[PortworxVolumeSource:] - //[end] + + } export class PhotonPersistentDiskVolumeSource { pdID: string; fsType: string; - //[PhotonPersistentDiskVolumeSource:] - //[end] + + } export class AzureDiskVolumeSource { @@ -88,10 +88,10 @@ export class AzureDiskVolumeSource { fsType: string; readOnly: boolean; kind: string; - //[AzureDiskVolumeSource:] - //[end] + + } export class QuobyteVolumeSource { @@ -100,10 +100,10 @@ export class QuobyteVolumeSource { readOnly: boolean; user: string; group: string; - //[QuobyteVolumeSource:] - //[end] + + } export class VsphereVirtualDiskVolumeSource { @@ -111,20 +111,20 @@ export class VsphereVirtualDiskVolumeSource { fsType: string; storagePolicyName: string; storagePolicyID: string; - //[VsphereVirtualDiskVolumeSource:] - //[end] + + } export class AzureFileVolumeSource { secretName: string; shareName: string; readOnly: boolean; - //[AzureFileVolumeSource:] - //[end] + + } export class FlexVolumeSource { @@ -133,19 +133,19 @@ export class FlexVolumeSource { secretRef: LocalObjectReference; readOnly: boolean; options: {}; - //[FlexVolumeSource:] - //[end] + + } export class FlockerVolumeSource { datasetName: string; datasetUUID: string; - //[FlockerVolumeSource:] - //[end] + + } export class FCVolumeSource { @@ -153,10 +153,10 @@ export class FCVolumeSource { lun: number; fsType: string; readOnly: boolean; - //[FCVolumeSource:] - //[end] + + } export class CephFSVolumeSource { @@ -166,10 +166,10 @@ export class CephFSVolumeSource { secretFile: string; secretRef: LocalObjectReference; readOnly: boolean; - //[CephFSVolumeSource:] - //[end] + + // 标识是否已经创建cephfs路径 created: boolean; } @@ -178,10 +178,10 @@ export class CinderVolumeSource { volumeID: string; fsType: string; readOnly: boolean; - //[CinderVolumeSource:] - //[end] + + } export class ISCSIVolumeSource { @@ -195,18 +195,18 @@ export class ISCSIVolumeSource { chapAuthDiscovery: boolean; chapAuthSession: boolean; secretRef: LocalObjectReference; - //[ISCSIVolumeSource:] - //[end] + + } export class LocalObjectReference { name: string; - //[LocalObjectReference:] - //[end] + + } export class RBDVolumeSource { @@ -218,10 +218,10 @@ export class RBDVolumeSource { keyring: string; secretRef: LocalObjectReference; readOnly: boolean; - //[RBDVolumeSource:] - //[end] + + // 标识是否已经创建Rbd镜像 created: boolean; } @@ -230,28 +230,28 @@ export class NFSVolumeSource { server: string; path: string; readOnly: boolean; - //[NFSVolumeSource:] - //[end] + + } export class GlusterfsVolumeSource { endpoints: string; path: string; readOnly: boolean; - //[GlusterfsVolumeSource:] - //[end] + + } export class HostPathVolumeSource { path: string; - //[HostPathVolumeSource:] - //[end] + + } export class AWSElasticBlockStoreVolumeSource { @@ -259,10 +259,10 @@ export class AWSElasticBlockStoreVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[AWSElasticBlockStoreVolumeSource:] - //[end] + + } export class GCEPersistentDiskVolumeSource { @@ -270,10 +270,10 @@ export class GCEPersistentDiskVolumeSource { fsType: string; partition: number; readOnly: boolean; - //[GCEPersistentDiskVolumeSource:] - //[end] + + } export class PersistentVolumeSpec { @@ -303,20 +303,20 @@ export class PersistentVolumeSpec { claimRef: ObjectReference; persistentVolumeReclaimPolicy: string; storageClassName: string; - //[PersistentVolumeSpec:] - //[end] + + } export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - //[end] + + } export class StatusDetails { @@ -326,19 +326,19 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - //[end] + + } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - //[end] + + } export class Status { @@ -350,27 +350,27 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - //[end] + + } export class Initializer { name: string; - //[Initializer:] - //[end] + + } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - //[end] + + } export class OwnerReference { @@ -380,10 +380,10 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - //[end] + + } export class ObjectMeta { @@ -403,10 +403,10 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - //[end] + + } export class PersistentVolume { @@ -415,8 +415,8 @@ export class PersistentVolume { metadata: ObjectMeta; spec: PersistentVolumeSpec; status: PersistentVolumeStatus; - //[PersistentVolume:] - //[end] + + } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolumeclaim.ts b/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolumeclaim.ts index 51a0a9158..3b0946416 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolumeclaim.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/persistentvolumeclaim.ts @@ -5,38 +5,22 @@ export class PersistentVolumeClaimStatus { phase: string; accessModes: string[]; capacity: {}; - //[PersistentVolumeClaimStatus:] - - - //[end] } export class ResourceRequirements { limits: {}; requests: {}; - //[ResourceRequirements:] - - - //[end] } export class LabelSelectorRequirement { key: string; operator: string; values: string[]; - //[LabelSelectorRequirement:] - - - //[end] } export class LabelSelector { matchLabels: {}; matchExpressions: LabelSelectorRequirement[]; - //[LabelSelector:] - - - //[end] } export class PersistentVolumeClaimSpec { @@ -45,20 +29,12 @@ export class PersistentVolumeClaimSpec { resources: ResourceRequirements; volumeName: string; storageClassName: string; - //[PersistentVolumeClaimSpec:] - - - //[end] } export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - - - //[end] } export class StatusDetails { @@ -68,19 +44,11 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - - - //[end] } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - - - //[end] } export class Status { @@ -92,27 +60,15 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - - - //[end] } export class Initializer { name: string; - //[Initializer:] - - - //[end] } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - - - //[end] } export class OwnerReference { @@ -122,17 +78,9 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - - - //[end] } export class Time { - //[Time:] - - - //[end] } export class ObjectMeta { @@ -152,10 +100,6 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - - - //[end] } export class KubePersistentVolumeClaim { @@ -164,8 +108,4 @@ export class KubePersistentVolumeClaim { metadata: ObjectMeta; spec: PersistentVolumeClaimSpec; status: PersistentVolumeClaimStatus; - //[PersistentVolumeClaim:] - - - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/pod.ts b/src/frontend/src/app/shared/model/v1/kubernetes/pod.ts index 00f82ddb3..0fe762928 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/pod.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/pod.ts @@ -1,8 +1,6 @@ export class ContainerStatus { name: string; restartCount: number; - //[ContainerStatus:] - //[end] } export class Pod { @@ -12,6 +10,4 @@ export class Pod { podIp: string; state: string; startTime: Date; - //[Pod:] - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/secret.ts b/src/frontend/src/app/shared/model/v1/kubernetes/secret.ts index a98f3790d..e6ee36034 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/secret.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/secret.ts @@ -2,8 +2,6 @@ export class StatusCause { reason: string; message: string; field: string; - //[StatusCause:] - //[end] } export class StatusDetails { @@ -13,15 +11,11 @@ export class StatusDetails { uid: string; causes: StatusCause[]; retryAfterSeconds: number; - //[StatusDetails:] - //[end] } export class ListMeta { selfLink: string; resourceVersion: string; - //[ListMeta:] - //[end] } export class Status { @@ -33,21 +27,15 @@ export class Status { reason: string; details: StatusDetails; code: number; - //[Status:] - //[end] } export class Initializer { name: string; - //[Initializer:] - //[end] } export class Initializers { pending: Initializer[]; result: Status; - //[Initializers:] - //[end] } export class OwnerReference { @@ -57,13 +45,9 @@ export class OwnerReference { uid: string; controller: boolean; blockOwnerDeletion: boolean; - //[OwnerReference:] - //[end] } export class Time { - //[Time:] - //[end] } export class ObjectMeta { @@ -83,8 +67,6 @@ export class ObjectMeta { initializers: Initializers; finalizers: string[]; clusterName: string; - //[ObjectMeta:] - //[end] } export class KubeSecret { @@ -94,6 +76,4 @@ export class KubeSecret { data: {}; stringData: {}; type: string; - //[Secret:] - //[end] } From f5f5a6c75d402d6bafbca8188d90b7c2ae524906 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Mon, 14 Jan 2019 11:21:05 +0800 Subject: [PATCH 005/112] frontend:update init flow --- .../src/_requestAnimationFrame.polyfill.ts | 12 +- .../shared/model/v1/kubernetes/autoscale.ts | 41 +- .../shared/model/v1/kubernetes/daemonset.ts | 1332 ++++++++--------- .../app/shared/model/v1/kubernetes/ingress.ts | 2 +- .../shared/model/v1/kubernetes/node-list.ts | 4 +- .../app/shared/model/v1/kubernetes/node.ts | 39 +- .../shared/model/v1/kubernetes/statefulset.ts | 913 ++++++----- 7 files changed, 1115 insertions(+), 1228 deletions(-) diff --git a/src/frontend/src/_requestAnimationFrame.polyfill.ts b/src/frontend/src/_requestAnimationFrame.polyfill.ts index 02e3afc2e..7b4a16973 100644 --- a/src/frontend/src/_requestAnimationFrame.polyfill.ts +++ b/src/frontend/src/_requestAnimationFrame.polyfill.ts @@ -6,9 +6,9 @@ * @license MIT */ (function () { - var lastTime = 0; - var vendors = ['ms', 'moz', 'o', 'webkit']; - for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { + let lastTime = 0; + const vendors = ['ms', 'moz', 'o', 'webkit']; + for (let x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame']; window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'] || window[vendors[x] + 'CancelRequestAnimationFrame']; @@ -16,9 +16,9 @@ if (!window.requestAnimationFrame) { window.requestAnimationFrame = (callback) => { - var currTime = new Date().getTime(); - var timeToCall = Math.max(0, 16 - (currTime - lastTime)); - var id = window.setTimeout(function () { + const currTime = new Date().getTime(); + const timeToCall = Math.max(0, 16 - (currTime - lastTime)); + const id = window.setTimeout(function () { callback(currTime + timeToCall); }, timeToCall); diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/autoscale.ts b/src/frontend/src/app/shared/model/v1/kubernetes/autoscale.ts index 5510200a6..d6e69dad3 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/autoscale.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/autoscale.ts @@ -1,5 +1,25 @@ /* Do not change, this code is generated from Golang structs */ +export class Time { + Time: Date; + + constructor(init?: Time) { + if (!init) { + return ; + } + if (init.Time) { + this.Time = new Date(init.Time as any); + } + } + + + static emptyObject(): Time { + const result = new Time(); + result.Time = null; + return result; + } + +} export class HorizontalPodAutoscalerStatus { observedGeneration?: number; @@ -357,27 +377,6 @@ export class OwnerReference { } - -export class Time { - Time: Date; - - constructor(init?: Time) { - if (!init) { - return ; - } - if (init.Time) { - this.Time = new Date(init.Time as any); - } - } - - - static emptyObject(): Time { - const result = new Time(); - result.Time = null; - return result; - } - -} export class ObjectMeta { name: string; generateName: string; diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts b/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts index ac8f3afa7..915c9f3cd 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/daemonset.ts @@ -1,228 +1,129 @@ /* Do not change, this code is generated from Golang structs */ +export class Time { + Time: Date; -export class DaemonSetCondition { - type: string; - status: string; - lastTransitionTime: Time; - reason: string; - message: string; - - constructor(init?: DaemonSetCondition) { - if (!init) { return; } - if (init.type) { this.type = init.type; } - if (init.status) { this.status = init.status; } - if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } - if (init.reason) { this.reason = init.reason; } - if (init.message) { this.message = init.message; } - } - - - static emptyObject(): DaemonSetCondition { - const result = new DaemonSetCondition(); - result.lastTransitionTime = Time.emptyObject(); - return result; - } - -} - -export class DaemonSetStatus { - currentNumberScheduled: number; - numberMisscheduled: number; - desiredNumberScheduled: number; - numberReady: number; - observedGeneration: number; - updatedNumberScheduled: number; - numberAvailable: number; - numberUnavailable: number; - collisionCount?: number; - conditions: DaemonSetCondition[]; - - constructor(init?: DaemonSetStatus) { - if (!init) { return; } - if (init.currentNumberScheduled) { this.currentNumberScheduled = init.currentNumberScheduled; } - if (init.numberMisscheduled) { this.numberMisscheduled = init.numberMisscheduled; } - if (init.desiredNumberScheduled) { this.desiredNumberScheduled = init.desiredNumberScheduled; } - if (init.numberReady) { this.numberReady = init.numberReady; } - if (init.observedGeneration) { this.observedGeneration = init.observedGeneration; } - if (init.updatedNumberScheduled) { this.updatedNumberScheduled = init.updatedNumberScheduled; } - if (init.numberAvailable) { this.numberAvailable = init.numberAvailable; } - if (init.numberUnavailable) { this.numberUnavailable = init.numberUnavailable; } - if (init.collisionCount) { this.collisionCount = init.collisionCount; } - if (init.conditions) { this.conditions = init.conditions; } - } - - - static emptyObject(): DaemonSetStatus { - const result = new DaemonSetStatus(); - result.conditions = []; - return result; - } - -} - -export class RollingUpdateDaemonSet { - maxUnavailable?: IntOrString; - - constructor(init?: RollingUpdateDaemonSet) { - if (!init) { return; } - if (init.maxUnavailable) { this.maxUnavailable = init.maxUnavailable; } - } - - - static emptyObject(): RollingUpdateDaemonSet { - const result = new RollingUpdateDaemonSet(); - result.maxUnavailable = IntOrString.emptyObject(); - return result; - } - -} - -export class DaemonSetUpdateStrategy { - type: string; - rollingUpdate?: RollingUpdateDaemonSet; - - constructor(init?: DaemonSetUpdateStrategy) { + constructor(init?: Time) { if (!init) { return; } - if (init.type) { this.type = init.type; } - if (init.rollingUpdate) { this.rollingUpdate = init.rollingUpdate; } + if (init.Time) { this.Time = new Date(init.Time as any); } } - static emptyObject(): DaemonSetUpdateStrategy { - const result = new DaemonSetUpdateStrategy(); - result.rollingUpdate = RollingUpdateDaemonSet.emptyObject(); + static emptyObject(): Time { + const result = new Time(); + result.Time = null; return result; } - } -export class PodDNSConfigOption { - name: string; - value?: string; +export class IntOrString { + Type: number; + IntVal: number; + StrVal: string; - constructor(init?: PodDNSConfigOption) { + constructor(init?: IntOrString) { if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.value) { this.value = init.value; } + if (init.Type) { this.Type = init.Type; } + if (init.IntVal) { this.IntVal = init.IntVal; } + if (init.StrVal) { this.StrVal = init.StrVal; } } - static emptyObject(): PodDNSConfigOption { - const result = new PodDNSConfigOption(); + static emptyObject(): IntOrString { + const result = new IntOrString(); return result; } - } -export class PodDNSConfig { - nameservers: string[]; - searches: string[]; - options: PodDNSConfigOption[]; +export class LabelSelectorRequirement { + key: string; + operator: string; + values: string[]; - constructor(init?: PodDNSConfig) { + constructor(init?: LabelSelectorRequirement) { if (!init) { return; } - if (init.nameservers) { this.nameservers = init.nameservers; } - if (init.searches) { this.searches = init.searches; } - if (init.options) { this.options = init.options; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } } - static emptyObject(): PodDNSConfig { - const result = new PodDNSConfig(); - result.nameservers = []; - result.searches = []; - result.options = []; + static emptyObject(): LabelSelectorRequirement { + const result = new LabelSelectorRequirement(); + result.values = []; return result; } - } -export class HostAlias { - ip: string; - hostnames: string[]; +export class LabelSelector { + matchLabels?: { [key: string]: string }; + matchExpressions: LabelSelectorRequirement[]; - constructor(init?: HostAlias) { + constructor(init?: LabelSelector) { if (!init) { return; } - if (init.ip) { this.ip = init.ip; } - if (init.hostnames) { this.hostnames = init.hostnames; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } - static emptyObject(): HostAlias { - const result = new HostAlias(); - result.hostnames = []; + static emptyObject(): LabelSelector { + const result = new LabelSelector(); + result.matchLabels = null; + result.matchExpressions = []; return result; } - } -export class Toleration { +export class NodeSelectorRequirement { key: string; operator: string; - value: string; - effect: string; - tolerationSeconds?: number; + values: string[]; - constructor(init?: Toleration) { + constructor(init?: NodeSelectorRequirement) { if (!init) { return; } if (init.key) { this.key = init.key; } if (init.operator) { this.operator = init.operator; } - if (init.value) { this.value = init.value; } - if (init.effect) { this.effect = init.effect; } - if (init.tolerationSeconds) { this.tolerationSeconds = init.tolerationSeconds; } + if (init.values) { this.values = init.values; } } - static emptyObject(): Toleration { - const result = new Toleration(); + static emptyObject(): NodeSelectorRequirement { + const result = new NodeSelectorRequirement(); + result.values = []; return result; } - } +export class NodeSelectorTerm { + matchExpressions: NodeSelectorRequirement[]; -export class PodAntiAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - - constructor(init?: PodAntiAffinity) { + constructor(init?: NodeSelectorTerm) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; - } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } - static emptyObject(): PodAntiAffinity { - const result = new PodAntiAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; + static emptyObject(): NodeSelectorTerm { + const result = new NodeSelectorTerm(); + result.matchExpressions = []; return result; } - } -export class WeightedPodAffinityTerm { - weight: number; - podAffinityTerm: PodAffinityTerm; +export class NodeSelector { + nodeSelectorTerms: NodeSelectorTerm[]; - constructor(init?: WeightedPodAffinityTerm) { + constructor(init?: NodeSelector) { if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } + if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } } - static emptyObject(): WeightedPodAffinityTerm { - const result = new WeightedPodAffinityTerm(); - result.podAffinityTerm = PodAffinityTerm.emptyObject(); + static emptyObject(): NodeSelector { + const result = new NodeSelector(); + result.nodeSelectorTerms = []; return result; } - } export class PodAffinityTerm { @@ -244,105 +145,515 @@ export class PodAffinityTerm { result.namespaces = []; return result; } - } -export class PodAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; +export class ObjectFieldSelector { + apiVersion: string; + fieldPath: string; - constructor(init?: PodAffinity) { + constructor(init?: ObjectFieldSelector) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; - } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.fieldPath) { this.fieldPath = init.fieldPath; } } - static emptyObject(): PodAffinity { - const result = new PodAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; + static emptyObject(): ObjectFieldSelector { + const result = new ObjectFieldSelector(); return result; } - } -export class PreferredSchedulingTerm { - weight: number; - preference: NodeSelectorTerm; +export class Quantity { + Format: string; - constructor(init?: PreferredSchedulingTerm) { + constructor(init?: Quantity) { if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.preference) { this.preference = init.preference; } + if (init.Format) { this.Format = init.Format; } } - static emptyObject(): PreferredSchedulingTerm { - const result = new PreferredSchedulingTerm(); - result.preference = NodeSelectorTerm.emptyObject(); + static emptyObject(): Quantity { + const result = new Quantity(); return result; } +} + +export class ResourceFieldSelector { + containerName: string; + resource: string; + divisor: Quantity; + + constructor(init?: ResourceFieldSelector) { + if (!init) { return; } + if (init.containerName) { this.containerName = init.containerName; } + if (init.resource) { this.resource = init.resource; } + if (init.divisor) { this.divisor = init.divisor; } + } + + + static emptyObject(): ResourceFieldSelector { + const result = new ResourceFieldSelector(); + result.divisor = Quantity.emptyObject(); + return result; + } +} + +export class LocalObjectReference { + name: string; + + constructor(init?: LocalObjectReference) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + } + + + static emptyObject(): LocalObjectReference { + const result = new LocalObjectReference(); + return result; + } +} + +export class ListMeta { + selfLink: string; + resourceVersion: string; + continue: string; + + constructor(init?: ListMeta) { + if (!init) { return; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.continue) { this.continue = init.continue; } + } + + + static emptyObject(): ListMeta { + const result = new ListMeta(); + return result; + } +} + +export class StatusDetails { + name: string; + group: string; + kind: string; + uid: string; + causes: StatusCause[]; + retryAfterSeconds: number; + + constructor(init?: StatusDetails) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.group) { this.group = init.group; } + if (init.kind) { this.kind = init.kind; } + if (init.uid) { this.uid = init.uid; } + if (init.causes) { this.causes = init.causes; } + if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } + } + + + static emptyObject(): StatusDetails { + const result = new StatusDetails(); + result.causes = []; + return result; + } +} + +export class Status { + kind: string; + apiVersion: string; + metadata: ListMeta; + status: string; + message: string; + reason: string; + details?: StatusDetails; + code: number; + + constructor(init?: Status) { + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.status) { this.status = init.status; } + if (init.message) { this.message = init.message; } + if (init.reason) { this.reason = init.reason; } + if (init.details) { this.details = init.details; } + if (init.code) { this.code = init.code; } + } + + + static emptyObject(): Status { + const result = new Status(); + result.metadata = ListMeta.emptyObject(); + result.details = StatusDetails.emptyObject(); + return result; + } +} + +export class Initializer { + name: string; + + constructor(init?: Initializer) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + } + + + static emptyObject(): Initializer { + const result = new Initializer(); + return result; + } +} + +export class Initializers { + pending: Initializer[]; + result?: Status; + + constructor(init?: Initializers) { + if (!init) { return; } + if (init.pending) { this.pending = init.pending; } + if (init.result) { this.result = init.result; } + } + + + static emptyObject(): Initializers { + const result = new Initializers(); + result.pending = []; + result.result = Status.emptyObject(); + return result; + } +} + +export class OwnerReference { + apiVersion: string; + kind: string; + name: string; + uid: string; + controller?: boolean; + blockOwnerDeletion?: boolean; + + constructor(init?: OwnerReference) { + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.kind) { this.kind = init.kind; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.controller) { this.controller = init.controller; } + if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } + } + + + static emptyObject(): OwnerReference { + const result = new OwnerReference(); + return result; + } +} + +export class ObjectMeta { + name: string; + generateName: string; + namespace: string; + selfLink: string; + uid: string; + resourceVersion: string; + generation: number; + creationTimestamp: Time; + deletionTimestamp?: Time; + deletionGracePeriodSeconds?: number; + labels?: { [key: string]: string }; + annotations?: { [key: string]: string }; + ownerReferences: OwnerReference[]; + initializers?: Initializers; + finalizers: string[]; + clusterName: string; + + constructor(init?: ObjectMeta) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.generateName) { this.generateName = init.generateName; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.uid) { this.uid = init.uid; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.generation) { this.generation = init.generation; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } + if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } + if (init.initializers) { this.initializers = init.initializers; } + if (init.finalizers) { this.finalizers = init.finalizers; } + if (init.clusterName) { this.clusterName = init.clusterName; } + } + + + static emptyObject(): ObjectMeta { + const result = new ObjectMeta(); + result.creationTimestamp = Time.emptyObject(); + result.deletionTimestamp = Time.emptyObject(); + result.labels = null; + result.annotations = null; + result.ownerReferences = []; + result.initializers = Initializers.emptyObject(); + result.finalizers = []; + return result; + } +} + +export class DaemonSetCondition { + type: string; + status: string; + lastTransitionTime: Time; + reason: string; + message: string; + + constructor(init?: DaemonSetCondition) { + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.status) { this.status = init.status; } + if (init.lastTransitionTime) { this.lastTransitionTime = init.lastTransitionTime; } + if (init.reason) { this.reason = init.reason; } + if (init.message) { this.message = init.message; } + } + + + static emptyObject(): DaemonSetCondition { + const result = new DaemonSetCondition(); + result.lastTransitionTime = Time.emptyObject(); + return result; + } +} + +export class DaemonSetStatus { + currentNumberScheduled: number; + numberMisscheduled: number; + desiredNumberScheduled: number; + numberReady: number; + observedGeneration: number; + updatedNumberScheduled: number; + numberAvailable: number; + numberUnavailable: number; + collisionCount?: number; + conditions: DaemonSetCondition[]; + + constructor(init?: DaemonSetStatus) { + if (!init) { return; } + if (init.currentNumberScheduled) { this.currentNumberScheduled = init.currentNumberScheduled; } + if (init.numberMisscheduled) { this.numberMisscheduled = init.numberMisscheduled; } + if (init.desiredNumberScheduled) { this.desiredNumberScheduled = init.desiredNumberScheduled; } + if (init.numberReady) { this.numberReady = init.numberReady; } + if (init.observedGeneration) { this.observedGeneration = init.observedGeneration; } + if (init.updatedNumberScheduled) { this.updatedNumberScheduled = init.updatedNumberScheduled; } + if (init.numberAvailable) { this.numberAvailable = init.numberAvailable; } + if (init.numberUnavailable) { this.numberUnavailable = init.numberUnavailable; } + if (init.collisionCount) { this.collisionCount = init.collisionCount; } + if (init.conditions) { this.conditions = init.conditions; } + } + + + static emptyObject(): DaemonSetStatus { + const result = new DaemonSetStatus(); + result.conditions = []; + return result; + } +} + +export class RollingUpdateDaemonSet { + maxUnavailable?: IntOrString; + + constructor(init?: RollingUpdateDaemonSet) { + if (!init) { return; } + if (init.maxUnavailable) { this.maxUnavailable = init.maxUnavailable; } + } + + + static emptyObject(): RollingUpdateDaemonSet { + const result = new RollingUpdateDaemonSet(); + result.maxUnavailable = IntOrString.emptyObject(); + return result; + } +} + +export class DaemonSetUpdateStrategy { + type: string; + rollingUpdate?: RollingUpdateDaemonSet; + + constructor(init?: DaemonSetUpdateStrategy) { + if (!init) { return; } + if (init.type) { this.type = init.type; } + if (init.rollingUpdate) { this.rollingUpdate = init.rollingUpdate; } + } + + static emptyObject(): DaemonSetUpdateStrategy { + const result = new DaemonSetUpdateStrategy(); + result.rollingUpdate = RollingUpdateDaemonSet.emptyObject(); + return result; + } } -export class NodeSelectorRequirement { +export class PodDNSConfigOption { + name: string; + value?: string; + + constructor(init?: PodDNSConfigOption) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } + } + + + static emptyObject(): PodDNSConfigOption { + const result = new PodDNSConfigOption(); + return result; + } +} + +export class PodDNSConfig { + nameservers: string[]; + searches: string[]; + options: PodDNSConfigOption[]; + + constructor(init?: PodDNSConfig) { + if (!init) { return; } + if (init.nameservers) { this.nameservers = init.nameservers; } + if (init.searches) { this.searches = init.searches; } + if (init.options) { this.options = init.options; } + } + + + static emptyObject(): PodDNSConfig { + const result = new PodDNSConfig(); + result.nameservers = []; + result.searches = []; + result.options = []; + return result; + } +} + +export class HostAlias { + ip: string; + hostnames: string[]; + + constructor(init?: HostAlias) { + if (!init) { return; } + if (init.ip) { this.ip = init.ip; } + if (init.hostnames) { this.hostnames = init.hostnames; } + } + + + static emptyObject(): HostAlias { + const result = new HostAlias(); + result.hostnames = []; + return result; + } +} + +export class Toleration { key: string; operator: string; - values: string[]; + value: string; + effect: string; + tolerationSeconds?: number; - constructor(init?: NodeSelectorRequirement) { + constructor(init?: Toleration) { if (!init) { return; } if (init.key) { this.key = init.key; } if (init.operator) { this.operator = init.operator; } - if (init.values) { this.values = init.values; } + if (init.value) { this.value = init.value; } + if (init.effect) { this.effect = init.effect; } + if (init.tolerationSeconds) { this.tolerationSeconds = init.tolerationSeconds; } } - static emptyObject(): NodeSelectorRequirement { - const result = new NodeSelectorRequirement(); - result.values = []; + static emptyObject(): Toleration { + const result = new Toleration(); return result; } - } -export class NodeSelectorTerm { - matchExpressions: NodeSelectorRequirement[]; - constructor(init?: NodeSelectorTerm) { +export class PodAntiAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; + + constructor(init?: PodAntiAffinity) { if (!init) { return; } - if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } - static emptyObject(): NodeSelectorTerm { - const result = new NodeSelectorTerm(); - result.matchExpressions = []; + static emptyObject(): PodAntiAffinity { + const result = new PodAntiAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; } +} + +export class WeightedPodAffinityTerm { + weight: number; + podAffinityTerm: PodAffinityTerm; + + constructor(init?: WeightedPodAffinityTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } + } + + static emptyObject(): WeightedPodAffinityTerm { + const result = new WeightedPodAffinityTerm(); + result.podAffinityTerm = PodAffinityTerm.emptyObject(); + return result; + } } -export class NodeSelector { - nodeSelectorTerms: NodeSelectorTerm[]; +export class PodAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - constructor(init?: NodeSelector) { + constructor(init?: PodAffinity) { if (!init) { return; } - if (init.nodeSelectorTerms) { this.nodeSelectorTerms = init.nodeSelectorTerms; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } - static emptyObject(): NodeSelector { - const result = new NodeSelector(); - result.nodeSelectorTerms = []; + static emptyObject(): PodAffinity { + const result = new PodAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; } +} + +export class PreferredSchedulingTerm { + weight: number; + preference: NodeSelectorTerm; + + constructor(init?: PreferredSchedulingTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } + } + + static emptyObject(): PreferredSchedulingTerm { + const result = new PreferredSchedulingTerm(); + result.preference = NodeSelectorTerm.emptyObject(); + return result; + } } export class NodeAffinity { @@ -366,7 +677,6 @@ export class NodeAffinity { result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; } - } export class Affinity { @@ -389,9 +699,28 @@ export class Affinity { result.podAntiAffinity = PodAntiAffinity.emptyObject(); return result; } - } +export class SELinuxOptions { + user: string; + role: string; + type: string; + level: string; + + constructor(init?: SELinuxOptions) { + if (!init) { return; } + if (init.user) { this.user = init.user; } + if (init.role) { this.role = init.role; } + if (init.type) { this.type = init.type; } + if (init.level) { this.level = init.level; } + } + + + static emptyObject(): SELinuxOptions { + const result = new SELinuxOptions(); + return result; + } +} export class PodSecurityContext { seLinuxOptions?: SELinuxOptions; @@ -418,29 +747,6 @@ export class PodSecurityContext { result.supplementalGroups = []; return result; } - -} - -export class SELinuxOptions { - user: string; - role: string; - type: string; - level: string; - - constructor(init?: SELinuxOptions) { - if (!init) { return; } - if (init.user) { this.user = init.user; } - if (init.role) { this.role = init.role; } - if (init.type) { this.type = init.type; } - if (init.level) { this.level = init.level; } - } - - - static emptyObject(): SELinuxOptions { - const result = new SELinuxOptions(); - return result; - } - } export class Capabilities { @@ -460,7 +766,6 @@ export class Capabilities { result.drop = []; return result; } - } export class SecurityContext { @@ -473,75 +778,27 @@ export class SecurityContext { readOnlyRootFilesystem?: boolean; allowPrivilegeEscalation?: boolean; - constructor(init?: SecurityContext) { - if (!init) { return; } - if (init.capabilities) { this.capabilities = init.capabilities; } - if (init.privileged) { this.privileged = init.privileged; } - if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } - if (init.runAsUser) { this.runAsUser = init.runAsUser; } - if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } - if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } - if (init.readOnlyRootFilesystem) { this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; } - if (init.allowPrivilegeEscalation) { this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; } - } - - - static emptyObject(): SecurityContext { - const result = new SecurityContext(); - result.capabilities = Capabilities.emptyObject(); - result.seLinuxOptions = SELinuxOptions.emptyObject(); - return result; - } - -} - - - - -export class Handler { - exec?: ExecAction; - httpGet?: HTTPGetAction; - tcpSocket?: TCPSocketAction; - - constructor(init?: Handler) { - if (!init) { return; } - if (init.exec) { this.exec = init.exec; } - if (init.httpGet) { this.httpGet = init.httpGet; } - if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } - } - - - static emptyObject(): Handler { - const result = new Handler(); - result.exec = ExecAction.emptyObject(); - result.httpGet = HTTPGetAction.emptyObject(); - result.tcpSocket = TCPSocketAction.emptyObject(); - return result; - } - -} - -export class Lifecycle { - postStart?: Handler; - preStop?: Handler; - - constructor(init?: Lifecycle) { + constructor(init?: SecurityContext) { if (!init) { return; } - if (init.postStart) { this.postStart = init.postStart; } - if (init.preStop) { this.preStop = init.preStop; } + if (init.capabilities) { this.capabilities = init.capabilities; } + if (init.privileged) { this.privileged = init.privileged; } + if (init.seLinuxOptions) { this.seLinuxOptions = init.seLinuxOptions; } + if (init.runAsUser) { this.runAsUser = init.runAsUser; } + if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } + if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } + if (init.readOnlyRootFilesystem) { this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; } + if (init.allowPrivilegeEscalation) { this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; } } - static emptyObject(): Lifecycle { - const result = new Lifecycle(); - result.postStart = Handler.emptyObject(); - result.preStop = Handler.emptyObject(); + static emptyObject(): SecurityContext { + const result = new SecurityContext(); + result.capabilities = Capabilities.emptyObject(); + result.seLinuxOptions = SELinuxOptions.emptyObject(); return result; } - } - export class TCPSocketAction { port: IntOrString; host: string; @@ -558,7 +815,6 @@ export class TCPSocketAction { result.port = IntOrString.emptyObject(); return result; } - } export class HTTPHeader { @@ -576,27 +832,6 @@ export class HTTPHeader { const result = new HTTPHeader(); return result; } - -} - -export class IntOrString { - Type: number; - IntVal: number; - StrVal: string; - - constructor(init?: IntOrString) { - if (!init) { return; } - if (init.Type) { this.Type = init.Type; } - if (init.IntVal) { this.IntVal = init.IntVal; } - if (init.StrVal) { this.StrVal = init.StrVal; } - } - - - static emptyObject(): IntOrString { - const result = new IntOrString(); - return result; - } - } export class HTTPGetAction { @@ -622,7 +857,6 @@ export class HTTPGetAction { result.httpHeaders = []; return result; } - } export class ExecAction { @@ -639,7 +873,47 @@ export class ExecAction { result.command = []; return result; } +} + +export class Handler { + exec?: ExecAction; + httpGet?: HTTPGetAction; + tcpSocket?: TCPSocketAction; + + constructor(init?: Handler) { + if (!init) { return; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } + } + + + static emptyObject(): Handler { + const result = new Handler(); + result.exec = ExecAction.emptyObject(); + result.httpGet = HTTPGetAction.emptyObject(); + result.tcpSocket = TCPSocketAction.emptyObject(); + return result; + } +} + +export class Lifecycle { + postStart?: Handler; + preStop?: Handler; + + constructor(init?: Lifecycle) { + if (!init) { return; } + if (init.postStart) { this.postStart = init.postStart; } + if (init.preStop) { this.preStop = init.preStop; } + } + + static emptyObject(): Lifecycle { + const result = new Lifecycle(); + result.postStart = Handler.emptyObject(); + result.preStop = Handler.emptyObject(); + return result; + } } export class Probe { @@ -672,7 +946,6 @@ export class Probe { result.tcpSocket = TCPSocketAction.emptyObject(); return result; } - } export class VolumeDevice { @@ -690,7 +963,6 @@ export class VolumeDevice { const result = new VolumeDevice(); return result; } - } export class VolumeMount { @@ -714,7 +986,6 @@ export class VolumeMount { const result = new VolumeMount(); return result; } - } export class ResourceRequirements { @@ -734,7 +1005,6 @@ export class ResourceRequirements { result.requests = null; return result; } - } export class SecretKeySelector { @@ -754,7 +1024,6 @@ export class SecretKeySelector { const result = new SecretKeySelector(); return result; } - } export class ConfigMapKeySelector { @@ -774,7 +1043,6 @@ export class ConfigMapKeySelector { const result = new ConfigMapKeySelector(); return result; } - } @@ -801,7 +1069,6 @@ export class EnvVarSource { result.secretKeyRef = SecretKeySelector.emptyObject(); return result; } - } export class EnvVar { @@ -822,7 +1089,6 @@ export class EnvVar { result.valueFrom = EnvVarSource.emptyObject(); return result; } - } export class SecretEnvSource { @@ -840,7 +1106,6 @@ export class SecretEnvSource { const result = new SecretEnvSource(); return result; } - } export class ConfigMapEnvSource { @@ -858,7 +1123,6 @@ export class ConfigMapEnvSource { const result = new ConfigMapEnvSource(); return result; } - } export class EnvFromSource { @@ -880,7 +1144,6 @@ export class EnvFromSource { result.secretRef = SecretEnvSource.emptyObject(); return result; } - } export class ContainerPort { @@ -904,7 +1167,6 @@ export class ContainerPort { const result = new ContainerPort(); return result; } - } export class Container { @@ -972,7 +1234,6 @@ export class Container { result.securityContext = SecurityContext.emptyObject(); return result; } - } export class StorageOSVolumeSource { @@ -997,7 +1258,6 @@ export class StorageOSVolumeSource { result.secretRef = LocalObjectReference.emptyObject(); return result; } - } export class ScaleIOVolumeSource { @@ -1032,7 +1292,6 @@ export class ScaleIOVolumeSource { result.secretRef = LocalObjectReference.emptyObject(); return result; } - } export class PortworxVolumeSource { @@ -1052,7 +1311,6 @@ export class PortworxVolumeSource { const result = new PortworxVolumeSource(); return result; } - } export class ConfigMapProjection { @@ -1073,7 +1331,6 @@ export class ConfigMapProjection { result.items = []; return result; } - } export class DownwardAPIProjection { @@ -1090,7 +1347,6 @@ export class DownwardAPIProjection { result.items = []; return result; } - } export class SecretProjection { @@ -1111,7 +1367,6 @@ export class SecretProjection { result.items = []; return result; } - } export class VolumeProjection { @@ -1134,7 +1389,6 @@ export class VolumeProjection { result.configMap = ConfigMapProjection.emptyObject(); return result; } - } export class ProjectedVolumeSource { @@ -1153,7 +1407,6 @@ export class ProjectedVolumeSource { result.sources = []; return result; } - } export class PhotonPersistentDiskVolumeSource { @@ -1171,7 +1424,6 @@ export class PhotonPersistentDiskVolumeSource { const result = new PhotonPersistentDiskVolumeSource(); return result; } - } export class AzureDiskVolumeSource { @@ -1197,7 +1449,6 @@ export class AzureDiskVolumeSource { const result = new AzureDiskVolumeSource(); return result; } - } export class QuobyteVolumeSource { @@ -1221,7 +1472,6 @@ export class QuobyteVolumeSource { const result = new QuobyteVolumeSource(); return result; } - } export class VsphereVirtualDiskVolumeSource { @@ -1243,7 +1493,6 @@ export class VsphereVirtualDiskVolumeSource { const result = new VsphereVirtualDiskVolumeSource(); return result; } - } export class ConfigMapVolumeSource { @@ -1266,7 +1515,6 @@ export class ConfigMapVolumeSource { result.items = []; return result; } - } export class AzureFileVolumeSource { @@ -1286,7 +1534,6 @@ export class AzureFileVolumeSource { const result = new AzureFileVolumeSource(); return result; } - } export class FCVolumeSource { @@ -1312,46 +1559,6 @@ export class FCVolumeSource { result.wwids = []; return result; } - -} - -export class ResourceFieldSelector { - containerName: string; - resource: string; - divisor: Quantity; - - constructor(init?: ResourceFieldSelector) { - if (!init) { return; } - if (init.containerName) { this.containerName = init.containerName; } - if (init.resource) { this.resource = init.resource; } - if (init.divisor) { this.divisor = init.divisor; } - } - - - static emptyObject(): ResourceFieldSelector { - const result = new ResourceFieldSelector(); - result.divisor = Quantity.emptyObject(); - return result; - } - -} - -export class ObjectFieldSelector { - apiVersion: string; - fieldPath: string; - - constructor(init?: ObjectFieldSelector) { - if (!init) { return; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.fieldPath) { this.fieldPath = init.fieldPath; } - } - - - static emptyObject(): ObjectFieldSelector { - const result = new ObjectFieldSelector(); - return result; - } - } export class DownwardAPIVolumeFile { @@ -1375,7 +1582,6 @@ export class DownwardAPIVolumeFile { result.resourceFieldRef = ResourceFieldSelector.emptyObject(); return result; } - } export class DownwardAPIVolumeSource { @@ -1394,7 +1600,6 @@ export class DownwardAPIVolumeSource { result.items = []; return result; } - } export class FlockerVolumeSource { @@ -1412,7 +1617,6 @@ export class FlockerVolumeSource { const result = new FlockerVolumeSource(); return result; } - } export class CephFSVolumeSource { @@ -1440,7 +1644,6 @@ export class CephFSVolumeSource { result.secretRef = LocalObjectReference.emptyObject(); return result; } - } export class CinderVolumeSource { @@ -1460,7 +1663,6 @@ export class CinderVolumeSource { const result = new CinderVolumeSource(); return result; } - } export class FlexVolumeSource { @@ -1486,7 +1688,6 @@ export class FlexVolumeSource { result.options = null; return result; } - } export class RBDVolumeSource { @@ -1518,7 +1719,6 @@ export class RBDVolumeSource { result.secretRef = LocalObjectReference.emptyObject(); return result; } - } export class PersistentVolumeClaimVolumeSource { @@ -1536,7 +1736,6 @@ export class PersistentVolumeClaimVolumeSource { const result = new PersistentVolumeClaimVolumeSource(); return result; } - } export class GlusterfsVolumeSource { @@ -1556,23 +1755,6 @@ export class GlusterfsVolumeSource { const result = new GlusterfsVolumeSource(); return result; } - -} - -export class LocalObjectReference { - name: string; - - constructor(init?: LocalObjectReference) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - } - - - static emptyObject(): LocalObjectReference { - const result = new LocalObjectReference(); - return result; - } - } export class ISCSIVolumeSource { @@ -1610,7 +1792,6 @@ export class ISCSIVolumeSource { result.secretRef = LocalObjectReference.emptyObject(); return result; } - } export class NFSVolumeSource { @@ -1630,7 +1811,6 @@ export class NFSVolumeSource { const result = new NFSVolumeSource(); return result; } - } export class KeyToPath { @@ -1650,7 +1830,6 @@ export class KeyToPath { const result = new KeyToPath(); return result; } - } export class SecretVolumeSource { @@ -1673,7 +1852,6 @@ export class SecretVolumeSource { result.items = []; return result; } - } export class GitRepoVolumeSource { @@ -1693,7 +1871,6 @@ export class GitRepoVolumeSource { const result = new GitRepoVolumeSource(); return result; } - } export class AWSElasticBlockStoreVolumeSource { @@ -1715,7 +1892,6 @@ export class AWSElasticBlockStoreVolumeSource { const result = new AWSElasticBlockStoreVolumeSource(); return result; } - } export class GCEPersistentDiskVolumeSource { @@ -1737,23 +1913,6 @@ export class GCEPersistentDiskVolumeSource { const result = new GCEPersistentDiskVolumeSource(); return result; } - -} - -export class Quantity { - Format: string; - - constructor(init?: Quantity) { - if (!init) { return; } - if (init.Format) { this.Format = init.Format; } - } - - - static emptyObject(): Quantity { - const result = new Quantity(); - return result; - } - } export class EmptyDirVolumeSource { @@ -1772,7 +1931,6 @@ export class EmptyDirVolumeSource { result.sizeLimit = Quantity.emptyObject(); return result; } - } export class HostPathVolumeSource { @@ -1790,7 +1948,6 @@ export class HostPathVolumeSource { const result = new HostPathVolumeSource(); return result; } - } export class Volume { @@ -1887,7 +2044,6 @@ export class Volume { result.storageos = StorageOSVolumeSource.emptyObject(); return result; } - } export class PodSpec { @@ -1944,89 +2100,46 @@ export class PodSpec { if (init.affinity) { this.affinity = init.affinity; } if (init.schedulerName) { this.schedulerName = init.schedulerName; } if (init.tolerations) { this.tolerations = init.tolerations; } - if (init.hostAliases) { this.hostAliases = init.hostAliases; } - if (init.priorityClassName) { this.priorityClassName = init.priorityClassName; } - if (init.priority) { this.priority = init.priority; } - if (init.dnsConfig) { this.dnsConfig = init.dnsConfig; } - } - - - static emptyObject(): PodSpec { - const result = new PodSpec(); - result.volumes = []; - result.initContainers = []; - result.containers = []; - result.nodeSelector = null; - result.securityContext = PodSecurityContext.emptyObject(); - result.imagePullSecrets = []; - result.affinity = Affinity.emptyObject(); - result.tolerations = []; - result.hostAliases = []; - result.dnsConfig = PodDNSConfig.emptyObject(); - return result; - } - -} - -export class PodTemplateSpec { - metadata: ObjectMeta; - spec: PodSpec; - - constructor(init?: PodTemplateSpec) { - if (!init) { return; } - if (init.metadata) { this.metadata = init.metadata; } - if (init.spec) { this.spec = init.spec; } - } - - - static emptyObject(): PodTemplateSpec { - const result = new PodTemplateSpec(); - result.metadata = ObjectMeta.emptyObject(); - result.spec = PodSpec.emptyObject(); - return result; - } - -} - -export class LabelSelectorRequirement { - key: string; - operator: string; - values: string[]; - - constructor(init?: LabelSelectorRequirement) { - if (!init) { return; } - if (init.key) { this.key = init.key; } - if (init.operator) { this.operator = init.operator; } - if (init.values) { this.values = init.values; } + if (init.hostAliases) { this.hostAliases = init.hostAliases; } + if (init.priorityClassName) { this.priorityClassName = init.priorityClassName; } + if (init.priority) { this.priority = init.priority; } + if (init.dnsConfig) { this.dnsConfig = init.dnsConfig; } } - static emptyObject(): LabelSelectorRequirement { - const result = new LabelSelectorRequirement(); - result.values = []; + static emptyObject(): PodSpec { + const result = new PodSpec(); + result.volumes = []; + result.initContainers = []; + result.containers = []; + result.nodeSelector = null; + result.securityContext = PodSecurityContext.emptyObject(); + result.imagePullSecrets = []; + result.affinity = Affinity.emptyObject(); + result.tolerations = []; + result.hostAliases = []; + result.dnsConfig = PodDNSConfig.emptyObject(); return result; } - } -export class LabelSelector { - matchLabels?: { [key: string]: string }; - matchExpressions: LabelSelectorRequirement[]; +export class PodTemplateSpec { + metadata: ObjectMeta; + spec: PodSpec; - constructor(init?: LabelSelector) { + constructor(init?: PodTemplateSpec) { if (!init) { return; } - if (init.matchLabels) { this.matchLabels = init.matchLabels; } - if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.spec) { this.spec = init.spec; } } - static emptyObject(): LabelSelector { - const result = new LabelSelector(); - result.matchLabels = null; - result.matchExpressions = []; + static emptyObject(): PodTemplateSpec { + const result = new PodTemplateSpec(); + result.metadata = ObjectMeta.emptyObject(); + result.spec = PodSpec.emptyObject(); return result; } - } export class DaemonSetSpec { @@ -2055,7 +2168,6 @@ export class DaemonSetSpec { result.updateStrategy = DaemonSetUpdateStrategy.emptyObject(); return result; } - } export class StatusCause { @@ -2075,219 +2187,6 @@ export class StatusCause { const result = new StatusCause(); return result; } - -} - -export class StatusDetails { - name: string; - group: string; - kind: string; - uid: string; - causes: StatusCause[]; - retryAfterSeconds: number; - - constructor(init?: StatusDetails) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.group) { this.group = init.group; } - if (init.kind) { this.kind = init.kind; } - if (init.uid) { this.uid = init.uid; } - if (init.causes) { this.causes = init.causes; } - if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } - } - - - static emptyObject(): StatusDetails { - const result = new StatusDetails(); - result.causes = []; - return result; - } - -} - -export class ListMeta { - selfLink: string; - resourceVersion: string; - continue: string; - - constructor(init?: ListMeta) { - if (!init) { return; } - if (init.selfLink) { this.selfLink = init.selfLink; } - if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } - if (init.continue) { this.continue = init.continue; } - } - - - static emptyObject(): ListMeta { - const result = new ListMeta(); - return result; - } - -} - -export class Status { - kind: string; - apiVersion: string; - metadata: ListMeta; - status: string; - message: string; - reason: string; - details?: StatusDetails; - code: number; - - constructor(init?: Status) { - if (!init) { return; } - if (init.kind) { this.kind = init.kind; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.metadata) { this.metadata = init.metadata; } - if (init.status) { this.status = init.status; } - if (init.message) { this.message = init.message; } - if (init.reason) { this.reason = init.reason; } - if (init.details) { this.details = init.details; } - if (init.code) { this.code = init.code; } - } - - - static emptyObject(): Status { - const result = new Status(); - result.metadata = ListMeta.emptyObject(); - result.details = StatusDetails.emptyObject(); - return result; - } - -} - -export class Initializer { - name: string; - - constructor(init?: Initializer) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - } - - - static emptyObject(): Initializer { - const result = new Initializer(); - return result; - } - -} - -export class Initializers { - pending: Initializer[]; - result?: Status; - - constructor(init?: Initializers) { - if (!init) { return; } - if (init.pending) { this.pending = init.pending; } - if (init.result) { this.result = init.result; } - } - - - static emptyObject(): Initializers { - const result = new Initializers(); - result.pending = []; - result.result = Status.emptyObject(); - return result; - } - -} - -export class OwnerReference { - apiVersion: string; - kind: string; - name: string; - uid: string; - controller?: boolean; - blockOwnerDeletion?: boolean; - - constructor(init?: OwnerReference) { - if (!init) { return; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.kind) { this.kind = init.kind; } - if (init.name) { this.name = init.name; } - if (init.uid) { this.uid = init.uid; } - if (init.controller) { this.controller = init.controller; } - if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } - } - - - static emptyObject(): OwnerReference { - const result = new OwnerReference(); - return result; - } - -} - - -export class Time { - Time: Date; - - constructor(init?: Time) { - if (!init) { return; } - if (init.Time) { this.Time = new Date(init.Time as any); } - } - - - static emptyObject(): Time { - const result = new Time(); - result.Time = null; - return result; - } - -} - -export class ObjectMeta { - name: string; - generateName: string; - namespace: string; - selfLink: string; - uid: string; - resourceVersion: string; - generation: number; - creationTimestamp: Time; - deletionTimestamp?: Time; - deletionGracePeriodSeconds?: number; - labels?: { [key: string]: string }; - annotations?: { [key: string]: string }; - ownerReferences: OwnerReference[]; - initializers?: Initializers; - finalizers: string[]; - clusterName: string; - - constructor(init?: ObjectMeta) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.generateName) { this.generateName = init.generateName; } - if (init.namespace) { this.namespace = init.namespace; } - if (init.selfLink) { this.selfLink = init.selfLink; } - if (init.uid) { this.uid = init.uid; } - if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } - if (init.generation) { this.generation = init.generation; } - if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } - if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } - if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } - if (init.labels) { this.labels = init.labels; } - if (init.annotations) { this.annotations = init.annotations; } - if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } - if (init.initializers) { this.initializers = init.initializers; } - if (init.finalizers) { this.finalizers = init.finalizers; } - if (init.clusterName) { this.clusterName = init.clusterName; } - } - - - static emptyObject(): ObjectMeta { - const result = new ObjectMeta(); - result.creationTimestamp = Time.emptyObject(); - result.deletionTimestamp = Time.emptyObject(); - result.labels = null; - result.annotations = null; - result.ownerReferences = []; - result.initializers = Initializers.emptyObject(); - result.finalizers = []; - return result; - } - } export class KubeDaemonSet { @@ -2314,5 +2213,4 @@ export class KubeDaemonSet { result.status = DaemonSetStatus.emptyObject(); return result; } - } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/ingress.ts b/src/frontend/src/app/shared/model/v1/kubernetes/ingress.ts index 623f39e53..5eb691ee9 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/ingress.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/ingress.ts @@ -61,7 +61,7 @@ export class IngressStatus { } export class IngressPath { - backend: IngressBackend + backend: IngressBackend; path: string; } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts b/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts index 72ef610fb..5e3faa800 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/node-list.ts @@ -76,7 +76,9 @@ export class Time { constructor(init?: Time) { if (!init) { return; } - if (init.Time) this.Time = new Date(init.Time as any); + if (init.Time) { + this.Time = new Date(init.Time as any); + } } diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts index 8eec9e9b1..d3a834e47 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/node.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/node.ts @@ -1,6 +1,25 @@ /* Do not change, this code is generated from Golang structs */ import { Node } from './node-list'; +export class Time { + Time: Date; + + constructor(init?: Time) { + if (!init) { return; } + if (init.Time) { + this.Time = new Date(init.Time as any); + } + } + + + static emptyObject(): Time { + const result = new Time(); + result.Time = null; + return result; + } + +} + export interface NodeSummary { cpuSummary: Object; memorySummary: Object; @@ -480,26 +499,6 @@ export class OwnerReference { } - -export class Time { - Time: Date; - - constructor(init?: Time) { - if (!init) { return; } - if (init.Time) { - this.Time = new Date(init.Time as any); - } - } - - - static emptyObject(): Time { - const result = new Time(); - result.Time = null; - return result; - } - -} - export class ObjectMeta { name: string; generateName: string; diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts index 8665513b3..3d2be0052 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/statefulset.ts @@ -1,5 +1,85 @@ /* Do not change, this code is generated from Golang structs */ +export class IntOrString { + Type: number; + IntVal: number; + StrVal: string; + + constructor(init?: IntOrString) { + if (!init) { return; } + if (init.Type) { this.Type = init.Type; } + if (init.IntVal) { this.IntVal = init.IntVal; } + if (init.StrVal) { this.StrVal = init.StrVal; } + } + + + static emptyObject(): IntOrString { + const result = new IntOrString(); + return result; + } +} + +export class LabelSelectorRequirement { + key: string; + operator: string; + values: string[]; + + constructor(init?: LabelSelectorRequirement) { + if (!init) { return; } + if (init.key) { this.key = init.key; } + if (init.operator) { this.operator = init.operator; } + if (init.values) { this.values = init.values; } + } + + + static emptyObject(): LabelSelectorRequirement { + const result = new LabelSelectorRequirement(); + result.values = []; + return result; + } + +} + +export class LabelSelector { + matchLabels?: { [key: string]: string }; + matchExpressions: LabelSelectorRequirement[]; + + constructor(init?: LabelSelector) { + if (!init) { return; } + if (init.matchLabels) { this.matchLabels = init.matchLabels; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } + } + + static emptyObject(): LabelSelector { + const result = new LabelSelector(); + result.matchLabels = null; + result.matchExpressions = []; + return result; + } + +} + +export class PodAffinityTerm { + labelSelector?: LabelSelector; + namespaces: string[]; + topologyKey: string; + + constructor(init?: PodAffinityTerm) { + if (!init) { return; } + if (init.labelSelector) { this.labelSelector = init.labelSelector; } + if (init.namespaces) { this.namespaces = init.namespaces; } + if (init.topologyKey) { this.topologyKey = init.topologyKey; } + } + + + static emptyObject(): PodAffinityTerm { + const result = new PodAffinityTerm(); + result.labelSelector = LabelSelector.emptyObject(); + result.namespaces = []; + return result; + } + +} export class StatefulSetCondition { type: string; @@ -147,6 +227,24 @@ export class PersistentVolumeClaimStatus { } +export class ResourceRequirements { + limits?: { [key: string]: any }; + requests?: { [key: string]: any }; + + constructor(init?: ResourceRequirements) { + if (!init) { return; } + if (init.limits) { this.limits = init.limits; } + if (init.requests) { this.requests = init.requests; } + } + + + static emptyObject(): ResourceRequirements { + const result = new ResourceRequirements(); + result.limits = null; + result.requests = null; + return result; + } +} export class PersistentVolumeClaimSpec { accessModes: string[]; @@ -177,6 +275,201 @@ export class PersistentVolumeClaimSpec { } +export class Initializer { + name: string; + + constructor(init?: Initializer) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + } + + + static emptyObject(): Initializer { + const result = new Initializer(); + return result; + } + +} + +export class StatusDetails { + name: string; + group: string; + kind: string; + uid: string; + causes: StatusCause[]; + retryAfterSeconds: number; + + constructor(init?: StatusDetails) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.group) { this.group = init.group; } + if (init.kind) { this.kind = init.kind; } + if (init.uid) { this.uid = init.uid; } + if (init.causes) { this.causes = init.causes; } + if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } + } + + + static emptyObject(): StatusDetails { + const result = new StatusDetails(); + result.causes = []; + return result; + } + +} + + +export class ListMeta { + selfLink: string; + resourceVersion: string; + continue: string; + + constructor(init?: ListMeta) { + if (!init) { return; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.continue) { this.continue = init.continue; } + } + + + static emptyObject(): ListMeta { + const result = new ListMeta(); + return result; + } + +} + +export class Status { + kind: string; + apiVersion: string; + metadata: ListMeta; + status: string; + message: string; + reason: string; + details?: StatusDetails; + code: number; + + constructor(init?: Status) { + if (!init) { return; } + if (init.kind) { this.kind = init.kind; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.metadata) { this.metadata = init.metadata; } + if (init.status) { this.status = init.status; } + if (init.message) { this.message = init.message; } + if (init.reason) { this.reason = init.reason; } + if (init.details) { this.details = init.details; } + if (init.code) { this.code = init.code; } + } + + + static emptyObject(): Status { + const result = new Status(); + result.metadata = ListMeta.emptyObject(); + result.details = StatusDetails.emptyObject(); + return result; + } + +} + +export class Initializers { + pending: Initializer[]; + result?: Status; + + constructor(init?: Initializers) { + if (!init) { return; } + if (init.pending) { this.pending = init.pending; } + if (init.result) { this.result = init.result; } + } + + + static emptyObject(): Initializers { + const result = new Initializers(); + result.pending = []; + result.result = Status.emptyObject(); + return result; + } + +} + +export class OwnerReference { + apiVersion: string; + kind: string; + name: string; + uid: string; + controller?: boolean; + blockOwnerDeletion?: boolean; + + constructor(init?: OwnerReference) { + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.kind) { this.kind = init.kind; } + if (init.name) { this.name = init.name; } + if (init.uid) { this.uid = init.uid; } + if (init.controller) { this.controller = init.controller; } + if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } + } + + + static emptyObject(): OwnerReference { + const result = new OwnerReference(); + return result; + } + +} + +export class ObjectMeta { + name: string; + generateName: string; + namespace: string; + selfLink: string; + uid: string; + resourceVersion: string; + generation: number; + creationTimestamp: Date; + deletionTimestamp: Date; + deletionGracePeriodSeconds?: number; + labels?: { [key: string]: string }; + annotations?: { [key: string]: string }; + ownerReferences: OwnerReference[]; + initializers?: Initializers; + finalizers: string[]; + clusterName: string; + + constructor(init?: ObjectMeta) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.generateName) { this.generateName = init.generateName; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.selfLink) { this.selfLink = init.selfLink; } + if (init.uid) { this.uid = init.uid; } + if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } + if (init.generation) { this.generation = init.generation; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } + if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } + if (init.initializers) { this.initializers = init.initializers; } + if (init.finalizers) { this.finalizers = init.finalizers; } + if (init.clusterName) { this.clusterName = init.clusterName; } + } + + + static emptyObject(): ObjectMeta { + const result = new ObjectMeta(); + result.creationTimestamp = null; + result.deletionTimestamp = null; + result.labels = null; + result.annotations = null; + result.ownerReferences = []; + result.initializers = Initializers.emptyObject(); + result.finalizers = []; + return result; + } + +} + export class PersistentVolumeClaim { kind: string; apiVersion: string; @@ -332,28 +625,6 @@ export class WeightedPodAffinityTerm { } -export class PodAffinityTerm { - labelSelector?: LabelSelector; - namespaces: string[]; - topologyKey: string; - - constructor(init?: PodAffinityTerm) { - if (!init) { return; } - if (init.labelSelector) { this.labelSelector = init.labelSelector; } - if (init.namespaces) { this.namespaces = init.namespaces; } - if (init.topologyKey) { this.topologyKey = init.topologyKey; } - } - - - static emptyObject(): PodAffinityTerm { - const result = new PodAffinityTerm(); - result.labelSelector = LabelSelector.emptyObject(); - result.namespaces = []; - return result; - } - -} - export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; @@ -378,25 +649,6 @@ export class PodAffinity { } -export class PreferredSchedulingTerm { - weight: number; - preference: NodeSelectorTerm; - - constructor(init?: PreferredSchedulingTerm) { - if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.preference) { this.preference = init.preference; } - } - - - static emptyObject(): PreferredSchedulingTerm { - const result = new PreferredSchedulingTerm(); - result.preference = NodeSelectorTerm.emptyObject(); - return result; - } - -} - export class NodeSelectorRequirement { key: string; operator: string; @@ -435,6 +687,27 @@ export class NodeSelectorTerm { } +export class PreferredSchedulingTerm { + weight: number; + preference: NodeSelectorTerm; + + constructor(init?: PreferredSchedulingTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } + } + + + static emptyObject(): PreferredSchedulingTerm { + const result = new PreferredSchedulingTerm(); + result.preference = NodeSelectorTerm.emptyObject(); + return result; + } + +} + + + export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; @@ -499,7 +772,27 @@ export class Affinity { } +export class SELinuxOptions { + user: string; + role: string; + type: string; + level: string; + constructor(init?: SELinuxOptions) { + if (!init) { return; } + if (init.user) { this.user = init.user; } + if (init.role) { this.role = init.role; } + if (init.type) { this.type = init.type; } + if (init.level) { this.level = init.level; } + } + + + static emptyObject(): SELinuxOptions { + const result = new SELinuxOptions(); + return result; + } + +} export class PodSecurityContext { seLinuxOptions?: SELinuxOptions; runAsUser?: number; @@ -514,37 +807,15 @@ export class PodSecurityContext { if (init.runAsUser) { this.runAsUser = init.runAsUser; } if (init.runAsGroup) { this.runAsGroup = init.runAsGroup; } if (init.runAsNonRoot) { this.runAsNonRoot = init.runAsNonRoot; } - if (init.supplementalGroups) { this.supplementalGroups = init.supplementalGroups; } - if (init.fsGroup) { this.fsGroup = init.fsGroup; } - } - - - static emptyObject(): PodSecurityContext { - const result = new PodSecurityContext(); - result.seLinuxOptions = SELinuxOptions.emptyObject(); - result.supplementalGroups = []; - return result; - } - -} - -export class SELinuxOptions { - user: string; - role: string; - type: string; - level: string; - - constructor(init?: SELinuxOptions) { - if (!init) { return; } - if (init.user) { this.user = init.user; } - if (init.role) { this.role = init.role; } - if (init.type) { this.type = init.type; } - if (init.level) { this.level = init.level; } + if (init.supplementalGroups) { this.supplementalGroups = init.supplementalGroups; } + if (init.fsGroup) { this.fsGroup = init.fsGroup; } } - static emptyObject(): SELinuxOptions { - const result = new SELinuxOptions(); + static emptyObject(): PodSecurityContext { + const result = new PodSecurityContext(); + result.seLinuxOptions = SELinuxOptions.emptyObject(); + result.supplementalGroups = []; return result; } @@ -602,53 +873,23 @@ export class SecurityContext { } +export class ExecAction { + command: string[]; - - -export class Handler { - exec?: ExecAction; - httpGet?: HTTPGetAction; - tcpSocket?: TCPSocketAction; - - constructor(init?: Handler) { - if (!init) { return; } - if (init.exec) { this.exec = init.exec; } - if (init.httpGet) { this.httpGet = init.httpGet; } - if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } - } - - - static emptyObject(): Handler { - const result = new Handler(); - result.exec = ExecAction.emptyObject(); - result.httpGet = HTTPGetAction.emptyObject(); - result.tcpSocket = TCPSocketAction.emptyObject(); - return result; - } - -} - -export class Lifecycle { - postStart?: Handler; - preStop?: Handler; - - constructor(init?: Lifecycle) { + constructor(init?: ExecAction) { if (!init) { return; } - if (init.postStart) { this.postStart = init.postStart; } - if (init.preStop) { this.preStop = init.preStop; } + if (init.command) { this.command = init.command; } } - static emptyObject(): Lifecycle { - const result = new Lifecycle(); - result.postStart = Handler.emptyObject(); - result.preStop = Handler.emptyObject(); + static emptyObject(): ExecAction { + const result = new ExecAction(); + result.command = []; return result; } } - export class TCPSocketAction { port: IntOrString; host: string; @@ -668,82 +909,88 @@ export class TCPSocketAction { } -export class HTTPHeader { - name: string; - value: string; +export class HTTPGetAction { + path: string; + port: IntOrString; + host: string; + scheme: string; + httpHeaders: HTTPHeader[]; - constructor(init?: HTTPHeader) { + constructor(init?: HTTPGetAction) { if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.value) { this.value = init.value; } + if (init.path) { this.path = init.path; } + if (init.port) { this.port = init.port; } + if (init.host) { this.host = init.host; } + if (init.scheme) { this.scheme = init.scheme; } + if (init.httpHeaders) { this.httpHeaders = init.httpHeaders; } } - static emptyObject(): HTTPHeader { - const result = new HTTPHeader(); + static emptyObject(): HTTPGetAction { + const result = new HTTPGetAction(); + result.port = IntOrString.emptyObject(); + result.httpHeaders = []; return result; } } -export class IntOrString { - Type: number; - IntVal: number; - StrVal: string; +export class Handler { + exec?: ExecAction; + httpGet?: HTTPGetAction; + tcpSocket?: TCPSocketAction; - constructor(init?: IntOrString) { + constructor(init?: Handler) { if (!init) { return; } - if (init.Type) { this.Type = init.Type; } - if (init.IntVal) { this.IntVal = init.IntVal; } - if (init.StrVal) { this.StrVal = init.StrVal; } + if (init.exec) { this.exec = init.exec; } + if (init.httpGet) { this.httpGet = init.httpGet; } + if (init.tcpSocket) { this.tcpSocket = init.tcpSocket; } } - static emptyObject(): IntOrString { - const result = new IntOrString(); + static emptyObject(): Handler { + const result = new Handler(); + result.exec = ExecAction.emptyObject(); + result.httpGet = HTTPGetAction.emptyObject(); + result.tcpSocket = TCPSocketAction.emptyObject(); return result; } } -export class HTTPGetAction { - path: string; - port: IntOrString; - host: string; - scheme: string; - httpHeaders: HTTPHeader[]; +export class Lifecycle { + postStart?: Handler; + preStop?: Handler; - constructor(init?: HTTPGetAction) { + constructor(init?: Lifecycle) { if (!init) { return; } - if (init.path) { this.path = init.path; } - if (init.port) { this.port = init.port; } - if (init.host) { this.host = init.host; } - if (init.scheme) { this.scheme = init.scheme; } - if (init.httpHeaders) { this.httpHeaders = init.httpHeaders; } + if (init.postStart) { this.postStart = init.postStart; } + if (init.preStop) { this.preStop = init.preStop; } } - static emptyObject(): HTTPGetAction { - const result = new HTTPGetAction(); - result.port = IntOrString.emptyObject(); - result.httpHeaders = []; + static emptyObject(): Lifecycle { + const result = new Lifecycle(); + result.postStart = Handler.emptyObject(); + result.preStop = Handler.emptyObject(); return result; } } -export class ExecAction { - command: string[]; +export class HTTPHeader { + name: string; + value: string; - constructor(init?: ExecAction) { + constructor(init?: HTTPHeader) { if (!init) { return; } - if (init.command) { this.command = init.command; } + if (init.name) { this.name = init.name; } + if (init.value) { this.value = init.value; } } - static emptyObject(): ExecAction { - const result = new ExecAction(); - result.command = []; + static emptyObject(): HTTPHeader { + const result = new HTTPHeader(); return result; } @@ -824,26 +1071,6 @@ export class VolumeMount { } -export class ResourceRequirements { - limits?: { [key: string]: any }; - requests?: { [key: string]: any }; - - constructor(init?: ResourceRequirements) { - if (!init) { return; } - if (init.limits) { this.limits = init.limits; } - if (init.requests) { this.requests = init.requests; } - } - - - static emptyObject(): ResourceRequirements { - const result = new ResourceRequirements(); - result.limits = null; - result.requests = null; - return result; - } - -} - export class SecretKeySelector { name: string; key: string; @@ -884,6 +1111,43 @@ export class ConfigMapKeySelector { } +export class ResourceFieldSelector { + containerName: string; + resource: string; + divisor: string; + + constructor(init?: ResourceFieldSelector) { + if (!init) { return; } + if (init.containerName) { this.containerName = init.containerName; } + if (init.resource) { this.resource = init.resource; } + if (init.divisor) { this.divisor = init.divisor; } + } + + + static emptyObject(): ResourceFieldSelector { + const result = new ResourceFieldSelector(); + result.divisor = null; + return result; + } + +} + +export class ObjectFieldSelector { + apiVersion: string; + fieldPath: string; + + constructor(init?: ObjectFieldSelector) { + if (!init) { return; } + if (init.apiVersion) { this.apiVersion = init.apiVersion; } + if (init.fieldPath) { this.fieldPath = init.fieldPath; } + } + + + static emptyObject(): ObjectFieldSelector { + const result = new ObjectFieldSelector(); + return result; + } +} export class EnvVarSource { fieldRef?: ObjectFieldSelector; @@ -1082,6 +1346,21 @@ export class Container { } +export class LocalObjectReference { + name: string; + + constructor(init?: LocalObjectReference) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + } + + + static emptyObject(): LocalObjectReference { + const result = new LocalObjectReference(); + return result; + } + +} export class StorageOSVolumeSource { volumeName: string; volumeNamespace: string; @@ -1412,50 +1691,11 @@ export class FCVolumeSource { if (init.wwids) { this.wwids = init.wwids; } } - - static emptyObject(): FCVolumeSource { - const result = new FCVolumeSource(); - result.targetWWNs = []; - result.wwids = []; - return result; - } - -} - -export class ResourceFieldSelector { - containerName: string; - resource: string; - divisor: string; - - constructor(init?: ResourceFieldSelector) { - if (!init) { return; } - if (init.containerName) { this.containerName = init.containerName; } - if (init.resource) { this.resource = init.resource; } - if (init.divisor) { this.divisor = init.divisor; } - } - - - static emptyObject(): ResourceFieldSelector { - const result = new ResourceFieldSelector(); - result.divisor = null; - return result; - } - -} - -export class ObjectFieldSelector { - apiVersion: string; - fieldPath: string; - - constructor(init?: ObjectFieldSelector) { - if (!init) { return; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.fieldPath) { this.fieldPath = init.fieldPath; } - } - - - static emptyObject(): ObjectFieldSelector { - const result = new ObjectFieldSelector(); + + static emptyObject(): FCVolumeSource { + const result = new FCVolumeSource(); + result.targetWWNs = []; + result.wwids = []; return result; } @@ -1666,22 +1906,6 @@ export class GlusterfsVolumeSource { } -export class LocalObjectReference { - name: string; - - constructor(init?: LocalObjectReference) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - } - - - static emptyObject(): LocalObjectReference { - const result = new LocalObjectReference(); - return result; - } - -} - export class ISCSIVolumeSource { targetPortal: string; iqn: string; @@ -2079,47 +2303,6 @@ export class PodTemplateSpec { } -export class LabelSelectorRequirement { - key: string; - operator: string; - values: string[]; - - constructor(init?: LabelSelectorRequirement) { - if (!init) { return; } - if (init.key) { this.key = init.key; } - if (init.operator) { this.operator = init.operator; } - if (init.values) { this.values = init.values; } - } - - - static emptyObject(): LabelSelectorRequirement { - const result = new LabelSelectorRequirement(); - result.values = []; - return result; - } - -} - -export class LabelSelector { - matchLabels?: { [key: string]: string }; - matchExpressions: LabelSelectorRequirement[]; - - constructor(init?: LabelSelector) { - if (!init) { return; } - if (init.matchLabels) { this.matchLabels = init.matchLabels; } - if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } - } - - - static emptyObject(): LabelSelector { - const result = new LabelSelector(); - result.matchLabels = null; - result.matchExpressions = []; - return result; - } - -} - export class StatefulSetSpec { replicas?: number; selector?: LabelSelector; @@ -2174,200 +2357,6 @@ export class StatusCause { } -export class StatusDetails { - name: string; - group: string; - kind: string; - uid: string; - causes: StatusCause[]; - retryAfterSeconds: number; - - constructor(init?: StatusDetails) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.group) { this.group = init.group; } - if (init.kind) { this.kind = init.kind; } - if (init.uid) { this.uid = init.uid; } - if (init.causes) { this.causes = init.causes; } - if (init.retryAfterSeconds) { this.retryAfterSeconds = init.retryAfterSeconds; } - } - - - static emptyObject(): StatusDetails { - const result = new StatusDetails(); - result.causes = []; - return result; - } - -} - -export class ListMeta { - selfLink: string; - resourceVersion: string; - continue: string; - - constructor(init?: ListMeta) { - if (!init) { return; } - if (init.selfLink) { this.selfLink = init.selfLink; } - if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } - if (init.continue) { this.continue = init.continue; } - } - - - static emptyObject(): ListMeta { - const result = new ListMeta(); - return result; - } - -} - -export class Status { - kind: string; - apiVersion: string; - metadata: ListMeta; - status: string; - message: string; - reason: string; - details?: StatusDetails; - code: number; - - constructor(init?: Status) { - if (!init) { return; } - if (init.kind) { this.kind = init.kind; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.metadata) { this.metadata = init.metadata; } - if (init.status) { this.status = init.status; } - if (init.message) { this.message = init.message; } - if (init.reason) { this.reason = init.reason; } - if (init.details) { this.details = init.details; } - if (init.code) { this.code = init.code; } - } - - - static emptyObject(): Status { - const result = new Status(); - result.metadata = ListMeta.emptyObject(); - result.details = StatusDetails.emptyObject(); - return result; - } - -} - -export class Initializer { - name: string; - - constructor(init?: Initializer) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - } - - - static emptyObject(): Initializer { - const result = new Initializer(); - return result; - } - -} - -export class Initializers { - pending: Initializer[]; - result?: Status; - - constructor(init?: Initializers) { - if (!init) { return; } - if (init.pending) { this.pending = init.pending; } - if (init.result) { this.result = init.result; } - } - - - static emptyObject(): Initializers { - const result = new Initializers(); - result.pending = []; - result.result = Status.emptyObject(); - return result; - } - -} - -export class OwnerReference { - apiVersion: string; - kind: string; - name: string; - uid: string; - controller?: boolean; - blockOwnerDeletion?: boolean; - - constructor(init?: OwnerReference) { - if (!init) { return; } - if (init.apiVersion) { this.apiVersion = init.apiVersion; } - if (init.kind) { this.kind = init.kind; } - if (init.name) { this.name = init.name; } - if (init.uid) { this.uid = init.uid; } - if (init.controller) { this.controller = init.controller; } - if (init.blockOwnerDeletion) { this.blockOwnerDeletion = init.blockOwnerDeletion; } - } - - - static emptyObject(): OwnerReference { - const result = new OwnerReference(); - return result; - } - -} - -export class ObjectMeta { - name: string; - generateName: string; - namespace: string; - selfLink: string; - uid: string; - resourceVersion: string; - generation: number; - creationTimestamp: Date; - deletionTimestamp: Date; - deletionGracePeriodSeconds?: number; - labels?: { [key: string]: string }; - annotations?: { [key: string]: string }; - ownerReferences: OwnerReference[]; - initializers?: Initializers; - finalizers: string[]; - clusterName: string; - - constructor(init?: ObjectMeta) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.generateName) { this.generateName = init.generateName; } - if (init.namespace) { this.namespace = init.namespace; } - if (init.selfLink) { this.selfLink = init.selfLink; } - if (init.uid) { this.uid = init.uid; } - if (init.resourceVersion) { this.resourceVersion = init.resourceVersion; } - if (init.generation) { this.generation = init.generation; } - if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } - if (init.deletionTimestamp) { this.deletionTimestamp = init.deletionTimestamp; } - if (init.deletionGracePeriodSeconds) { this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; } - if (init.labels) { this.labels = init.labels; } - if (init.annotations) { this.annotations = init.annotations; } - if (init.ownerReferences) { this.ownerReferences = init.ownerReferences; } - if (init.initializers) { this.initializers = init.initializers; } - if (init.finalizers) { this.finalizers = init.finalizers; } - if (init.clusterName) { this.clusterName = init.clusterName; } - } - - - static emptyObject(): ObjectMeta { - const result = new ObjectMeta(); - result.creationTimestamp = null; - result.deletionTimestamp = null; - result.labels = null; - result.annotations = null; - result.ownerReferences = []; - result.initializers = Initializers.emptyObject(); - result.finalizers = []; - return result; - } - -} - export class KubeStatefulSet { kind: string; apiVersion: string; From f5063c62439f11d877479ee2006b00c4601f5108 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Mon, 14 Jan 2019 11:35:08 +0800 Subject: [PATCH 006/112] frontend:fix const/let etc --- .../src/app/admin/admin-routing.module.ts | 2 +- .../src/app/admin/apikey/apikey.component.ts | 4 +- .../src/app/admin/app/app.component.ts | 2 +- .../app/admin/auditlog/auditlog.component.ts | 4 - .../app/admin/cluster/cluster.component.ts | 4 +- .../src/app/admin/config/config.component.ts | 4 +- .../admin/configmap/configmap.component.ts | 4 +- .../create-edit-configmap.component.ts | 2 +- .../configmaptpl/configmaptpl.component.ts | 4 +- .../create-edit-cronjob.component.ts | 2 +- .../app/admin/cronjob/cronjob.component.ts | 4 +- .../trash-cronjob/trash-cronjob.component.ts | 2 +- .../create-edit-daemonset.component.ts | 2 +- .../admin/deployment/deployment.component.ts | 4 +- .../deploymenttpl/deploymenttpl.component.ts | 4 +- .../create-edit-group.component.ts | 28 ++-- .../src/app/admin/group/group.component.ts | 4 +- .../create-edit-ingress.component.ts | 2 +- .../create-edit-ingresstpl.component.ts | 2 +- .../admin/ingresstpl/ingresstpl.component.ts | 3 +- .../kubernetes/node/list-nodes/inventory.ts | 2 +- .../admin/namespace/namespace.component.ts | 4 +- .../notification/notification.component.ts | 4 +- .../user/list-user/list-user.component.ts | 2 +- .../list-configmap.component.ts | 2 +- .../create-edit-cronjobtpl.component.ts | 2 +- .../create-edit-daemonsettpl.component.ts | 2 +- .../create-edit-deploymenttpl.component.ts | 2 +- .../create-edit-namespace-user.component.ts | 2 +- .../create-edit-statefulsettpl.component.ts | 2 +- .../auth-module/sign-in/sign-in.component.ts | 2 +- .../shared/breadcrumb/breadcrumb.component.ts | 2 +- .../confirmation-dialog.component.ts | 4 +- .../dual-list-box/dual-list-box.component.ts | 4 +- .../float-window-item.component.ts | 4 +- .../float-window/float-window.component.ts | 2 +- .../src/app/shared/footer/footer.component.ts | 4 +- .../message-handler.service.ts | 8 +- .../modal-operate/modal-operate.component.ts | 11 +- .../src/app/shared/model/v1/apikey.ts | 4 - .../src/app/shared/model/v1/cluster.ts | 8 +- .../src/app/shared/model/v1/cronjob.ts | 58 +++++--- .../src/app/shared/model/v1/namespace.ts | 26 ++-- .../src/app/shared/model/v1/publish-status.ts | 2 - .../src/app/shared/model/v1/statefulset.ts | 135 +++++++++--------- .../src/app/shared/model/v1/statefulsettpl.ts | 74 +++++----- src/frontend/src/app/shared/utils.ts | 16 ++- 47 files changed, 246 insertions(+), 229 deletions(-) diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 73b820ccc..45a5616a4 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -63,7 +63,7 @@ import { TrashIngressComponent } from './ingress/trash-ingress/trash-ingress.com import { IngressTplComponent } from './ingresstpl/ingresstpl.component'; import { TrashIngressTplComponent } from './ingresstpl/trash-ingresstpl/trash-ingresstpl.component'; import { KubeDeploymentComponent } from './kubernetes/deployment/kube-deployment.component'; -import {KubeNamespaceComponent} from './kubernetes/namespace/kube-namespace.component'; +import { KubeNamespaceComponent } from './kubernetes/namespace/kube-namespace.component'; const routes: Routes = [ diff --git a/src/frontend/src/app/admin/apikey/apikey.component.ts b/src/frontend/src/app/admin/apikey/apikey.component.ts index 2b2c32b04..def0cfac5 100644 --- a/src/frontend/src/app/admin/apikey/apikey.component.ts +++ b/src/frontend/src/app/admin/apikey/apikey.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; @@ -18,7 +18,7 @@ import { ApiKeyService } from '../../shared/client/v1/apikey.service'; templateUrl: './apikey.component.html', styleUrls: ['./apikey.component.scss'] }) -export class ApiKeyComponent implements OnInit { +export class ApiKeyComponent implements OnInit, OnDestroy { @ViewChild(ListApiKeyComponent) listApiKey: ListApiKeyComponent; @ViewChild(CreateEditApiKeyComponent) diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index 43b8f9928..b14d9458e 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -26,7 +26,7 @@ export class AppComponent implements OnInit { createEditApp: CreateEditAppComponent; namespaceId: string; - idFilterInit: string = ''; + idFilterInit = ''; changedApps: App[]; pageState: PageState = new PageState(); subscription: Subscription; diff --git a/src/frontend/src/app/admin/auditlog/auditlog.component.ts b/src/frontend/src/app/admin/auditlog/auditlog.component.ts index 2a9a2e39b..1c1bc32eb 100644 --- a/src/frontend/src/app/admin/auditlog/auditlog.component.ts +++ b/src/frontend/src/app/admin/auditlog/auditlog.component.ts @@ -23,10 +23,6 @@ export class AuditLogComponent implements OnInit { } - ngOnDestroy(): void { - - } - pageSizeChange(pageSize: number) { this.state.page.to = pageSize - 1; this.state.page.size = pageSize; diff --git a/src/frontend/src/app/admin/cluster/cluster.component.ts b/src/frontend/src/app/admin/cluster/cluster.component.ts index e6e7df1c1..2178c3be9 100644 --- a/src/frontend/src/app/admin/cluster/cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/cluster.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './cluster.component.html', styleUrls: ['./cluster.component.scss'] }) -export class ClusterComponent implements OnInit { +export class ClusterComponent implements OnInit, OnDestroy { @ViewChild(ListClusterComponent) list: ListClusterComponent; @ViewChild(CreateEditClusterComponent) diff --git a/src/frontend/src/app/admin/config/config.component.ts b/src/frontend/src/app/admin/config/config.component.ts index 057b3578e..97a8be2f2 100644 --- a/src/frontend/src/app/admin/config/config.component.ts +++ b/src/frontend/src/app/admin/config/config.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; @@ -16,7 +16,7 @@ import { ConfigService } from '../../shared/client/v1/config.service'; templateUrl: './config.component.html', styleUrls: ['./config.component.scss'] }) -export class ConfigComponent implements OnInit { +export class ConfigComponent implements OnInit, OnDestroy { @ViewChild(ListConfigComponent) list: ListConfigComponent; @ViewChild(CreateEditConfigComponent) diff --git a/src/frontend/src/app/admin/configmap/configmap.component.ts b/src/frontend/src/app/admin/configmap/configmap.component.ts index 274a3b7b1..b644f638d 100644 --- a/src/frontend/src/app/admin/configmap/configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/configmap.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './configmap.component.html', styleUrls: ['./configmap.component.scss'] }) -export class ConfigMapComponent implements OnInit { +export class ConfigMapComponent implements OnInit, OnDestroy { @ViewChild(ListConfigMapComponent) list: ListConfigMapComponent; @ViewChild(CreateEditConfigMapComponent) diff --git a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts index e53923826..ce02c8c56 100644 --- a/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/create-edit-configmap/create-edit-configmap.component.ts @@ -137,7 +137,7 @@ export class CreateEditConfigMapComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts index c2ee5a670..cbba9615e 100644 --- a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './configmaptpl.component.html', styleUrls: ['./configmaptpl.component.scss'] }) -export class ConfigMapTplComponent implements OnInit { +export class ConfigMapTplComponent implements OnInit, OnDestroy { @ViewChild(ListConfigMapTplComponent) list: ListConfigMapTplComponent; @ViewChild(CreateEditConfigMapTplComponent) diff --git a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts index 13c8946cf..f995ded37 100644 --- a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts @@ -34,7 +34,7 @@ export class CreateEditCronjobComponent implements OnInit { isSubmitOnGoing = false; isNameValid = true; - componentName: string = '计划任务'; + componentName = '计划任务'; title: string; actionType: ActionType; diff --git a/src/frontend/src/app/admin/cronjob/cronjob.component.ts b/src/frontend/src/app/admin/cronjob/cronjob.component.ts index 6f1a98a38..f17366403 100644 --- a/src/frontend/src/app/admin/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/cronjob.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -18,7 +18,7 @@ import { TranslateService } from '@ngx-translate/core'; templateUrl: './cronjob.component.html', styleUrls: ['./cronjob.component.scss'] }) -export class CronjobComponent implements OnInit { +export class CronjobComponent implements OnInit, OnDestroy { @ViewChild(ListCronjobComponent) list: ListCronjobComponent; @ViewChild(CreateEditCronjobComponent) diff --git a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts index e21509745..2413d9548 100644 --- a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts @@ -23,7 +23,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { state: State; subscription: Subscription; - componentName: string = '计划任务'; + componentName = '计划任务'; constructor( private cronjobService: CronjobService, diff --git a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts index 01821d897..f119261ff 100644 --- a/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts @@ -142,7 +142,7 @@ export class CreateEditDaemonsetComponent implements OnInit { !isUndefined(this.daemonset.appId); } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['daemonset_name']; if (cont) { diff --git a/src/frontend/src/app/admin/deployment/deployment.component.ts b/src/frontend/src/app/admin/deployment/deployment.component.ts index f7aecb54f..b75a616c1 100644 --- a/src/frontend/src/app/admin/deployment/deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/deployment.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './deployment.component.html', styleUrls: ['./deployment.component.scss'] }) -export class DeploymentComponent implements OnInit { +export class DeploymentComponent implements OnInit, OnDestroy { @ViewChild(ListDeploymentComponent) listDeployment: ListDeploymentComponent; diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts index 6f61f3130..df16e53e2 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './deploymenttpl.component.html', styleUrls: ['./deploymenttpl.component.scss'] }) -export class DeploymentTplComponent implements OnInit { +export class DeploymentTplComponent implements OnInit, OnDestroy { @ViewChild(ListDeploymentTplComponent) listDeployment: ListDeploymentTplComponent; diff --git a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts index 05258a021..3363487c4 100644 --- a/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts +++ b/src/frontend/src/app/admin/group/create-edit-group/create-edit-group.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -16,7 +16,7 @@ import { PageState } from '../../../shared/page/page-state'; templateUrl: 'create-edit-group.component.html', styleUrls: ['create-edit-group.scss'] }) -export class CreateEditGroupComponent { +export class CreateEditGroupComponent implements OnInit { @Output() create = new EventEmitter(); createGroupOpened: boolean; @@ -52,7 +52,9 @@ export class CreateEditGroupComponent { response => { this.basePermissions = response.data.list; for (const x in this.basePermissions) { - this.mapPermissions.set(this.basePermissions[x].id.toString(), this.basePermissions[x]); + if (this.basePermissions.hasOwnProperty(x)) { + this.mapPermissions.set(this.basePermissions[x].id.toString(), this.basePermissions[x]); + } } }, error => this.messageHandlerService.handleError(error) @@ -69,12 +71,16 @@ export class CreateEditGroupComponent { this.groupService.getGroup(id).subscribe( status => { this.group = status.data; - for (let key in this.allPermissions) { - for (const index in this.group.permissions) { - const source = this.allPermissions[key]; - const detail = this.group.permissions[index]; - if (JSON.stringify(source) === JSON.stringify(detail)) { - this.preparePermissions.push(this.allPermissions[key].id.toString()); + for (const key in this.allPermissions) { + if (this.allPermissions.hasOwnProperty(key)) { + for (const index in this.group.permissions) { + if (this.group.permissions.hasOwnProperty(index)) { + const source = this.allPermissions[key]; + const detail = this.group.permissions[index]; + if (JSON.stringify(source) === JSON.stringify(detail)) { + this.preparePermissions.push(this.allPermissions[key].id.toString()); + } + } } } } @@ -103,7 +109,9 @@ export class CreateEditGroupComponent { this.group.permissions = new Array(); this.isSubmitOnGoing = true; for (const k in this.selectPermissions) { - this.group.permissions.push(this.mapPermissions.get(this.selectPermissions[k])); + if (this.selectPermissions.hasOwnProperty(k)) { + this.group.permissions.push(this.mapPermissions.get(this.selectPermissions[k])); + } } switch (this.actionType) { diff --git a/src/frontend/src/app/admin/group/group.component.ts b/src/frontend/src/app/admin/group/group.component.ts index 9758eba7b..5ae241aaa 100644 --- a/src/frontend/src/app/admin/group/group.component.ts +++ b/src/frontend/src/app/admin/group/group.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ListGroupComponent } from './list-group/list-group.component'; import { CreateEditGroupComponent } from './create-edit-group/create-edit-group.component'; @@ -16,7 +16,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './group.component.html', styleUrls: ['./group.component.scss'] }) -export class GroupComponent implements OnInit { +export class GroupComponent implements OnInit, OnDestroy { @ViewChild(ListGroupComponent) listGroup: ListGroupComponent; @ViewChild(CreateEditGroupComponent) diff --git a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts index 78ad93a8f..5642d0b12 100644 --- a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts @@ -62,7 +62,7 @@ export class CreateEditIngressComponent implements OnInit{ this.title = '编辑 Ingress'; this.ingressService.getById(id, 0).subscribe( status => { - this.ingress = status.data + this.ingress = status.data; this.ingress.metaDataObj = JSON.parse(this.ingress.metaData ? this.ingress.metaData : '{}'); this.initJsonEditor(); }, diff --git a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts index 03eaff3bb..1e3675d05 100644 --- a/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/create-edit-ingresstpl/create-edit-ingresstpl.component.ts @@ -19,7 +19,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; templateUrl: 'create-edit-ingresstpl.component.html', styleUrls: ['create-edit-ingresstpl.scss'] }) -export class CreateEditIngressTplComponent implements OnInit{ +export class CreateEditIngressTplComponent implements OnInit { @Output() create = new EventEmitter(); modalOpened: boolean; diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index df89370fa..29d871321 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -75,7 +75,8 @@ export class IngressTplComponent implements OnInit, OnDestroy { retrieve(state?: State): void { if (state) { - this.pageState = PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + this.pageState = + PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; this.ingressTplService.listPage(this.pageState, 0, this.serviceId) diff --git a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts index 39b4dd92d..af51621fc 100644 --- a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts +++ b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts @@ -59,7 +59,7 @@ export class NameFilter implements StringFilter { export class LabelFilter implements StringFilter { accepts(node: Node, search: string): boolean { const keys = Object.keys(node.labels); - for (let key of keys) { + for (const key of keys) { const value = node.labels[key]; if ((key + ':' + value).indexOf(search) >= 0) { return true; diff --git a/src/frontend/src/app/admin/namespace/namespace.component.ts b/src/frontend/src/app/admin/namespace/namespace.component.ts index 4af4f143d..61e5e4f09 100644 --- a/src/frontend/src/app/admin/namespace/namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/namespace.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ListNamespaceComponent } from './list-namespace/list-namespace.component'; import { CreateEditNamespaceComponent } from './create-edit-namespace/create-edit-namespace.component'; @@ -18,7 +18,7 @@ import { Cluster } from '../../shared/model/v1/cluster'; templateUrl: './namespace.component.html', styleUrls: ['./namespace.component.scss'] }) -export class NamespaceComponent implements OnInit { +export class NamespaceComponent implements OnInit, OnDestroy { @ViewChild(ListNamespaceComponent) listNamespace: ListNamespaceComponent; @ViewChild(CreateEditNamespaceComponent) diff --git a/src/frontend/src/app/admin/notification/notification.component.ts b/src/frontend/src/app/admin/notification/notification.component.ts index 8f8a12ffa..6baf9fa52 100644 --- a/src/frontend/src/app/admin/notification/notification.component.ts +++ b/src/frontend/src/app/admin/notification/notification.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { NotificationService } from '../../shared/client/v1/notification.service'; import { ListNotificationComponent } from './list-notification/list-notification.component'; import { AuthService } from '../../shared/auth/auth.service'; @@ -16,7 +16,7 @@ import { CreateNotificationComponent } from './create-notification/create-notifi templateUrl: './notification.component.html', styleUrls: ['./notification.component.scss'] }) -export class NotificationComponent implements OnInit { +export class NotificationComponent implements OnInit, OnDestroy { @ViewChild(ListNotificationComponent) listNotification: ListNotificationComponent; @ViewChild(CreateNotificationComponent) diff --git a/src/frontend/src/app/admin/user/list-user/list-user.component.ts b/src/frontend/src/app/admin/user/list-user/list-user.component.ts index dc3507671..d25bd4f32 100644 --- a/src/frontend/src/app/admin/user/list-user/list-user.component.ts +++ b/src/frontend/src/app/admin/user/list-user/list-user.component.ts @@ -57,7 +57,7 @@ export class ListUserComponent implements OnInit { if (!user) { return '用户不存在'; } - const show: string = user.admin ? '取消管理员' : '设置为管理员'; + const show = user.admin ? '取消管理员' : '设置为管理员'; return show; } diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts index 94cbe3b16..02bb85da6 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts @@ -40,7 +40,7 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { @Output() cloneTpl = new EventEmitter(); subscription: Subscription; - componentName: string = '配置集'; + componentName = '配置集'; constructor(private configMapTplService: ConfigMapTplService, private tplDetailService: TplDetailService, diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts index 09cd27d72..f8a474230 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts @@ -81,7 +81,7 @@ export class CreateEditCronjobTplComponent implements OnInit, AfterViewInit, OnD componentName = '计划任务模板'; top: number; box: HTMLElement; - naviList: string = JSON.stringify(templateDom); + naviList = JSON.stringify(templateDom); eventList: any = new Array(); constructor(private cronjobTplService: CronjobTplService, diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts index 8e58d7bc8..ec1ec0aca 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts @@ -94,7 +94,7 @@ export class CreateEditDaemonSetTplComponent implements OnInit, AfterViewInit, O memoryUnitPrice = 10; top: number; box: HTMLElement; - naviList: string = JSON.stringify(templateDom); + naviList = JSON.stringify(templateDom); eventList: any = Array(); constructor(private daemonSetTplService: DaemonSetTplService, diff --git a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts index 668b57201..c11a54e93 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts +++ b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts @@ -100,7 +100,7 @@ export class CreateEditDeploymentTplComponent implements OnInit, AfterViewInit, memoryUnitPrice = 10; top: number; box: HTMLElement; - naviList: string = JSON.stringify(templateDom); + naviList = JSON.stringify(templateDom); eventList: any[] = Array(); defaultSafeExecCommand = 'sleep\n30'; diff --git a/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts b/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts index a0cb683fa..3d284f7ec 100644 --- a/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts +++ b/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts @@ -32,7 +32,7 @@ export class CreateEditNamespaceUserComponent { checkOnGoing = false; isSubmitOnGoing = false; isNameValid = true; - componentName: string = '命名空间用户'; + componentName = '命名空间用户'; allGroups: Array; mapGroups: Map = new Map(); diff --git a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts index 43ec375a3..addccb02b 100644 --- a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts +++ b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts @@ -91,7 +91,7 @@ export class CreateEditStatefulsettplComponent implements OnInit, AfterViewInit, kubeStatefulSet: KubeStatefulSet = new KubeStatefulSet(); top: number; box: HTMLElement; - naviList: string = JSON.stringify(templateDom); + naviList = JSON.stringify(templateDom); cpuUnitPrice = 30; memoryUnitPrice = 10; eventList: any[] = Array(); diff --git a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts index c179c74a1..8c9ae8266 100644 --- a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts +++ b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.ts @@ -12,7 +12,7 @@ import * as particlesJS from 'particlesjs/dist/particles'; styleUrls: ['./sign-in.component.scss'] }) export class SignInComponent implements OnInit { - version: String = require('../../../../../package.json').version; + version = require('../../../../../package.json').version; errMsg: string; username: string; password: string; diff --git a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts index bf2185d4c..60e5b6d58 100644 --- a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts +++ b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs/Subscription'; }) export class BreadcrumbComponent implements OnInit, OnDestroy { - @Input() prefix: string = ''; + @Input() prefix = ''; urls: string[] = new Array(); private routerSubscription: Subscription; diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index b06f7eeb5..ff4e861b4 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -14,8 +14,8 @@ import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../ export class ConfirmationDialogComponent implements OnDestroy { opened = false; - dialogTitle: string = ''; - dialogContent: string = ''; + dialogTitle = ''; + dialogContent = ''; message: ConfirmationMessage; annouceSubscription: Subscription; buttons: ConfirmationButtons; diff --git a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts index f902e7d3c..49bf54092 100644 --- a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts +++ b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts @@ -65,8 +65,8 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { @Output() onItemsMoved: EventEmitter = new EventEmitter(); // private variables to manage class - searchTermAvailable: string = ''; - searchTermSelected: string = ''; + searchTermAvailable = ''; + searchTermSelected = ''; availableItems: Array = []; backupItems: Array = []; selectedItems: Array = []; diff --git a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts index 807b30b51..936950985 100644 --- a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts @@ -32,8 +32,8 @@ export class FloatWindowItemComponent implements OnInit { ngOnInit() { } - boxState: string = 'leave'; - itemState: string = ''; + boxState = 'leave'; + itemState = ''; get getStyle() { return { diff --git a/src/frontend/src/app/shared/float-window/float-window.component.ts b/src/frontend/src/app/shared/float-window/float-window.component.ts index 9f1635061..2e6641422 100644 --- a/src/frontend/src/app/shared/float-window/float-window.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window.component.ts @@ -42,7 +42,7 @@ export class FloatWindowComponent { } @Input() value: string; - boxState: string = 'leave'; + boxState = 'leave'; childs: QueryList; eventList: any[] = new Array(); diff --git a/src/frontend/src/app/shared/footer/footer.component.ts b/src/frontend/src/app/shared/footer/footer.component.ts index e7886ac24..f3c335508 100644 --- a/src/frontend/src/app/shared/footer/footer.component.ts +++ b/src/frontend/src/app/shared/footer/footer.component.ts @@ -6,8 +6,8 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./footer.component.scss'] }) export class FooterComponent implements OnInit { - version: String = require('../../../../package.json').version; - year: String = new Date().getFullYear().toString(); + version = require('../../../../package.json').version; + year = new Date().getFullYear().toString(); constructor() { } diff --git a/src/frontend/src/app/shared/message-handler/message-handler.service.ts b/src/frontend/src/app/shared/message-handler/message-handler.service.ts index 7a7682df0..d0eed2d1d 100644 --- a/src/frontend/src/app/shared/message-handler/message-handler.service.ts +++ b/src/frontend/src/app/shared/message-handler/message-handler.service.ts @@ -30,25 +30,25 @@ export class MessageHandlerService { public showError(message: string): void { - if (message && message.trim() != '') { + if (message && message.trim() !== '') { this.msgService.announceMessage(500, message, AlertType.DANGER); } } public showSuccess(message: string): void { - if (message && message.trim() != '') { + if (message && message.trim() !== '') { this.msgService.announceMessage(200, message, AlertType.SUCCESS); } } public showInfo(message: string): void { - if (message && message.trim() != '') { + if (message && message.trim() !== '') { this.msgService.announceMessage(200, message, AlertType.INFO); } } public showWarning(message: string): void { - if (message && message.trim() != '') { + if (message && message.trim() !== '') { this.msgService.announceMessage(400, message, AlertType.WARNING); } } diff --git a/src/frontend/src/app/shared/modal-operate/modal-operate.component.ts b/src/frontend/src/app/shared/modal-operate/modal-operate.component.ts index e4611d0ba..850d0eebd 100644 --- a/src/frontend/src/app/shared/modal-operate/modal-operate.component.ts +++ b/src/frontend/src/app/shared/modal-operate/modal-operate.component.ts @@ -20,10 +20,15 @@ export class ModalOperateComponent implements OnInit { fullPageChange(full: boolean) { this.fullPage = full; - if (!this.modal) throw Error('请绑定modal'); + if (!this.modal) { + throw Error('请绑定modal'); + } const target = this.getParentBody(this.element).querySelector('.modal-dialog'); - if (this.fullPage) target.classList.add('fullPage'); - else target.classList.remove('fullPage'); + if (this.fullPage) { + target.classList.add('fullPage'); + } else { + target.classList.remove('fullPage'); + } } getParentBody(element: Element) { diff --git a/src/frontend/src/app/shared/model/v1/apikey.ts b/src/frontend/src/app/shared/model/v1/apikey.ts index 3819b7946..aa95eb359 100644 --- a/src/frontend/src/app/shared/model/v1/apikey.ts +++ b/src/frontend/src/app/shared/model/v1/apikey.ts @@ -19,8 +19,4 @@ export class ApiKey { deleted: boolean; createTime: Date; updateTime: Date; - //[ApiKey:] - - - //[end] } diff --git a/src/frontend/src/app/shared/model/v1/cluster.ts b/src/frontend/src/app/shared/model/v1/cluster.ts index 9c2101052..aa72d33bc 100644 --- a/src/frontend/src/app/shared/model/v1/cluster.ts +++ b/src/frontend/src/app/shared/model/v1/cluster.ts @@ -13,8 +13,12 @@ export class Cluster { checked: boolean; constructor(name?: string, checked?: boolean) { - if (name) this.name = name; - if (checked) this.checked = checked; + if (name) { + this.name = name; + } + if (checked) { + this.checked = checked; + } this.kubeConfig = '{}'; this.metaData = '{}'; } diff --git a/src/frontend/src/app/shared/model/v1/cronjob.ts b/src/frontend/src/app/shared/model/v1/cronjob.ts index a61dfc0df..76045d007 100644 --- a/src/frontend/src/app/shared/model/v1/cronjob.ts +++ b/src/frontend/src/app/shared/model/v1/cronjob.ts @@ -31,8 +31,12 @@ export class PodAntiAffinity { constructor(init?: PodAntiAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -133,8 +137,12 @@ export class PodAffinity { constructor(init?: PodAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -147,6 +155,23 @@ export class PodAffinity { } +export class NodeSelectorTerm { + matchExpressions: NodeSelectorRequirement[]; + + constructor(init?: NodeSelectorTerm) { + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } + } + + + static emptyObject(): NodeSelectorTerm { + const result = new NodeSelectorTerm(); + result.matchExpressions = []; + return result; + } + +} + export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; @@ -187,23 +212,6 @@ export class NodeSelectorRequirement { } -export class NodeSelectorTerm { - matchExpressions: NodeSelectorRequirement[]; - - constructor(init?: NodeSelectorTerm) { - if (!init) { return; } - if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } - } - - - static emptyObject(): NodeSelectorTerm { - const result = new NodeSelectorTerm(); - result.matchExpressions = []; - return result; - } - -} - export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; @@ -227,8 +235,12 @@ export class NodeAffinity { constructor(init?: NodeAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } diff --git a/src/frontend/src/app/shared/model/v1/namespace.ts b/src/frontend/src/app/shared/model/v1/namespace.ts index 790ee73e9..aefeeefbc 100644 --- a/src/frontend/src/app/shared/model/v1/namespace.ts +++ b/src/frontend/src/app/shared/model/v1/namespace.ts @@ -1,3 +1,16 @@ +export class NamespaceMetaData { + namespace: string; + clusterMeta: { [key: string]: ClusterMeta }; + imagePullSecrets: LocalObjectReference[]; + env: EnvVar[]; + + constructor() { + this.imagePullSecrets = []; + this.env = []; + this.clusterMeta = {}; + } +} + export class Namespace { id: number; name: string; @@ -47,19 +60,6 @@ export class ClusterMeta { } } -export class NamespaceMetaData { - namespace: string; - clusterMeta: { [key: string]: ClusterMeta }; - imagePullSecrets: LocalObjectReference[]; - env: EnvVar[]; - - constructor() { - this.imagePullSecrets = []; - this.env = []; - this.clusterMeta = {}; - } -} - export class EnvVar { name: string; value: string; diff --git a/src/frontend/src/app/shared/model/v1/publish-status.ts b/src/frontend/src/app/shared/model/v1/publish-status.ts index f4b4a2dc3..f66e3a462 100644 --- a/src/frontend/src/app/shared/model/v1/publish-status.ts +++ b/src/frontend/src/app/shared/model/v1/publish-status.ts @@ -11,8 +11,6 @@ export class PublishStatus { resourceId: number; templateId: number; cluster: string; - //[PublishStatus:] - //[end] state: TemplateState; pvc: KubePersistentVolumeClaim; fileSystemStatus: PersistentVolumeClaimFileSystemStatus; diff --git a/src/frontend/src/app/shared/model/v1/statefulset.ts b/src/frontend/src/app/shared/model/v1/statefulset.ts index ae75797ba..271ac349b 100644 --- a/src/frontend/src/app/shared/model/v1/statefulset.ts +++ b/src/frontend/src/app/shared/model/v1/statefulset.ts @@ -1,5 +1,55 @@ /* Do not change, this code is generated from Golang structs */ +export class LabelSelectorRequirement { + key: string; + operator: string; + values: string[]; + + constructor(init?: LabelSelectorRequirement) { + if (!init) { return; } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.values) { + this.values = init.values; + } + } + + + static emptyObject(): LabelSelectorRequirement { + const result = new LabelSelectorRequirement(); + result.values = []; + return result; + } + +} + +export class LabelSelector { + matchLabels?: { [key: string]: string }; + matchExpressions: LabelSelectorRequirement[]; + + constructor(init?: LabelSelector) { + if (!init) { return; } + if (init.matchLabels) { + this.matchLabels = init.matchLabels; + } + if (init.matchExpressions) { + this.matchExpressions = init.matchExpressions; + } + } + + + static emptyObject(): LabelSelector { + const result = new LabelSelector(); + result.matchLabels = null; + result.matchExpressions = []; + return result; + } + +} export class Namespace { id: number; name: string; @@ -276,81 +326,49 @@ export class WeightedPodAffinityTerm { } -export class LabelSelectorRequirement { - key: string; - operator: string; - values: string[]; +export class PodAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - constructor(init?: LabelSelectorRequirement) { + constructor(init?: PodAffinity) { if (!init) { return; } - if (init.key) { - this.key = init.key; - } - if (init.operator) { - this.operator = init.operator; + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.values) { - this.values = init.values; + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } } - static emptyObject(): LabelSelectorRequirement { - const result = new LabelSelectorRequirement(); - result.values = []; + static emptyObject(): PodAffinity { + const result = new PodAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; } } -export class LabelSelector { - matchLabels?: { [key: string]: string }; - matchExpressions: LabelSelectorRequirement[]; +export class NodeSelectorTerm { + matchExpressions: NodeSelectorRequirement[]; - constructor(init?: LabelSelector) { + constructor(init?: NodeSelectorTerm) { if (!init) { return; } - if (init.matchLabels) { - this.matchLabels = init.matchLabels; - } if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } } - static emptyObject(): LabelSelector { - const result = new LabelSelector(); - result.matchLabels = null; + static emptyObject(): NodeSelectorTerm { + const result = new NodeSelectorTerm(); result.matchExpressions = []; return result; } } -export class PodAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - - constructor(init?: PodAffinity) { - if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; - } - } - - - static emptyObject(): PodAffinity { - const result = new PodAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - -} - export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; @@ -401,25 +419,6 @@ export class NodeSelectorRequirement { } -export class NodeSelectorTerm { - matchExpressions: NodeSelectorRequirement[]; - - constructor(init?: NodeSelectorTerm) { - if (!init) { return; } - if (init.matchExpressions) { - this.matchExpressions = init.matchExpressions; - } - } - - - static emptyObject(): NodeSelectorTerm { - const result = new NodeSelectorTerm(); - result.matchExpressions = []; - return result; - } - -} - export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; diff --git a/src/frontend/src/app/shared/model/v1/statefulsettpl.ts b/src/frontend/src/app/shared/model/v1/statefulsettpl.ts index 41b95fd42..e7568035a 100644 --- a/src/frontend/src/app/shared/model/v1/statefulsettpl.ts +++ b/src/frontend/src/app/shared/model/v1/statefulsettpl.ts @@ -3,6 +3,41 @@ import { TemplateStatus } from './status'; +export class Namespace { + id: number; + name: string; + metaData: string; + createTime?: Date; + updateTime?: Date; + user: string; + deleted: boolean; + + constructor(init?: Namespace) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.createTime) { this.createTime = new Date(init.createTime as any); } + if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + } + + + static emptyObject(): Namespace { + const result = new Namespace(); + result.id = 0; + result.name = ''; + result.metaData = ''; + result.createTime = null; + result.updateTime = null; + result.user = ''; + result.deleted = false; + return result; + } + +} + export class User { id: number; name: string; @@ -123,45 +158,6 @@ export class AppStarred { } - - - -export class Namespace { - id: number; - name: string; - metaData: string; - createTime?: Date; - updateTime?: Date; - user: string; - deleted: boolean; - - constructor(init?: Namespace) { - if (!init) { return; } - if (init.id) { this.id = init.id; } - if (init.name) { this.name = init.name; } - if (init.metaData) { this.metaData = init.metaData; } - if (init.createTime) { this.createTime = new Date(init.createTime as any); } - if (init.updateTime) { this.updateTime = new Date(init.updateTime as any); } - if (init.user) { this.user = init.user; } - if (init.deleted) { this.deleted = init.deleted; } - } - - - static emptyObject(): Namespace { - const result = new Namespace(); - result.id = 0; - result.name = ''; - result.metaData = ''; - result.createTime = null; - result.updateTime = null; - result.user = ''; - result.deleted = false; - return result; - } - -} - - export class Statefulset { id: number; name: string; diff --git a/src/frontend/src/app/shared/utils.ts b/src/frontend/src/app/shared/utils.ts index d017d1b55..561e0e761 100644 --- a/src/frontend/src/app/shared/utils.ts +++ b/src/frontend/src/app/shared/utils.ts @@ -45,14 +45,16 @@ export function mergeDeep(target, ...sources) { const source = sources.shift(); if (isObject(target) && isObject(source)) { - for (let key in source) { - if (isObject(source[key])) { - if (!target[key]) { - Object.assign(target, {[key]: {}}); + for (const key in source) { + if (source.hasOwnProperty(key)) { + if (isObject(source[key])) { + if (!target[key]) { + Object.assign(target, {[key]: {}}); + } + mergeDeep(target[key], source[key]); + } else { + Object.assign(target, {[key]: source[key]}); } - mergeDeep(target[key], source[key]); - } else { - Object.assign(target, {[key]: source[key]}); } } } From 9d200d5e94e0f2740f82c87e7143a6970863f2ed Mon Sep 17 00:00:00 2001 From: silenceshell Date: Tue, 15 Jan 2019 00:15:45 +0800 Subject: [PATCH 007/112] should translate DEPLOYMENT_TMP_LIST Should translate DEPLOYMENT_ADMIN.TMP.DEPLOYMENT_TMP_LIST, or we will get "DEPLOYMENT_ADMIN.TMP.DEPLOYMENT_TMP_LIST" on the web site. --- .../src/app/admin/deploymenttpl/deploymenttpl.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.html b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.html index 50947b223..5f54b3d1c 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.html +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.html @@ -1,7 +1,7 @@
-

{{'DEPLOYMENT_ADMIN.TMP.DEPLOYMENT_TMP_LIST'}}

+

{{'DEPLOYMENT_ADMIN.TMP.DEPLOYMENT_TMP_LIST' | translate}}

From e393a110384de3d2f1769c934d7f9d749d757021 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 11:09:01 +0800 Subject: [PATCH 008/112] frontend --- .../src/app/shared/model/v1/cronjob.ts | 87 ++++----- .../src/app/shared/model/v1/daemonset.ts | 179 +++++++++-------- .../src/app/shared/model/v1/daemonsettpl.ts | 8 +- .../app/shared/model/v1/deployment-list.ts | 88 ++++----- .../src/app/shared/model/v1/deployment.ts | 183 ++++++++++-------- 5 files changed, 287 insertions(+), 258 deletions(-) diff --git a/src/frontend/src/app/shared/model/v1/cronjob.ts b/src/frontend/src/app/shared/model/v1/cronjob.ts index 76045d007..afef39529 100644 --- a/src/frontend/src/app/shared/model/v1/cronjob.ts +++ b/src/frontend/src/app/shared/model/v1/cronjob.ts @@ -24,50 +24,6 @@ export class ClusterMeta { } } - -export class PodAntiAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - - constructor(init?: PodAntiAffinity) { - if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; - } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; - } - } - - - static emptyObject(): PodAntiAffinity { - const result = new PodAntiAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - -} - -export class WeightedPodAffinityTerm { - weight: number; - podAffinityTerm: PodAffinityTerm; - - constructor(init?: WeightedPodAffinityTerm) { - if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } - } - - - static emptyObject(): WeightedPodAffinityTerm { - const result = new WeightedPodAffinityTerm(); - result.podAffinityTerm = PodAffinityTerm.emptyObject(); - return result; - } - -} - export class LabelSelectorRequirement { key: string; operator: string; @@ -131,6 +87,49 @@ export class PodAffinityTerm { } +export class PodAntiAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; + + constructor(init?: PodAntiAffinity) { + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } + } + + + static emptyObject(): PodAntiAffinity { + const result = new PodAntiAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; + return result; + } + +} + +export class WeightedPodAffinityTerm { + weight: number; + podAffinityTerm: PodAffinityTerm; + + constructor(init?: WeightedPodAffinityTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } + } + + + static emptyObject(): WeightedPodAffinityTerm { + const result = new WeightedPodAffinityTerm(); + result.podAffinityTerm = PodAffinityTerm.emptyObject(); + return result; + } + +} + export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; diff --git a/src/frontend/src/app/shared/model/v1/daemonset.ts b/src/frontend/src/app/shared/model/v1/daemonset.ts index 6ab072a91..9b1cf51b1 100644 --- a/src/frontend/src/app/shared/model/v1/daemonset.ts +++ b/src/frontend/src/app/shared/model/v1/daemonset.ts @@ -1,54 +1,18 @@ /* Do not change, this code is generated from Golang structs */ import { App } from './app'; -export class DaemonSet { - id: number; - name: string; - metaData: string; - app?: App; - description: string; - metaDataObj: DaemonSetMetaData; - createTime: Date; - updateTime: Date; - user: string; - deleted: boolean; - appId: number; - order: number; - - constructor(init?: DaemonSet) { - if (!init) { return; } - if (init.id) { this.id = init.id; } - if (init.name) { this.name = init.name; } - if (init.metaData) { this.metaData = init.metaData; } - if (init.app) { this.app = init.app; } - if (init.description) { this.description = init.description; } - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); - if (init.user) { this.user = init.user; } - if (init.deleted) { this.deleted = init.deleted; } - if (init.appId) { this.appId = init.appId; } - } - - - static emptyObject(): DaemonSet { - const result = new DaemonSet(); - result.app = App.emptyObject(); - result.createTime = null; - result.updateTime = null; - return result; - } - -} - - export class PodAntiAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAntiAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -61,25 +25,6 @@ export class PodAntiAffinity { } -export class WeightedPodAffinityTerm { - weight: number; - podAffinityTerm: PodAffinityTerm; - - constructor(init?: WeightedPodAffinityTerm) { - if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } - } - - - static emptyObject(): WeightedPodAffinityTerm { - const result = new WeightedPodAffinityTerm(); - result.podAffinityTerm = PodAffinityTerm.emptyObject(); - return result; - } - -} - export class LabelSelectorRequirement { key: string; operator: string; @@ -143,40 +88,44 @@ export class PodAffinityTerm { } -export class PodAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; +export class WeightedPodAffinityTerm { + weight: number; + podAffinityTerm: PodAffinityTerm; - constructor(init?: PodAffinity) { + constructor(init?: WeightedPodAffinityTerm) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } } - static emptyObject(): PodAffinity { - const result = new PodAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; + static emptyObject(): WeightedPodAffinityTerm { + const result = new WeightedPodAffinityTerm(); + result.podAffinityTerm = PodAffinityTerm.emptyObject(); return result; } } -export class PreferredSchedulingTerm { - weight: number; - preference: NodeSelectorTerm; +export class PodAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - constructor(init?: PreferredSchedulingTerm) { + constructor(init?: PodAffinity) { if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.preference) { this.preference = init.preference; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } - static emptyObject(): PreferredSchedulingTerm { - const result = new PreferredSchedulingTerm(); - result.preference = NodeSelectorTerm.emptyObject(); + static emptyObject(): PodAffinity { + const result = new PodAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; return result; } @@ -220,6 +169,25 @@ export class NodeSelectorTerm { } +export class PreferredSchedulingTerm { + weight: number; + preference: NodeSelectorTerm; + + constructor(init?: PreferredSchedulingTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.preference) { this.preference = init.preference; } + } + + + static emptyObject(): PreferredSchedulingTerm { + const result = new PreferredSchedulingTerm(); + result.preference = NodeSelectorTerm.emptyObject(); + return result; + } + +} + export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; @@ -243,8 +211,12 @@ export class NodeAffinity { constructor(init?: NodeAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -302,3 +274,46 @@ export class DaemonSetMetaData { } } + +export class DaemonSet { + id: number; + name: string; + metaData: string; + app?: App; + description: string; + metaDataObj: DaemonSetMetaData; + createTime: Date; + updateTime: Date; + user: string; + deleted: boolean; + appId: number; + order: number; + + constructor(init?: DaemonSet) { + if (!init) { return; } + if (init.id) { this.id = init.id; } + if (init.name) { this.name = init.name; } + if (init.metaData) { this.metaData = init.metaData; } + if (init.app) { this.app = init.app; } + if (init.description) { this.description = init.description; } + if (init.createTime) { + this.createTime = new Date(init.createTime as any); + } + if (init.updateTime) { + this.updateTime = new Date(init.updateTime as any); + } + if (init.user) { this.user = init.user; } + if (init.deleted) { this.deleted = init.deleted; } + if (init.appId) { this.appId = init.appId; } + } + + + static emptyObject(): DaemonSet { + const result = new DaemonSet(); + result.app = App.emptyObject(); + result.createTime = null; + result.updateTime = null; + return result; + } + +} diff --git a/src/frontend/src/app/shared/model/v1/daemonsettpl.ts b/src/frontend/src/app/shared/model/v1/daemonsettpl.ts index 7c348a406..7c9c817ce 100644 --- a/src/frontend/src/app/shared/model/v1/daemonsettpl.ts +++ b/src/frontend/src/app/shared/model/v1/daemonsettpl.ts @@ -23,8 +23,12 @@ export class DaemonSetTemplate { if (init.template) { this.template = init.template; } if (init.daemonSet) { this.daemonSet = init.daemonSet; } if (init.description) { this.description = init.description; } - if (init.createTime) this.createTime = new Date(init.createTime as any); - if (init.updateTime) this.updateTime = new Date(init.updateTime as any); + if (init.createTime) { + this.createTime = new Date(init.createTime as any); + } + if (init.updateTime) { + this.updateTime = new Date(init.updateTime as any); + } if (init.user) { this.user = init.user; } if (init.deleted) { this.deleted = init.deleted; } if (init.daemonSetId) { this.daemonSetId = init.daemonSetId; } diff --git a/src/frontend/src/app/shared/model/v1/deployment-list.ts b/src/frontend/src/app/shared/model/v1/deployment-list.ts index a7bd71489..9ce66f608 100644 --- a/src/frontend/src/app/shared/model/v1/deployment-list.ts +++ b/src/frontend/src/app/shared/model/v1/deployment-list.ts @@ -17,6 +17,50 @@ export class TypeMeta { } +export class Time { + Time: Date; + + constructor(init?: Time) { + if (!init) { return; } + if (init.Time) { this.Time = new Date(init.Time as any); } + } + + + static emptyObject(): Time { + const result = new Time(); + result.Time = null; + return result; + } + +} + +export class ObjectMeta { + name: string; + namespace: string; + labels?: { [key: string]: string }; + annotations?: { [key: string]: string }; + creationTimestamp: Time; + + constructor(init?: ObjectMeta) { + if (!init) { return; } + if (init.name) { this.name = init.name; } + if (init.namespace) { this.namespace = init.namespace; } + if (init.labels) { this.labels = init.labels; } + if (init.annotations) { this.annotations = init.annotations; } + if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } + } + + + static emptyObject(): ObjectMeta { + const result = new ObjectMeta(); + result.labels = null; + result.annotations = null; + result.creationTimestamp = Time.emptyObject(); + return result; + } + +} + export class Event { objectMeta: ObjectMeta; typeMeta: TypeMeta; @@ -86,50 +130,6 @@ export class PodInfo { } -export class Time { - Time: Date; - - constructor(init?: Time) { - if (!init) { return; } - if (init.Time) { this.Time = new Date(init.Time as any); } - } - - - static emptyObject(): Time { - const result = new Time(); - result.Time = null; - return result; - } - -} - -export class ObjectMeta { - name: string; - namespace: string; - labels?: { [key: string]: string }; - annotations?: { [key: string]: string }; - creationTimestamp: Time; - - constructor(init?: ObjectMeta) { - if (!init) { return; } - if (init.name) { this.name = init.name; } - if (init.namespace) { this.namespace = init.namespace; } - if (init.labels) { this.labels = init.labels; } - if (init.annotations) { this.annotations = init.annotations; } - if (init.creationTimestamp) { this.creationTimestamp = init.creationTimestamp; } - } - - - static emptyObject(): ObjectMeta { - const result = new ObjectMeta(); - result.labels = null; - result.annotations = null; - result.creationTimestamp = Time.emptyObject(); - return result; - } - -} - export class DeploymentList { objectMeta: ObjectMeta; pods: PodInfo; diff --git a/src/frontend/src/app/shared/model/v1/deployment.ts b/src/frontend/src/app/shared/model/v1/deployment.ts index 6a23b7669..d07a3ef5b 100644 --- a/src/frontend/src/app/shared/model/v1/deployment.ts +++ b/src/frontend/src/app/shared/model/v1/deployment.ts @@ -1,70 +1,5 @@ import { App } from './app'; -export class Deployment { - id: number; - name: string; - metaData: string; - deleted: boolean; - appId: number; - user: string; - metaDataObj: DeploymentMetaData; - createTime: Date; - updateTime: Date; - app: App; - order: number; - description: string; -} - -export class ClusterMeta { - constructor(checked?: boolean) { - this.checked = checked; - this.value = 0; - } - - checked: boolean; - value: number; -} - - -export class PodAntiAffinity { - requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; - preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; - - constructor(init?: PodAntiAffinity) { - if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } - } - - - static emptyObject(): PodAntiAffinity { - const result = new PodAntiAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - -} - -export class WeightedPodAffinityTerm { - weight: number; - podAffinityTerm: PodAffinityTerm; - - constructor(init?: WeightedPodAffinityTerm) { - if (!init) { return; } - if (init.weight) { this.weight = init.weight; } - if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } - } - - - static emptyObject(): WeightedPodAffinityTerm { - const result = new WeightedPodAffinityTerm(); - result.podAffinityTerm = PodAffinityTerm.emptyObject(); - return result; - } - -} - export class LabelSelectorRequirement { key: string; operator: string; @@ -128,14 +63,86 @@ export class PodAffinityTerm { } +export class PodAntiAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; + + constructor(init?: PodAntiAffinity) { + if (!init) { return; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } + } + + + static emptyObject(): PodAntiAffinity { + const result = new PodAntiAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; + return result; + } + +} + +export class Deployment { + id: number; + name: string; + metaData: string; + deleted: boolean; + appId: number; + user: string; + metaDataObj: DeploymentMetaData; + createTime: Date; + updateTime: Date; + app: App; + order: number; + description: string; +} + +export class ClusterMeta { + constructor(checked?: boolean) { + this.checked = checked; + this.value = 0; + } + + checked: boolean; + value: number; +} + +export class WeightedPodAffinityTerm { + weight: number; + podAffinityTerm: PodAffinityTerm; + + constructor(init?: WeightedPodAffinityTerm) { + if (!init) { return; } + if (init.weight) { this.weight = init.weight; } + if (init.podAffinityTerm) { this.podAffinityTerm = init.podAffinityTerm; } + } + + + static emptyObject(): WeightedPodAffinityTerm { + const result = new WeightedPodAffinityTerm(); + result.podAffinityTerm = PodAffinityTerm.emptyObject(); + return result; + } + +} + export class PodAffinity { requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; constructor(init?: PodAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } @@ -148,6 +155,23 @@ export class PodAffinity { } +export class NodeSelectorTerm { + matchExpressions: NodeSelectorRequirement[]; + + constructor(init?: NodeSelectorTerm) { + if (!init) { return; } + if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } + } + + + static emptyObject(): NodeSelectorTerm { + const result = new NodeSelectorTerm(); + result.matchExpressions = []; + return result; + } + +} + export class PreferredSchedulingTerm { weight: number; preference: NodeSelectorTerm; @@ -188,23 +212,6 @@ export class NodeSelectorRequirement { } -export class NodeSelectorTerm { - matchExpressions: NodeSelectorRequirement[]; - - constructor(init?: NodeSelectorTerm) { - if (!init) { return; } - if (init.matchExpressions) { this.matchExpressions = init.matchExpressions; } - } - - - static emptyObject(): NodeSelectorTerm { - const result = new NodeSelectorTerm(); - result.matchExpressions = []; - return result; - } - -} - export class NodeSelector { nodeSelectorTerms: NodeSelectorTerm[]; @@ -228,8 +235,12 @@ export class NodeAffinity { constructor(init?: NodeAffinity) { if (!init) { return; } - if (init.requiredDuringSchedulingIgnoredDuringExecution) { this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; } - if (init.preferredDuringSchedulingIgnoredDuringExecution) { this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } } From a8e9879508ba6a1bac5541beca35a22b5be451a4 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 11:13:07 +0800 Subject: [PATCH 009/112] frontend:fix all tslint error --- src/frontend/e2e/src/app.e2e-spec.ts | 2 +- src/frontend/lang.js | 4 +- .../src/app/admin/app/app.component.ts | 4 +- .../create-edit-app.component.ts | 4 +- .../app/admin/cluster/cluster.component.ts | 3 +- .../admin/cronjobtpl/cronjobtpl.component.ts | 4 +- .../admin/daemonset/daemonset.component.ts | 4 +- .../daemonsettpl/daemonsettpl.component.ts | 4 +- .../create-edit-deployment.component.ts | 2 +- .../create-edit-ingress.component.ts | 2 +- .../trash-ingress/trash-ingress.component.ts | 2 +- .../admin/ingresstpl/ingresstpl.component.ts | 2 +- .../admin/permission/permission.component.ts | 4 +- ...te-edit-persistentvolumeclaim.component.ts | 2 +- .../persistentvolumeclaim.component.ts | 4 +- .../persistentvolumeclaimtpl.component.ts | 8 +- .../persistentvolumeclaimtpl.module.ts | 4 +- .../reportform/deploy/deploy.component.ts | 4 +- .../create-edit-secret.component.ts | 4 +- .../src/app/admin/secret/secret.component.ts | 4 +- .../create-edit-secrettpl.component.ts | 4 +- .../admin/secrettpl/secrettpl.component.ts | 4 +- .../create-edit-statefulset.component.ts | 2 +- .../statefulset/statefulset.component.ts | 4 +- .../statefulsettpl.component.ts | 4 +- .../create-edit-user.component.ts | 3 - .../reset-password.component.ts | 5 +- .../src/app/admin/user/user.component.ts | 4 +- src/frontend/src/app/app-config.service.ts | 6 +- src/frontend/src/app/app.module.ts | 4 +- .../create-edit-apikey.component.ts | 2 +- .../app/portal/app-user/app-user.component.ts | 4 +- .../create-edit-app-user.component.ts | 30 +++--- .../app-webhook/app-webhook.component.ts | 4 +- .../create-edit-app-webhook.component.ts | 4 +- .../src/app/portal/app/app.component.ts | 14 +-- .../create-edit-app.component.ts | 2 +- .../app/detail-app/detail-app.component.ts | 4 +- .../portal/autoscale/autoscale.component.ts | 2 +- .../list-autoscale.component.ts | 2 +- .../src/app/portal/base/base.component.ts | 11 ++- .../portal/configmap/configmap.component.ts | 22 +++-- .../create-edit-configmap.component.ts | 2 +- .../publish-tpl/publish-tpl.component.ts | 4 +- .../app/portal/cronjob/cronjob.component.ts | 13 +-- .../cronjob/list-job/list-job.component.ts | 4 +- .../cronjob/list-pod/list-pod.component.ts | 8 +- .../publish-tpl/publish-tpl.component.ts | 10 +- .../create-edit-daemonset.component.ts | 2 +- .../portal/daemonset/daemonset.component.ts | 10 +- .../list-daemonset.component.ts | 2 +- .../daemonset/list-pod/list-pod.component.ts | 16 ++-- .../publish-tpl/publish-tpl.component.ts | 12 ++- .../create-edit-deployment.component.ts | 2 +- .../deployment/list-pod/list-pod.component.ts | 19 ++-- .../publish-tpl/publish-tpl.component.ts | 4 +- .../app/portal/ingress/ingress.component.ts | 2 +- .../list-ingress/list-ingress.component.ts | 2 +- .../namespace-apikey/apikey.component.ts | 4 +- .../history/history.component.ts | 12 ++- .../create-edit-namespace-user.component.ts | 28 ++++-- .../namespace-user.component.ts | 4 +- ...create-edit-namespace-webhook.component.ts | 4 +- .../namespace-webhook.component.ts | 4 +- .../src/app/portal/nav/nav.component.html | 2 +- .../src/app/portal/nav/nav.component.ts | 6 +- ...te-edit-persistentvolumeclaim.component.ts | 2 +- .../create-snapshot.component.ts | 7 +- .../list-persistentvolumeclaim.component.ts | 19 ++-- .../persistentvolumeclaim.module.ts | 8 +- .../publish-tpl/publish-tpl.component.ts | 4 +- ...napshot-persistentvolumeclaim.component.ts | 21 ++-- .../pod-logging/pod-logging.component.ts | 15 ++- .../pod-terminal/pod-terminal.component.ts | 16 ++-- .../src/app/portal/portal-routing.module.ts | 8 +- .../create-edit-secret.component.ts | 2 +- .../publish-tpl/publish-tpl.component.ts | 4 +- .../src/app/portal/secret/secret.component.ts | 19 ++-- .../list-pod/list-pod.component.ts | 19 ++-- .../list-statefulset.component.ts | 2 +- .../publish-tpl/publish-tpl.component.ts | 6 +- .../ace-editor-box.component.ts | 2 +- .../shared/ace-editor/ace-editor.component.ts | 4 +- .../shared/ace-editor/ace-editor.service.ts | 4 - .../base/kubernetes/kubernetes-resource.ts | 4 +- .../shared/base/resource/publish-template.ts | 2 +- .../shared/breadcrumb/breadcrumb.component.ts | 8 +- .../checkbox-group.component.ts | 2 +- .../app/shared/client/v1/autoscale.service.ts | 2 +- .../shared/client/v1/autoscaletpl.service.ts | 2 +- .../app/shared/client/v1/cluster.service.ts | 3 +- .../app/shared/client/v1/configmap.service.ts | 2 +- .../src/app/shared/client/v1/copy.service.ts | 8 +- .../app/shared/client/v1/cronjob.service.ts | 2 +- .../app/shared/client/v1/daemonset.service.ts | 6 +- .../shared/client/v1/deployment.service.ts | 2 +- .../shared/client/v1/ingresstpl.service.ts | 4 +- .../app/shared/client/v1/kubernetes/common.ts | 3 +- .../shared/client/v1/kubernetes/deployment.ts | 3 +- .../shared/client/v1/kubernetes/ingress.ts | 8 +- .../app/shared/client/v1/kubernetes/log.ts | 3 +- .../shared/client/v1/kubernetes/namespace.ts | 2 +- .../persistentvolumeclaims-robin.ts | 13 ++- .../v1/persistentvolumeclaim.service.ts | 2 +- .../app/shared/client/v1/secret.service.ts | 2 +- .../shared/client/v1/select-copy.service.ts | 19 +++- .../shared/client/v1/statefulset.service.ts | 8 +- .../app/shared/client/v1/storage.service.ts | 6 +- .../src/app/shared/client/v1/tip.service.ts | 8 +- .../confirmation-dialog.component.ts | 6 +- .../confirmation-message.ts | 2 +- .../app/shared/dropdown/dropdown.component.ts | 4 +- .../dropdown/item/dropdown-item.component.ts | 2 +- .../app/shared/dual-list-box/array.pipes.ts | 1 - .../dual-list-box/dual-list-box.component.ts | 95 ++++++++++--------- .../shared/filter-box/filter-box.component.ts | 12 ++- .../float-window-item.component.ts | 6 +- .../float-window/float-window.component.ts | 10 +- .../src/app/shared/input/input.component.ts | 14 +-- .../shared/interceptor/auth-interceptor.ts | 2 +- .../message-handler.service.ts | 12 +-- 121 files changed, 456 insertions(+), 384 deletions(-) diff --git a/src/frontend/e2e/src/app.e2e-spec.ts b/src/frontend/e2e/src/app.e2e-spec.ts index b776c76e3..50860c1e3 100644 --- a/src/frontend/e2e/src/app.e2e-spec.ts +++ b/src/frontend/e2e/src/app.e2e-spec.ts @@ -1,7 +1,7 @@ import { FrontendPage } from './app.po'; describe('frontend App', () => { - let page: FrontendPage; + const page: FrontendPage; beforeEach(() => { page = new FrontendPage(); diff --git a/src/frontend/lang.js b/src/frontend/lang.js index 20e4ac1f2..bdd007f33 100644 --- a/src/frontend/lang.js +++ b/src/frontend/lang.js @@ -25,7 +25,7 @@ if (process.argv[2] === 'fill') { for(let file of files) { const filePath = path.resolve(__dirname, 'src/assets/i18n', file +'.json'); if (fs.existsSync(filePath)) { - let value = require(filePath); + const value = require(filePath); if (typeof value !== 'object') { value = {}; } @@ -108,4 +108,4 @@ if (process.argv[2] === 'sort') { } }) } -} \ No newline at end of file +} diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index b14d9458e..bc11c1306 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; @@ -19,7 +19,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './app.component.html', styleUrls: ['./app.component.scss'] }) -export class AppComponent implements OnInit { +export class AppComponent implements OnInit, OnDestroy { @ViewChild(ListAppComponent) listApp: ListAppComponent; @ViewChild(CreateEditAppComponent) diff --git a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts index 7c5394899..45e386458 100644 --- a/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts +++ b/src/frontend/src/app/admin/app/create-edit-app/create-edit-app.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { NgForm } from '@angular/forms'; @@ -17,7 +17,7 @@ import { AceEditorBoxComponent } from '../../../shared/ace-editor/ace-editor-box templateUrl: 'create-edit-app.component.html', styleUrls: ['create-edit-app.scss'] }) -export class CreateEditAppComponent { +export class CreateEditAppComponent implements OnInit { @Output() create = new EventEmitter(); createAppOpened: boolean; diff --git a/src/frontend/src/app/admin/cluster/cluster.component.ts b/src/frontend/src/app/admin/cluster/cluster.component.ts index 2178c3be9..edec11430 100644 --- a/src/frontend/src/app/admin/cluster/cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/cluster.component.ts @@ -1,5 +1,4 @@ -import { Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts index 863014c55..b0cbc9a5d 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './cronjobtpl.component.html', styleUrls: ['./cronjobtpl.component.scss'] }) -export class CronjobTplComponent implements OnInit { +export class CronjobTplComponent implements OnInit, OnDestroy { @ViewChild(ListCronjobTplComponent) list: ListCronjobTplComponent; @ViewChild(CreateEditCronjobTplComponent) diff --git a/src/frontend/src/app/admin/daemonset/daemonset.component.ts b/src/frontend/src/app/admin/daemonset/daemonset.component.ts index 713185ad6..e0b1f2a83 100644 --- a/src/frontend/src/app/admin/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/daemonset.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -18,7 +18,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './daemonset.component.html', styleUrls: ['./daemonset.component.scss'] }) -export class DaemonsetComponent implements OnInit { +export class DaemonsetComponent implements OnInit, OnDestroy { @ViewChild(ListDaemonsetComponent) listDaemonset: ListDaemonsetComponent; diff --git a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts index 04119a6b6..45083981c 100644 --- a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { DaemonSetTemplate } from '../../shared/model/v1/daemonsettpl'; templateUrl: './daemonsettpl.component.html', styleUrls: ['./daemonsettpl.component.scss'] }) -export class DaemonsettplComponent implements OnInit { +export class DaemonsettplComponent implements OnInit, OnDestroy { @ViewChild(ListDaemonsettplComponent) listDaemonset: ListDaemonsettplComponent; diff --git a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts index b016deb40..a910f4de1 100644 --- a/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/create-edit-deployment/create-edit-deployment.component.ts @@ -142,7 +142,7 @@ export class CreateEditDeploymentComponent implements OnInit { !isUndefined(this.deployment.appId); } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['deployment_name']; if (cont) { diff --git a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts index 5642d0b12..4afbe29c1 100644 --- a/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/create-edit-ingress/create-edit-ingress.component.ts @@ -17,7 +17,7 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h templateUrl: 'create-edit-ingress.component.html', styleUrls: ['create-edit-ingress.component.scss'] }) -export class CreateEditIngressComponent implements OnInit{ +export class CreateEditIngressComponent implements OnInit { @Output() create = new EventEmitter(); modalOpened: boolean; diff --git a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts index 454485d88..30eecb02b 100644 --- a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { State } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets} from '../../../shared/shared.const'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; import { Ingress } from '../../../shared/model/v1/ingress'; diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index 29d871321..5fb369314 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -4,7 +4,7 @@ import { Router, ActivatedRoute, Params } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets} from '../../shared/shared.const'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; import { Subscription } from 'rxjs/Subscription'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ListIngressTplComponent } from './list-ingresstpl/list-ingresstpl.component'; diff --git a/src/frontend/src/app/admin/permission/permission.component.ts b/src/frontend/src/app/admin/permission/permission.component.ts index 60f6c0461..5f99897e5 100644 --- a/src/frontend/src/app/admin/permission/permission.component.ts +++ b/src/frontend/src/app/admin/permission/permission.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ListPermissionComponent } from './list-permission/list-permission.component'; import { CreateEditPermissionComponent } from './create-edit-permission/create-edit-permission.component'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; styleUrls: ['./permission.component.scss'] }) -export class PermissionComponent implements OnInit { +export class PermissionComponent implements OnInit, OnDestroy { @ViewChild(ListPermissionComponent) listPermission: ListPermissionComponent; @ViewChild(CreateEditPermissionComponent) diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts index f21083dcd..0d922634b 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts @@ -139,7 +139,7 @@ export class CreateEditPersistentVolumeClaimComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts index 117cee34c..3f1b27815 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; @@ -18,7 +18,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './persistentvolumeclaim.component.html', styleUrls: ['./persistentvolumeclaim.component.scss'] }) -export class PersistentVolumeClaimComponent implements OnInit { +export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { @ViewChild(ListPersistentVolumeClaimComponent) list: ListPersistentVolumeClaimComponent; @ViewChild(CreateEditPersistentVolumeClaimComponent) diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts index 24ebcd7e5..47dabfbaa 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -6,7 +6,9 @@ import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmati import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; import { Subscription } from 'rxjs/Subscription'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { CreateEditPersistentVolumeClaimTplComponent } from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; +import { + CreateEditPersistentVolumeClaimTplComponent +} from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; import { PersistentVolumeClaimTplService } from '../../shared/client/v1/persistentvolumeclaimtpl.service'; import { ListPersistentVolumeClaimTplComponent } from './list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component'; import { PersistentVolumeClaimTpl } from '../../shared/model/v1/persistentvolumeclaimtpl'; @@ -17,7 +19,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './persistentvolumeclaimtpl.component.html', styleUrls: ['./persistentvolumeclaimtpl.component.scss'] }) -export class PersistentVolumeClaimTplComponent implements OnInit { +export class PersistentVolumeClaimTplComponent implements OnInit, OnDestroy { @ViewChild(ListPersistentVolumeClaimTplComponent) list: ListPersistentVolumeClaimTplComponent; @ViewChild(CreateEditPersistentVolumeClaimTplComponent) diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.module.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.module.ts index 3266904f0..72f0be41e 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.module.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { ListPersistentVolumeClaimTplComponent } from './list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component'; import { PersistentVolumeClaimTplComponent } from './persistentvolumeclaimtpl.component'; -import { CreateEditPersistentVolumeClaimTplComponent } from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; +import { + CreateEditPersistentVolumeClaimTplComponent +} from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; import { PersistentVolumeClaimTplService } from '../../shared/client/v1/persistentvolumeclaimtpl.service'; import { TrashPersistentVolumeClaimTplComponent } from './trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component'; diff --git a/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts b/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts index feea1fc4e..65192ad9e 100644 --- a/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts +++ b/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts @@ -31,7 +31,9 @@ export class DeployComponent implements OnInit { } refresh(state?: State) { - this.publishService.getDeployStatistics(moment(this.startTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z', moment(this.endTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z').subscribe( + this.publishService.getDeployStatistics( + moment(this.startTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z', moment(this.endTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z'). + subscribe( resp => { this.datas = resp.data; }, diff --git a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts index c2bfdfe59..b46876bad 100644 --- a/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts +++ b/src/frontend/src/app/admin/secret/create-edit-secret/create-edit-secret.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -18,7 +18,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; templateUrl: 'create-edit-secret.component.html', styleUrls: ['create-edit-secret.scss'] }) -export class CreateEditSecretComponent { +export class CreateEditSecretComponent implements OnInit { @Output() create = new EventEmitter(); createSecretOpened: boolean; diff --git a/src/frontend/src/app/admin/secret/secret.component.ts b/src/frontend/src/app/admin/secret/secret.component.ts index bc8b7a281..9eaae4ed7 100644 --- a/src/frontend/src/app/admin/secret/secret.component.ts +++ b/src/frontend/src/app/admin/secret/secret.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ListSecretComponent } from './list-secret/list-secret.component'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './secret.component.html', styleUrls: ['./secret.component.scss'] }) -export class SecretComponent implements OnInit { +export class SecretComponent implements OnInit, OnDestroy { @ViewChild(ListSecretComponent) listSecret: ListSecretComponent; @ViewChild(CreateEditSecretComponent) diff --git a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts index 126932009..d9e9586af 100644 --- a/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/create-edit-secrettpl/create-edit-secrettpl.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -18,7 +18,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; templateUrl: 'create-edit-secrettpl.component.html', styleUrls: ['create-edit-secrettpl.scss'] }) -export class CreateEditSecretTplComponent { +export class CreateEditSecretTplComponent implements OnInit { @Output() create = new EventEmitter(); createSecrettplOpened: boolean; diff --git a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts index a3bbd8c7f..8deeb6b8e 100644 --- a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ListSecretTplComponent } from './list-secrettpl/list-secrettpl.component'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './secrettpl.component.html', styleUrls: ['./secrettpl.component.scss'] }) -export class SecretTplComponent implements OnInit { +export class SecretTplComponent implements OnInit, OnDestroy { @ViewChild(ListSecretTplComponent) listSecrettpl: ListSecretTplComponent; @ViewChild(CreateEditSecretTplComponent) diff --git a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts index 7d5a385f4..144689369 100644 --- a/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/create-edit-statefulset/create-edit-statefulset.component.ts @@ -143,7 +143,7 @@ export class CreateEditStatefulsetComponent implements OnInit { !isUndefined(this.statefulset.appId); } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['statefulset_name']; if (cont) { diff --git a/src/frontend/src/app/admin/statefulset/statefulset.component.ts b/src/frontend/src/app/admin/statefulset/statefulset.component.ts index c1a9a661e..dfe956de5 100644 --- a/src/frontend/src/app/admin/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/statefulset.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -18,7 +18,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './statefulset.component.html', styleUrls: ['./statefulset.component.scss'] }) -export class StatefulsetComponent implements OnInit { +export class StatefulsetComponent implements OnInit, OnDestroy { @ViewChild(ListStatefulsetComponent) listStatefulset: ListStatefulsetComponent; diff --git a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts index 3f93fa509..000c74c26 100644 --- a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -17,7 +17,7 @@ import { StatefulsetTemplate } from '../../shared/model/v1/statefulsettpl'; templateUrl: './statefulsettpl.component.html', styleUrls: ['./statefulsettpl.component.scss'] }) -export class StatefulsettplComponent implements OnInit { +export class StatefulsettplComponent implements OnInit, OnDestroy { @ViewChild(ListStatefulsettplComponent) listStatefulset: ListStatefulsettplComponent; diff --git a/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts b/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts index 6681ce50e..45a65e317 100644 --- a/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts +++ b/src/frontend/src/app/admin/user/create-edit-user/create-edit-user.component.ts @@ -37,9 +37,6 @@ export class CreateEditUserComponent { ) { } - ngOnInit(): void { - } - log() { } diff --git a/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts b/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts index 7e3495f2e..b1a553838 100644 --- a/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts +++ b/src/frontend/src/app/admin/user/reset-password/reset-password.component.ts @@ -31,9 +31,6 @@ export class ResetPasswordComponent { private messageHandlerService: MessageHandlerService) { } - ngOnInit(): void { - } - resetPassword(user: User) { this.opened = true; this.user = user; @@ -49,7 +46,7 @@ export class ResetPasswordComponent { return; } this.isSubmitOnGoing = true; - if (this.user.password != this.user.rePassword) { + if (this.user.password !== this.user.rePassword) { this.alertMsg = '两次输入密码不一致，请检查！'; this.isSubmitOnGoing = false; return; diff --git a/src/frontend/src/app/admin/user/user.component.ts b/src/frontend/src/app/admin/user/user.component.ts index 26879813d..8a4ae7d5c 100644 --- a/src/frontend/src/app/admin/user/user.component.ts +++ b/src/frontend/src/app/admin/user/user.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; import { ListUserComponent } from './list-user/list-user.component'; @@ -17,7 +17,7 @@ import { PageState } from '../../shared/page/page-state'; templateUrl: './user.component.html', styleUrls: ['./user.component.scss'] }) -export class UserComponent implements OnInit { +export class UserComponent implements OnInit, OnDestroy { @ViewChild(ListUserComponent) listUser: ListUserComponent; @ViewChild(CreateEditUserComponent) diff --git a/src/frontend/src/app/app-config.service.ts b/src/frontend/src/app/app-config.service.ts index f5aa1e587..c560fdb40 100644 --- a/src/frontend/src/app/app-config.service.ts +++ b/src/frontend/src/app/app-config.service.ts @@ -5,14 +5,10 @@ import { AppConfig } from './app-config'; /** * Declare service to handle the bootstrap options - * - * - * @export - * @class GlobalSearchService */ @Injectable() export class AppConfigService { - //Store the application configuration + // Store the application configuration private configurations: AppConfig = new AppConfig(); constructor() { diff --git a/src/frontend/src/app/app.module.ts b/src/frontend/src/app/app.module.ts index e27c63ebf..324c07d27 100644 --- a/src/frontend/src/app/app.module.ts +++ b/src/frontend/src/app/app.module.ts @@ -38,7 +38,7 @@ export function initConfig(authService: AuthService) { }); } -if (environment.ravenDsn && environment.ravenDsn != '__ravenDsn__') { +if (environment.ravenDsn && environment.ravenDsn !== '__ravenDsn__') { Raven.config(environment.ravenDsn).install(); } @@ -96,7 +96,7 @@ export class WayneErrorHandler implements ErrorHandler { }, { provide: ErrorHandler, - useClass: environment.ravenDsn && environment.ravenDsn != '__ravenDsn__' ? RavenErrorHandler : WayneErrorHandler + useClass: environment.ravenDsn && environment.ravenDsn !== '__ravenDsn__' ? RavenErrorHandler : WayneErrorHandler } ], bootstrap: [AppComponent] diff --git a/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts b/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts index 203972994..668270a6f 100644 --- a/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/create-edit-apikey/create-edit-apikey.component.ts @@ -42,7 +42,7 @@ export class CreateEditApiKeyComponent implements OnInit { } ngOnInit(): void { - this.appId = parseInt(this.route.parent.snapshot.params['id']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); this.groupService.listGroup(new PageState({pageSize: 1000}), 2).subscribe( response => { diff --git a/src/frontend/src/app/portal/app-user/app-user.component.ts b/src/frontend/src/app/portal/app-user/app-user.component.ts index 461426eef..8cb1a87a1 100644 --- a/src/frontend/src/app/portal/app-user/app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/app-user.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; @@ -27,7 +27,7 @@ const showState = { templateUrl: './app-user.component.html', styleUrls: ['./app-user.component.scss'] }) -export class AppUserComponent implements OnInit { +export class AppUserComponent implements OnInit, OnDestroy { @ViewChild(ListAppUserComponent) listAppUser: ListAppUserComponent; @ViewChild(CreateEditAppUserComponent) diff --git a/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts b/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts index a4806191d..847a87d4b 100644 --- a/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/create-edit-app-user/create-edit-app-user.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -19,7 +19,7 @@ import { PageState } from '../../../shared/page/page-state'; templateUrl: 'create-edit-app-user.component.html', styleUrls: ['create-edit-app-user.scss'] }) -export class CreateEditAppUserComponent { +export class CreateEditAppUserComponent implements OnInit { @Output() create = new EventEmitter(); createAppUserOpened: boolean; @@ -64,7 +64,9 @@ export class CreateEditAppUserComponent { response => { this.allGroups = response.data.list; for (const x in this.allGroups) { - this.mapGroups.set(this.allGroups[x].id.toString(), this.allGroups[x]); + if (this.allGroups.hasOwnProperty(x)) { + this.mapGroups.set(this.allGroups[x].id.toString(), this.allGroups[x]); + } } }, error => this.messageHandlerService.handleError(error) @@ -77,16 +79,20 @@ export class CreateEditAppUserComponent { if (id) { this.actionType = ActionType.EDIT; this.appUserTitle = '编辑项目用户'; - this.appUserService.getById(id, parseInt(appId)).subscribe( + this.appUserService.getById(id, parseInt(appId, 10)).subscribe( status => { this.appUser = status.data; // 编辑用户时，需要调整allGroup与selectGroup内容 - for (let key in this.allGroups) { - for (const index in this.appUser.groups) { - const source = this.allGroups[key]; - const detail = this.appUser.groups[index]; - if (JSON.stringify(source) === JSON.stringify(detail)) { - this.prepareGroups.push(this.allGroups[key].id.toString()); + for (const key in this.allGroups) { + if (this.allGroups.hasOwnProperty(key)) { + for (const index in this.appUser.groups) { + if (this.appUser.groups.hasOwnProperty(index)) { + const source = this.allGroups[key]; + const detail = this.appUser.groups[index]; + if (JSON.stringify(source) === JSON.stringify(detail)) { + this.prepareGroups.push(this.allGroups[key].id.toString()); + } + } } } } @@ -136,7 +142,9 @@ export class CreateEditAppUserComponent { this.appUser.groups = new Array(); this.isSubmitOnGoing = true; for (const k in this.selectGroups) { - this.appUser.groups.push(this.mapGroups.get(this.selectGroups[k])); + if (this.selectGroups.hasOwnProperty(k)) { + this.appUser.groups.push(this.mapGroups.get(this.selectGroups[k])); + } } switch (this.actionType) { case ActionType.ADD_NEW: diff --git a/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts b/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts index 05b48b70d..58927067c 100644 --- a/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts +++ b/src/frontend/src/app/portal/app-webhook/app-webhook.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; import { ClrDatagridStateInterface } from '@clr/angular'; @@ -29,7 +29,7 @@ const showState = { templateUrl: './app-webhook.component.html', styleUrls: ['./app-webhook.component.scss'] }) -export class AppWebHookComponent implements OnInit { +export class AppWebHookComponent implements OnInit, OnDestroy { showList: any[] = new Array(); showState: object = showState; @ViewChild(ListAppWebHookComponent) diff --git a/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts b/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts index 2af3dc7e5..9f5cd4faf 100644 --- a/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts +++ b/src/frontend/src/app/portal/app-webhook/create-edit-app-webhook/create-edit-app-webhook.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { NgForm } from '@angular/forms'; @@ -14,7 +14,7 @@ import { CacheService } from '../../../shared/auth/cache.service'; templateUrl: 'create-edit-app-webhook.component.html', styleUrls: ['create-edit-app-webhook.scss'] }) -export class CreateEditAppWebHookComponent { +export class CreateEditAppWebHookComponent implements OnInit { @Output() create = new EventEmitter(); @Output() update = new EventEmitter(); diff --git a/src/frontend/src/app/portal/app/app.component.ts b/src/frontend/src/app/portal/app/app.component.ts index 7b870cb05..b01c85927 100644 --- a/src/frontend/src/app/portal/app/app.component.ts +++ b/src/frontend/src/app/portal/app/app.component.ts @@ -175,9 +175,9 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { }); this.allowNumber = this.getClusterMaxNumber(); for (let i = 0; i < this.allowNumber - 1; i++) { - setTimeout(((i) => { - if (this.clusters[i]) { - this.clusters[i].state = true; + setTimeout(((idx) => { + if (this.clusters[idx]) { + this.clusters[idx].state = true; } }).bind(this, i), 200 * i); } @@ -194,8 +194,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { const length = this.clusters.length; for (let i = length; i > 0; i--) { if (i >= this.allowNumber) { - setTimeout(((i) => { - this.clusters[i - 1].state = false; + setTimeout(((idx) => { + this.clusters[idx - 1].state = false; }).bind(this, i), 200 * count++); } } @@ -204,8 +204,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { this.allowShowAll = true; this.clusters.forEach(item => { if (!item.state) { - setTimeout((item => { - item.state = true; + setTimeout((itm => { + itm.state = true; }).bind(this, item), 200 * count++); } }); diff --git a/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts b/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts index 46c9fd409..29cac3c33 100644 --- a/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts +++ b/src/frontend/src/app/portal/app/create-edit-app/create-edit-app.component.ts @@ -116,7 +116,7 @@ export class CreateEditAppComponent { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['app_name']; if (cont) { diff --git a/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts b/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts index 036d2a824..1defb2c37 100644 --- a/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts +++ b/src/frontend/src/app/portal/app/detail-app/detail-app.component.ts @@ -75,8 +75,8 @@ export class DetailAppComponent implements OnInit, OnDestroy { this.appService.getById(this.appId, namespaceId).subscribe(response => { this.app = response.data; this.namespaceClient.getResourceUsage(namespaceId, response.data.name).subscribe( - response => { - this.resources = response.data; + next => { + this.resources = next.data; this.clusterList = Object.keys(this.resources).map(item => { const a = new Cluster(); a['cluster'] = item; diff --git a/src/frontend/src/app/portal/autoscale/autoscale.component.ts b/src/frontend/src/app/portal/autoscale/autoscale.component.ts index 82531a0e8..f27322c8f 100644 --- a/src/frontend/src/app/portal/autoscale/autoscale.component.ts +++ b/src/frontend/src/app/portal/autoscale/autoscale.component.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; +import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { Resource } from '../../shared/base/resource/resource'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.ts b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.ts index f2d1acf45..3807dbcfd 100644 --- a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.ts +++ b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.ts @@ -45,7 +45,7 @@ export class ListAutoscaleComponent extends ListResource implements OnInit, OnDe diffService, authService, deletionDialogService - ) + ); super.registSubscription(ConfirmationTargets.AUTOSCALE_TPL, 'HPA 模版删除成功！'); super.registConfirmationTarget(ConfirmationTargets.AUTOSCALE_TPL); } diff --git a/src/frontend/src/app/portal/base/base.component.ts b/src/frontend/src/app/portal/base/base.component.ts index f9adf72f3..4e68c8a30 100644 --- a/src/frontend/src/app/portal/base/base.component.ts +++ b/src/frontend/src/app/portal/base/base.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, OnInit, HostBinding } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { ActivatedRoute, Router } from '@angular/router'; @@ -10,12 +10,13 @@ import { CacheService } from '../../shared/auth/cache.service'; @Component({ selector: 'base', templateUrl: 'base.component.html', - host: {'class': 'content-container'}, styleUrls: ['base.scss'] }) -export class BaseComponent { +export class BaseComponent implements OnInit { appId: number; + @HostBinding('class.content-container') field = true; + constructor(public authService: AuthService, private appService: AppService, public cacheService: CacheService, @@ -29,7 +30,7 @@ export class BaseComponent { const app: App = response.data; // 缓存app信息到 appService 中 this.appService.app = response.data; - if (this.appBetaMode(app.metaData) && wayneBetaUrl && window.location.origin != wayneBetaUrl) { + if (this.appBetaMode(app.metaData) && wayneBetaUrl && window.location.origin !== wayneBetaUrl) { window.location.href = `${wayneBetaUrl}${this.router.url}`; return; } @@ -38,7 +39,7 @@ export class BaseComponent { window.location.href = `${this.authService.config['appUrl']}${this.router.url}`; return; } - if (app.namespace.id != this.cacheService.namespaceId) { + if (app.namespace.id !== this.cacheService.namespaceId) { console.log('app namespace not equal the current namespace. will redirect to index.', app.namespace.id, this.cacheService.namespaceId); window.location.href = '/portal/app'; diff --git a/src/frontend/src/app/portal/configmap/configmap.component.ts b/src/frontend/src/app/portal/configmap/configmap.component.ts index 722d10ace..68b74ccb4 100644 --- a/src/frontend/src/app/portal/configmap/configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/configmap.component.ts @@ -191,7 +191,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { if (status.errNum > 2) { continue; } this.configMapClient.get(this.app.id, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - const code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.configMapTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -235,9 +235,9 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { } initConfigMap(refreshTpl?: boolean) { - const appId = parseInt(this.route.parent.snapshot.params['id']); + const appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; - this.configMapId = parseInt(this.route.snapshot.params['configMapId']); + this.configMapId = parseInt(this.route.snapshot.params['configMapId'], 10); Observable.combineLatest( this.configMapService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', appId + ''), this.appService.getById(appId, namespaceId) @@ -286,12 +286,14 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { cloneConfigMapTpl(tpl: ConfigMapTpl) { if (tpl) { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/configmap/${this.configMapId}/tpl/${tpl.id}`]); + this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app + /${this.app.id}/configmap/${this.configMapId}/tpl/${tpl.id}`]); } } createConfigMapTpl() { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/configmap/${this.configMapId}/tpl`]); + this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app + /${this.app.id}/configmap/${this.configMapId}/tpl`]); } ngOnDestroy(): void { @@ -318,12 +320,12 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { this.publishStatus = status; const tplStatusMap = {}; if (status && status.length > 0) { - for (const state of status) { - if (!tplStatusMap[state.templateId]) { - tplStatusMap[state.templateId] = Array(); + for (const statu of status) { + if (!tplStatusMap[statu.templateId]) { + tplStatusMap[statu.templateId] = Array(); } - state.errNum = 0; - tplStatusMap[state.templateId].push(state); + statu.errNum = 0; + tplStatusMap[statu.templateId].push(state); } } this.tplStatusMap = tplStatusMap; diff --git a/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts b/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts index 4d4dd8e50..1b2d69c59 100644 --- a/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/create-edit-configmap/create-edit-configmap.component.ts @@ -124,7 +124,7 @@ export class CreateEditConfigMapComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts index 18fbfe757..f91ec0c7f 100644 --- a/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/configmap/publish-tpl/publish-tpl.component.ts @@ -41,7 +41,7 @@ export class PublishConfigMapTplComponent { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } newPublishTpl(configMapTpl: ConfigMapTpl, actionType: ResourcesActionType) { @@ -116,7 +116,7 @@ export class PublishConfigMapTplComponent { offline(cluster: Cluster) { - let state = this.getStatusByCluster(this.configMapTpl.status, cluster.name); + const state = this.getStatusByCluster(this.configMapTpl.status, cluster.name); this.configMapClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.configMapTpl.name).subscribe( response => { this.deletePublishStatus(state.id); diff --git a/src/frontend/src/app/portal/cronjob/cronjob.component.ts b/src/frontend/src/app/portal/cronjob/cronjob.component.ts index ff088be43..34ad54fcd 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.component.ts @@ -218,7 +218,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { if (status.errNum > 2) { continue; } this.cronjobClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - const code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.changedCronjobTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -274,9 +274,9 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } initCronjob(refreshTpl?: boolean) { - this.appId = parseInt(this.route.parent.snapshot.params['id']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; - this.cronjobId = parseInt(this.route.snapshot.params['cronjobId']); + this.cronjobId = parseInt(this.route.snapshot.params['cronjobId'], 10); Observable.combineLatest( this.clusterService.getNames(), this.cronjobService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), @@ -295,8 +295,8 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } if (this.cronjobId) { this.cronjobService.getById(this.cronjobId, this.appId).subscribe( - response => { - this.currentCronjob = response.data; + next => { + this.currentCronjob = next.data; }, error => { this.messageHandlerService.handleError(error); @@ -380,7 +380,8 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { // 点击克隆模版 cloneCronjobTpl(tpl: CronjobTpl) { if (tpl) { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/cronjob/${this.cronjobId}/tpl/${tpl.id}`]); + this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app + /${this.app.id}/cronjob/${this.cronjobId}/tpl/${tpl.id}`]); } } diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts index 4346f7f85..a7eaf40d9 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts @@ -45,7 +45,7 @@ export class ListJobComponent implements OnInit, OnDestroy { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } ngOnDestroy(): void { @@ -70,7 +70,7 @@ export class ListJobComponent implements OnInit, OnDestroy { ngOnInit(): void { this.periodSyncStatus(); - this._pageSize = parseInt(this.storage.get('pagesize') || '10'); + this._pageSize = parseInt(this.storage.get('pagesize') || '10', 10); } listPod(job: Job) { diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts index 46ea4ffe8..cde82c6c4 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts @@ -39,7 +39,7 @@ export class ListPodComponent implements OnInit, OnDestroy { subscription: Subscription; get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } @@ -113,13 +113,15 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app + /${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app + /${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts index 9b8d54562..162bd8138 100644 --- a/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/cronjob/publish-tpl/publish-tpl.component.ts @@ -43,7 +43,7 @@ export class PublishCronjobTplComponent { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } @@ -153,14 +153,14 @@ export class PublishCronjobTplComponent { offline() { Object.getOwnPropertyNames(this.clusterMetas).map(cluster => { if (this.clusterMetas[cluster].checked) { - let state = this.getStatusByCluster(this.cronjobTpl.status, cluster); + const data = this.getStatusByCluster(this.cronjobTpl.status, cluster); this.cronjobClient.deleteByName(this.appId, cluster, this.cacheService.kubeNamespace, this.cronjob.name).subscribe( response => { - this.deletePublishStatus(state.id); + this.deletePublishStatus(data.id); }, error => { if (this.forceOffline) { - this.deletePublishStatus(state.id); + this.deletePublishStatus(data.id); } else { this.messageHandlerService.handleError(error); } @@ -209,7 +209,7 @@ export class PublishCronjobTplComponent { }); Object.getOwnPropertyNames(this.clusterMetas).map(cluster => { if (this.clusterMetas[cluster].checked) { - let kubeCronjob: KubeCronJob = JSON.parse(this.cronjobTpl.template); + const kubeCronjob: KubeCronJob = JSON.parse(this.cronjobTpl.template); if (metaData['successfulJobsHistoryLimit']) { kubeCronjob.spec.successfulJobsHistoryLimit = metaData['successfulJobsHistoryLimit']; } diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts index 7b63097f3..dd2057bd2 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.ts @@ -167,7 +167,7 @@ export class CreateEditDaemonSetComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/portal/daemonset/daemonset.component.ts b/src/frontend/src/app/portal/daemonset/daemonset.component.ts index 1e54f51ef..47997703a 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.component.ts @@ -202,7 +202,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { if (status.errNum > 2) { continue; } this.daemonSetClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - const code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.changedDaemonSetTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -263,9 +263,9 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { } initDaemonSet(refreshTpl?: boolean) { - this.appId = parseInt(this.route.parent.snapshot.params['id']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; - this.daemonSetId = parseInt(this.route.snapshot.params['daemonSetId']); + this.daemonSetId = parseInt(this.route.snapshot.params['daemonSetId'], 10); Observable.combineLatest( this.clusterService.getNames(), this.daemonSetService.listPage(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), this.appId, 'false'), @@ -352,7 +352,9 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { // 点击克隆守护进程集模版 cloneDaemonSetTpl(tpl: DaemonSetTemplate) { if (tpl) { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/daemonset/${this.daemonSetId}/tpl/${tpl.id}`]); + this.router.navigate( + [`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/daemonset + /${this.daemonSetId}/tpl/${tpl.id}`]); } } diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts index b54885a5e..2748f2a25 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts @@ -171,7 +171,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { } listPod(status: TemplateStatus, tpl: DaemonSetTemplate) { - if (status.cluster && status.state != TemplateState.NOT_FOUND) { + if (status.cluster && status.state !== TemplateState.NOT_FOUND) { this.listPodComponent.openModal(status.cluster, tpl.name); } } diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts index 57c1a8307..3e3e63b1b 100644 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts @@ -43,7 +43,7 @@ export class ListPodComponent implements OnInit, OnDestroy { subscription: Subscription; get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } constructor(private inventory: Inventory, @@ -89,9 +89,9 @@ export class ListPodComponent implements OnInit, OnDestroy { this.whetherHotReflash = true; this.clusterService.getByName(this.currentCluster).subscribe( response => { - const cluster: Cluster = response.data; - if (cluster.metaData) { - const metaData = JSON.parse(cluster.metaData); + const data: Cluster = response.data; + if (data.metaData) { + const metaData = JSON.parse(data.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -122,7 +122,7 @@ export class ListPodComponent implements OnInit, OnDestroy { clearInterval(this.timer); return; } - if (this.whetherHotReflash) this.refresh(); + if (this.whetherHotReflash) { this.refresh(); } }, 5000); } @@ -155,7 +155,8 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app + /${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } @@ -163,7 +164,8 @@ export class ListPodComponent implements OnInit, OnDestroy { podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app + /${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts index 214a7fc16..7ec3677b9 100644 --- a/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/daemonset/publish-tpl/publish-tpl.component.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; +import { forkJoin } from 'rxjs'; import { NgForm } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { CacheService } from '../../../shared/auth/cache.service'; @@ -8,7 +9,7 @@ import { ResourcesActionType } from '../../../shared/shared.const'; import { PublishStatusService } from '../../../shared/client/v1/publishstatus.service'; import { DaemonSetClient } from '../../../shared/client/v1/kubernetes/daemonset'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { DaemonSet } from '../../../shared/model/v1/daemonset'; import { TemplateStatus } from '../../../shared/model/v1/status'; import { Cluster } from '../../../shared/model/v1/cluster'; @@ -43,7 +44,7 @@ export class PublishDaemonSetTplComponent { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } newPublishTpl(daemonSet: DaemonSet, daemonSetTpl: DaemonSetTemplate, actionType: ResourcesActionType) { @@ -110,7 +111,7 @@ export class PublishDaemonSetTplComponent { offline() { this.clusters.map(cluster => { if (cluster.checked) { - let state = this.getStatusByCluster(this.daemonSetTpl.status, cluster.name); + const state = this.getStatusByCluster(this.daemonSetTpl.status, cluster.name); this.daemonSetClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.daemonSet.name).subscribe( response => { this.deletePublishStatus(state.id); @@ -143,7 +144,7 @@ export class PublishDaemonSetTplComponent { const observables = Array(); this.clusters.map(cluster => { if (cluster.checked) { - let kubeDaemonSet: KubeDaemonSet = JSON.parse(this.daemonSetTpl.template); + const kubeDaemonSet: KubeDaemonSet = JSON.parse(this.daemonSetTpl.template); kubeDaemonSet.metadata.namespace = this.cacheService.kubeNamespace; observables.push(this.daemonSetClient.deploy( this.appId, @@ -153,7 +154,8 @@ export class PublishDaemonSetTplComponent { kubeDaemonSet)); } }); - Observable.forkJoin(observables).subscribe( + + forkJoin(observables).subscribe( response => { this.published.emit(true); this.messageHandlerService.showSuccess('发布成功！'); diff --git a/src/frontend/src/app/portal/deployment/create-edit-deployment/create-edit-deployment.component.ts b/src/frontend/src/app/portal/deployment/create-edit-deployment/create-edit-deployment.component.ts index eaa4b96b7..399bc1371 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deployment/create-edit-deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/create-edit-deployment/create-edit-deployment.component.ts @@ -105,7 +105,7 @@ export class CreateEditDeploymentComponent implements OnInit { if (!clusterMeta.checked) { return true; } - return parseInt(clusterMeta.value) <= this.replicaLimit; + return parseInt(clusterMeta.value, 10) <= this.replicaLimit; } return false; } diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts index f45f79d9a..b8e451923 100644 --- a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts @@ -46,7 +46,7 @@ export class ListPodComponent implements OnInit, OnDestroy { subscription: Subscription; get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } constructor(private inventory: Inventory, @@ -95,9 +95,9 @@ export class ListPodComponent implements OnInit, OnDestroy { this.whetherHotReflash = true; this.clusterService.getByName(this.currentCluster).subscribe( response => { - const cluster: Cluster = response.data; - if (cluster.metaData) { - const metaData = JSON.parse(cluster.metaData); + const data: Cluster = response.data; + if (data.metaData) { + const metaData = JSON.parse(data.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -127,7 +127,7 @@ export class ListPodComponent implements OnInit, OnDestroy { if (!this.modalOpened) { clearInterval(this.timer); } - if (this.whetherHotReflash) this.refresh(); + if (this.whetherHotReflash) { this.refresh(); } }, 5000); } @@ -160,7 +160,8 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment + /${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } @@ -175,7 +176,8 @@ export class ListPodComponent implements OnInit, OnDestroy { if (this.logSource === undefined) { this.messageHandlerService.showInfo('缺少机房信息，请联系管理员'); } - const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --deployment ${this.deployment} --pod=${pod.name} --layout=log`; + const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --deployment ${this.deployment} ` + + `--pod=${pod.name} --layout=log`; this.copyService.copy(kubeToolCmd); this.switchCopyButton(); } @@ -183,7 +185,8 @@ export class ListPodComponent implements OnInit, OnDestroy { podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment} + /pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/deployment/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/deployment/publish-tpl/publish-tpl.component.ts index 2976f05e3..a1c8c188b 100644 --- a/src/frontend/src/app/portal/deployment/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/deployment/publish-tpl/publish-tpl.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; - +import { forkJoin } from 'rxjs'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { NgForm } from '@angular/forms'; @@ -218,7 +218,7 @@ export class PublishDeploymentTplComponent { kubeDeployment)); } }); - Observable.forkJoin(observables).subscribe( + forkJoin(observables).subscribe( response => { this.published.emit(true); this.messageHandlerService.showSuccess('发布成功！'); diff --git a/src/frontend/src/app/portal/ingress/ingress.component.ts b/src/frontend/src/app/portal/ingress/ingress.component.ts index dd6291754..478b3c3c7 100644 --- a/src/frontend/src/app/portal/ingress/ingress.component.ts +++ b/src/frontend/src/app/portal/ingress/ingress.component.ts @@ -74,7 +74,7 @@ export class IngressComponent extends Resource implements OnInit, OnDestroy, Aft tabDragService, el, messageHandlerService - ) + ); super.registResourceType('ingress'); super.registPublishType(PublishType.INGRESS); super.registConfirmationTarget(ConfirmationTargets.INGRESS); diff --git a/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.ts b/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.ts index ec9c3a6bb..8045e55ba 100644 --- a/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.ts +++ b/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.ts @@ -45,7 +45,7 @@ export class ListIngressComponent extends ListResource implements OnInit, OnDest diffService, authService, deletionDialogService - ) + ); super.registSubscription(ConfirmationTargets.INGRESS_TPL, 'Ingress 模版删除成功！'); super.registConfirmationTarget(ConfirmationTargets.INGRESS_TPL); } diff --git a/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts b/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts index a813d5abd..0829fb53f 100644 --- a/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts +++ b/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { State } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; @@ -28,7 +28,7 @@ const showState = { templateUrl: './apikey.component.html', styleUrls: ['./apikey.component.scss'] }) -export class NamespaceApiKeyComponent implements OnInit { +export class NamespaceApiKeyComponent implements OnInit, OnDestroy { @ViewChild(ListApiKeyComponent) listApiKey: ListApiKeyComponent; @ViewChild(CreateEditApiKeyComponent) diff --git a/src/frontend/src/app/portal/namespace-report/history/history.component.ts b/src/frontend/src/app/portal/namespace-report/history/history.component.ts index b8054e9bf..906689fa5 100644 --- a/src/frontend/src/app/portal/namespace-report/history/history.component.ts +++ b/src/frontend/src/app/portal/namespace-report/history/history.component.ts @@ -38,7 +38,9 @@ export class HistoryComponent implements OnInit, AfterViewInit { res => { this.text = res['TITLE.DEPLOY_FREQ']; this.subText = res['TITLE.LATE_DAY']; - if (this.dataDone) this.initHistoryOptions(); + if (this.dataDone) { + this.initHistoryOptions(); + } } ); } @@ -58,9 +60,11 @@ export class HistoryComponent implements OnInit, AfterViewInit { initHistoryOptions() { const _this = this; - let data = []; - for(const key in this.historys) { - data.push({value: [this.historys[key].date, this.historys[key].count]}); + const data = []; + for (const key in this.historys) { + if (this.historys.hasOwnProperty(key)) { + data.push({value: [this.historys[key].date, this.historys[key].count]}); + } } this.basicOption = { title: { diff --git a/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts b/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts index 3d284f7ec..b5c1afc27 100644 --- a/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts +++ b/src/frontend/src/app/portal/namespace-user/create-edit-namespace-user/create-edit-namespace-user.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -20,7 +20,7 @@ import { TranslateService } from '@ngx-translate/core'; templateUrl: 'create-edit-namespace-user.component.html', styleUrls: ['create-edit-namespace-user.scss'] }) -export class CreateEditNamespaceUserComponent { +export class CreateEditNamespaceUserComponent implements OnInit { @Output() create = new EventEmitter(); createNamespaceUserOpened: boolean; @@ -67,7 +67,9 @@ export class CreateEditNamespaceUserComponent { response => { this.allGroups = response.data.list; for (const x in this.allGroups) { - this.mapGroups.set(this.allGroups[x].id.toString(), this.allGroups[x]); + if (this.allGroups.hasOwnProperty(x)) { + this.mapGroups.set(this.allGroups[x].id.toString(), this.allGroups[x]); + } } }, error => this.messageHandlerService.handleError(error) @@ -84,12 +86,16 @@ export class CreateEditNamespaceUserComponent { status => { this.namespaceUser = status.data; // 编辑用户时，需要调整allGroup与selectGroup内容 - for (let key in this.allGroups) { - for (const index in this.namespaceUser.groups) { - const source = this.allGroups[key]; - const detail = this.namespaceUser.groups[index]; - if (JSON.stringify(source) === JSON.stringify(detail)) { - this.prepareGroups.push(this.allGroups[key].id.toString()); + for (const key in this.allGroups) { + if (this.allGroups.hasOwnProperty(key)) { + for (const index in this.namespaceUser.groups) { + if (this.namespaceUser.groups.hasOwnProperty(index)) { + const source = this.allGroups[key]; + const detail = this.namespaceUser.groups[index]; + if (JSON.stringify(source) === JSON.stringify(detail)) { + this.prepareGroups.push(this.allGroups[key].id.toString()); + } + } } } } @@ -139,7 +145,9 @@ export class CreateEditNamespaceUserComponent { this.namespaceUser.groups = new Array(); this.isSubmitOnGoing = true; for (const k in this.selectGroups) { - this.namespaceUser.groups.push(this.mapGroups.get(this.selectGroups[k])); + if (this.selectGroups.hasOwnProperty(k)) { + this.namespaceUser.groups.push(this.mapGroups.get(this.selectGroups[k])); + } } switch (this.actionType) { case ActionType.ADD_NEW: diff --git a/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts b/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts index 7ba4932c3..ed23208aa 100644 --- a/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts +++ b/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; import { State } from '@clr/angular'; @@ -30,7 +30,7 @@ const showState = { templateUrl: './namespace-user.component.html', styleUrls: ['./namespace-user.component.scss'] }) -export class NamespaceUserComponent implements OnInit { +export class NamespaceUserComponent implements OnInit, OnDestroy { @ViewChild(ListNamespaceUserComponent) listNamespaceUser: ListNamespaceUserComponent; @ViewChild(CreateEditNamespaceUserComponent) diff --git a/src/frontend/src/app/portal/namespace-webhook/create-edit-namespace-webhook/create-edit-namespace-webhook.component.ts b/src/frontend/src/app/portal/namespace-webhook/create-edit-namespace-webhook/create-edit-namespace-webhook.component.ts index ca1156b87..ab15d2b1b 100644 --- a/src/frontend/src/app/portal/namespace-webhook/create-edit-namespace-webhook/create-edit-namespace-webhook.component.ts +++ b/src/frontend/src/app/portal/namespace-webhook/create-edit-namespace-webhook/create-edit-namespace-webhook.component.ts @@ -1,6 +1,6 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import { NgForm } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ActionType } from '../../../shared/shared.const'; @@ -14,7 +14,7 @@ import { CacheService } from '../../../shared/auth/cache.service'; templateUrl: 'create-edit-namespace-webhook.component.html', styleUrls: ['create-edit-namespace-webhook.scss'] }) -export class CreateEditNamespaceWebHookComponent { +export class CreateEditNamespaceWebHookComponent implements OnInit { @Output() create = new EventEmitter(); @Output() update = new EventEmitter(); diff --git a/src/frontend/src/app/portal/namespace-webhook/namespace-webhook.component.ts b/src/frontend/src/app/portal/namespace-webhook/namespace-webhook.component.ts index f310d2d49..52eaa59d2 100644 --- a/src/frontend/src/app/portal/namespace-webhook/namespace-webhook.component.ts +++ b/src/frontend/src/app/portal/namespace-webhook/namespace-webhook.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ClrDatagridStateInterface } from '@clr/angular'; import { Subscription } from 'rxjs/Subscription'; @@ -31,7 +31,7 @@ const showState = { templateUrl: './namespace-webhook.component.html', styleUrls: ['./namespace-webhook.component.scss'] }) -export class NamespaceWebHookComponent implements OnInit { +export class NamespaceWebHookComponent implements OnInit, OnDestroy { @ViewChild(ListNamespaceWebHookComponent) listWebHook: ListNamespaceWebHookComponent; @ViewChild(CreateEditNamespaceWebHookComponent) diff --git a/src/frontend/src/app/portal/nav/nav.component.html b/src/frontend/src/app/portal/nav/nav.component.html index b29b3339c..078e3cc7f 100644 --- a/src/frontend/src/app/portal/nav/nav.component.html +++ b/src/frontend/src/app/portal/nav/nav.component.html @@ -36,7 +36,7 @@ {{cacheService.currentNamespace?.name}} - + {{n.name}} diff --git a/src/frontend/src/app/portal/nav/nav.component.ts b/src/frontend/src/app/portal/nav/nav.component.ts index a0d32124a..4badc0f38 100644 --- a/src/frontend/src/app/portal/nav/nav.component.ts +++ b/src/frontend/src/app/portal/nav/nav.component.ts @@ -48,7 +48,7 @@ export class NavComponent implements OnInit, OnDestroy { }); this.namespace = this.cacheService.currentNamespace; const nid = this.route.snapshot.params['nid']; - if (this.cacheService.currentNamespace && nid != this.cacheService.namespaceId) { + if (this.cacheService.currentNamespace && parseInt(nid, 10) !== this.cacheService.namespaceId) { this.hackNavigateReload(`/portal/namespace/${this.cacheService.namespaceId}/app`); } else { this.authService.setNamespacePermissionById(nid); @@ -73,7 +73,9 @@ export class NavComponent implements OnInit, OnDestroy { } goBack() { - if (window) window.location.href = '/admin/reportform/overview'; + if (window) { + window.location.href = '/admin/reportform/overview'; + } } showLang(lang: string): string { diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts index 2468097e2..08569ba5f 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component.ts @@ -124,7 +124,7 @@ export class CreateEditPersistentVolumeClaimComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.ts index f6b3c403c..b9dcf44bb 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-snapshot/create-snapshot.component.ts @@ -11,9 +11,7 @@ import { PersistentVolumeClaimRobinClient } from '../../../shared/client/v1/kube templateUrl: 'create-snapshot.component.html', styleUrls: ['create-snapshot.scss'] }) - - -export class CreateSnapshot { +export class CreateSnapshotComponent { createAppOpened: boolean; snapForm: NgForm; @ViewChild('snapForm') @@ -49,7 +47,8 @@ export class CreateSnapshot { } onSubmit() { - this.persistentVolumeClaimRobinClient.createSnapshot(this.appId, this.state.cluster, this.state.pvc.metadata.namespace, this.state.pvc.metadata.name, this.snapshotVersion).subscribe( + this.persistentVolumeClaimRobinClient.createSnapshot(this.appId, this.state.cluster, + this.state.pvc.metadata.namespace, this.state.pvc.metadata.name, this.snapshotVersion).subscribe( response => { this.messageHandlerService.showSuccess('创建快照成功！'); this.create.emit(true); diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index dce03e25e..5f12c50cb 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -105,7 +105,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.periodSyncStatus(); this.diffscription = pvcService.diffOb.subscribe(() => { this.diffService.diff(this.selected); - }) + }); } get isEnableRobin(): boolean { @@ -127,7 +127,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { const status = tpl.status[j]; this.pvcClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - const code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.pvcTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -162,7 +162,8 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { pvcFileSystemStatus(publishStatus: PublishStatus) { if (publishStatus.state === TemplateState.SUCCESS) { - this.persistentVolumeClaimRobinClient.getStatus(this.appId, publishStatus.cluster, publishStatus.pvc.metadata.namespace, publishStatus.pvc.metadata.name).subscribe( + this.persistentVolumeClaimRobinClient.getStatus(this.appId, + publishStatus.cluster, publishStatus.pvc.metadata.namespace, publishStatus.pvc.metadata.name).subscribe( response => { publishStatus.fileSystemStatus = response.data; publishStatus.rbdImage = response.data.rbdImage; @@ -313,8 +314,8 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.appId = parseInt(this.route.parent.parent.snapshot.params['id']); - this.pvcId = parseInt(this.route.parent.snapshot.params['pvcId']); + this.appId = parseInt(this.route.parent.parent.snapshot.params['id'], 10); + this.pvcId = parseInt(this.route.parent.snapshot.params['pvcId'], 10); this.isOnlineObservable = this.pvcTplService.isOnlineObservable$.subscribe( isOnline => { this.isOnline = isOnline; @@ -381,11 +382,11 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.publishStatus = status; const tplStatusMap = {}; if (status && status.length > 0) { - for (const state of status) { - if (!tplStatusMap[state.templateId]) { - tplStatusMap[state.templateId] = Array(); + for (const stat of status) { + if (!tplStatusMap[stat.templateId]) { + tplStatusMap[stat.templateId] = Array(); } - tplStatusMap[state.templateId].push(state); + tplStatusMap[stat.templateId].push(state); } } this.tplStatusMap = tplStatusMap; diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.module.ts b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.module.ts index 0e8df45c0..3fb688b85 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.module.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.module.ts @@ -8,11 +8,13 @@ import { PersistentVolumeClaimComponent } from './persistentvolumeclaim.componen import { ListPersistentVolumeClaimComponent } from './list-persistentvolumeclaim/list-persistentvolumeclaim.component'; import { CreateEditPersistentVolumeClaimComponent } from './create-edit-persistentvolumeclaim/create-edit-persistentvolumeclaim.component'; import { PublishPersistentVolumeClaimTplComponent } from './publish-tpl/publish-tpl.component'; -import { CreateEditPersistentVolumeClaimTplComponent } from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; +import { + CreateEditPersistentVolumeClaimTplComponent +} from './create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; import { RouterModule } from '@angular/router'; import { UserInfoComponent } from './user-info/user-info.component'; import { SnapshotPersistentVolumeClaimComponent } from './snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component'; -import { CreateSnapshot } from './create-snapshot/create-snapshot.component'; +import { CreateSnapshotComponent } from './create-snapshot/create-snapshot.component'; import { PersistentVolumeClaimRobinClient } from '../../shared/client/v1/kubernetes/persistentvolumeclaims-robin'; @NgModule({ @@ -38,7 +40,7 @@ import { PersistentVolumeClaimRobinClient } from '../../shared/client/v1/kuberne PublishPersistentVolumeClaimTplComponent, UserInfoComponent, SnapshotPersistentVolumeClaimComponent, - CreateSnapshot + CreateSnapshotComponent ] }) diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts index 90eedffba..8f21761b4 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/publish-tpl/publish-tpl.component.ts @@ -39,7 +39,7 @@ export class PublishPersistentVolumeClaimTplComponent { } get appId(): number { - return parseInt(this.route.parent.parent.snapshot.params['id']); + return parseInt(this.route.parent.parent.snapshot.params['id'], 10); } newPublishTpl(pvcTpl: PersistentVolumeClaimTpl, actionType: ResourcesActionType) { @@ -113,7 +113,7 @@ export class PublishPersistentVolumeClaimTplComponent { } offline(cluster: Cluster) { - let state = this.getStatusByCluster(this.pvcTpl.status, cluster.name); + const state = this.getStatusByCluster(this.pvcTpl.status, cluster.name); this.persistentVolumeClaimClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.pvcTpl.name).subscribe( response => { this.deletePublishStatus(state.id); diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts index b52f68836..ccaa39ed1 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/snapshot-persistentvolumeclaim/snapshot-persistentvolumeclaim.component.ts @@ -3,7 +3,7 @@ import { PublishStatus } from '../../../shared/model/v1/publish-status'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, TemplateState } from '../../../shared/shared.const'; import { PersistentVolumeClaimClient } from '../../../shared/client/v1/kubernetes/persistentvolumeclaims'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { CreateSnapshot } from '../create-snapshot/create-snapshot.component'; +import { CreateSnapshotComponent } from '../create-snapshot/create-snapshot.component'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; @@ -21,8 +21,8 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy @Input() state: PublishStatus; @Input() appId: number; - @ViewChild(CreateSnapshot) - createSnapshot: CreateSnapshot; + @ViewChild(CreateSnapshotComponent) + createSnapshot: CreateSnapshotComponent; subscription: Subscription; @@ -36,7 +36,7 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_SNAPSHOT_ALL) { - let state = message.data; + const state = message.data; this.persistentVolumeClaimRobinClient .deleteAllSnapshot(this.appId, state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name) .subscribe( @@ -52,9 +52,10 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_SNAPSHOT) { - let state = message.data.state; + const state = message.data.state; const name = message.data.name; - this.persistentVolumeClaimRobinClient.deleteSnapshot(this.appId, state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( + this.persistentVolumeClaimRobinClient.deleteSnapshot(this.appId, state.cluster, + state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( response => { this.snapshotRefresh(); this.messageHandlerService.showSuccess('删除快照成功！'); @@ -67,9 +68,10 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy if (message && message.state === ConfirmationState.CONFIRMED && message.source === ConfirmationTargets.PERSISTENT_VOLUME_CLAIM_SNAPSHOT_ROLLBACK) { - let state = message.data.state; + const state = message.data.state; const name = message.data.name; - this.persistentVolumeClaimRobinClient.rollBackSnapshot(this.appId, state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( + this.persistentVolumeClaimRobinClient.rollBackSnapshot(this.appId, + state.cluster, state.pvc.metadata.namespace, state.pvc.metadata.name, name).subscribe( response => { this.messageHandlerService.showSuccess('回滚快照成功！'); }, @@ -101,7 +103,8 @@ export class SnapshotPersistentVolumeClaimComponent implements OnInit, OnDestroy snapshotRefresh() { if (this.state.state === TemplateState.SUCCESS) { - this.persistentVolumeClaimRobinClient.listSnapshot(this.appId, this.state.cluster, this.state.pvc.metadata.namespace, this.state.pvc.metadata.name).subscribe( + this.persistentVolumeClaimRobinClient.listSnapshot(this.appId, + this.state.cluster, this.state.pvc.metadata.namespace, this.state.pvc.metadata.name).subscribe( response => { this.state.snaps = response.data.snaps; }, diff --git a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts index 433ac42ef..a3f77fb02 100644 --- a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts +++ b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts @@ -43,7 +43,7 @@ export class PodLoggingComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.appId = parseInt(this.route.snapshot.params['id']); + this.appId = parseInt(this.route.snapshot.params['id'], 10); this.cluster = this.route.snapshot.params['cluster']; this.namespace = this.route.snapshot.params['namespace']; const podName = this.route.snapshot.params['podName']; @@ -71,7 +71,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { if (this.pods && this.pods.length > 0) { const pod = this.getPodByName(podName); if (!pod) { - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/ + ${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -88,7 +89,9 @@ export class PodLoggingComponent implements OnInit, OnDestroy { if (this.logSource === undefined) { this.messageHandlerService.showInfo('缺少机房信息，请联系管理员'); } - const command = this.selectedPod ? `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --${this.resourceType} ${this.resourceName} --pod=${this.selectedPod.name} --container=${this.selectedContainer} --layout=log` : ''; + const command = this.selectedPod ? + `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --${this.resourceType} ` + + `${this.resourceName} --pod=${this.selectedPod.name} --container=${this.selectedContainer} --layout=log` : ''; this.copyService.copy(command); this.switchCopyButton(); } @@ -120,7 +123,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { } containerChange() { - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/ + ${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); this.refreshLog(); } @@ -153,7 +157,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { this.containers = this.selectedPod.containerStatus; if (this.containers && this.containers.length > 0) { this.selectedContainer = this.containers[0].name; - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/ + ${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } } diff --git a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts index 0591ccc3a..bf87a3bde 100644 --- a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts +++ b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts @@ -41,7 +41,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.appId = parseInt(this.route.snapshot.params['id']); + this.appId = parseInt(this.route.snapshot.params['id'], 10); this.cluster = this.route.snapshot.params['cluster']; this.namespace = this.route.snapshot.params['namespace']; const podName = this.route.snapshot.params['podName']; @@ -55,7 +55,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { if (this.pods && this.pods.length > 0) { const pod = this.getPodByName(podName); if (!pod) { - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType} + /${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -82,7 +83,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { } containerChange() { - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType} + /${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -102,7 +104,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { podChange() { this.containers = this.selectedPod.containerStatus; this.selectedContainer = this.containers[0].name; - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName} + /pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -157,7 +160,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { const xterm = Terminal.apply(this.xterm); const cols = (width - xterm.viewport.scrollBarWidth - 15) / xterm.renderer.dimensions.actualCellWidth; const rows = height / xterm.renderer.dimensions.actualCellHeight; - this.xterm.resize(parseInt(cols.toString()), parseInt(rows.toString())); + this.xterm.resize(parseInt(cols.toString(), 10), parseInt(rows.toString(), 10)); } @@ -167,7 +170,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { const msg = JSON.parse(evt.data); switch (msg['Op']) { case 'stdout': - if (msg['Data'].toString().indexOf(`starting container process caused 'exec: \\'bash\\': executable file not found in $PATH'`) === -1) { + if (msg['Data'].toString().indexOf(`starting container process caused 'exec: \\'bash\\': executable file not found in $PATH'`) + === -1) { if (msg['Data'].indexOf('wayne-init') > -1) { console.log('server ready.'); clearInterval(this.timer); diff --git a/src/frontend/src/app/portal/portal-routing.module.ts b/src/frontend/src/app/portal/portal-routing.module.ts index b5d0d0be2..89c17654b 100644 --- a/src/frontend/src/app/portal/portal-routing.module.ts +++ b/src/frontend/src/app/portal/portal-routing.module.ts @@ -15,8 +15,12 @@ import { CreateEditSecretTplComponent } from './secret/create-edit-secrettpl/cre import { AppUserComponent } from './app-user/app-user.component'; import { NamespaceUserComponent } from './namespace-user/namespace-user.component'; import { PersistentVolumeClaimComponent } from './persistentvolumeclaim/persistentvolumeclaim.component'; -import { CreateEditPersistentVolumeClaimTplComponent } from './persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; -import { ListPersistentVolumeClaimComponent } from './persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component'; +import { + CreateEditPersistentVolumeClaimTplComponent +} from './persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component'; +import { + ListPersistentVolumeClaimComponent +} from './persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component'; import { CronjobComponent } from './cronjob/cronjob.component'; import { CreateEditCronjobTplComponent } from './cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component'; import { NamespaceApiKeyComponent } from './namespace-apikey/apikey.component'; diff --git a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts index 148112fb2..124818c36 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts +++ b/src/frontend/src/app/portal/secret/create-edit-secret/create-edit-secret.component.ts @@ -124,7 +124,7 @@ export class CreateEditSecretComponent implements OnInit { !this.checkOnGoing; } - //Handle the form validation + // Handle the form validation handleValidation(): void { const cont = this.currentForm.controls['name']; if (cont) { diff --git a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts index 45f1e00ec..62c4df5b6 100644 --- a/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/secret/publish-tpl/publish-tpl.component.ts @@ -41,7 +41,7 @@ export class PublishSecretTplComponent { } get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } newPublishTpl(secretTpl: SecretTpl, actionType: ResourcesActionType) { @@ -115,7 +115,7 @@ export class PublishSecretTplComponent { } offline(cluster: Cluster) { - let state = this.getStatusByCluster(this.secretTpl.status, cluster.name); + const state = this.getStatusByCluster(this.secretTpl.status, cluster.name); this.secretClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.secretTpl.name).subscribe( response => { this.deletePublishStatus(state.id); diff --git a/src/frontend/src/app/portal/secret/secret.component.ts b/src/frontend/src/app/portal/secret/secret.component.ts index 2f1e934ea..76e384f03 100644 --- a/src/frontend/src/app/portal/secret/secret.component.ts +++ b/src/frontend/src/app/portal/secret/secret.component.ts @@ -196,7 +196,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { if (status.errNum > 2) { continue; } this.secretClient.get(this.appId, status.cluster, this.cacheService.kubeNamespace, tpl.name).subscribe( response => { - const code = response.statusCode | response.status; + const code = response.statusCode || response.status; if (code === httpStatusCode.NoContent) { this.secretTpls[i].status[j].state = TemplateState.NOT_FOUND; return; @@ -236,8 +236,8 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { } initSecret(refreshTpl?: boolean) { - this.appId = parseInt(this.route.parent.snapshot.params['id']); - this.secretId = parseInt(this.route.snapshot.params['secretId']); + this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); + this.secretId = parseInt(this.route.snapshot.params['secretId'], 10); const namespaceId = this.cacheService.namespaceId; Observable.combineLatest( this.secretService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), @@ -306,7 +306,8 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { return; } if (state) { - this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + this.pageState = PageState.fromState(state, + {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; @@ -319,12 +320,12 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { this.publishStatus = status; const tplStatusMap = {}; if (status && status.length > 0) { - for (const state of status) { - if (!tplStatusMap[state.templateId]) { - tplStatusMap[state.templateId] = Array(); + for (const stat of status) { + if (!tplStatusMap[stat.templateId]) { + tplStatusMap[stat.templateId] = Array(); } - state.errNum = 0; - tplStatusMap[state.templateId].push(state); + stat.errNum = 0; + tplStatusMap[stat.templateId].push(stat); } } this.tplStatusMap = tplStatusMap; diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts index 701729f57..302a64a92 100644 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts @@ -44,7 +44,7 @@ export class ListPodComponent implements OnInit, OnDestroy { subscription: Subscription; get appId(): number { - return parseInt(this.route.parent.snapshot.params['id']); + return parseInt(this.route.parent.snapshot.params['id'], 10); } constructor(private inventory: Inventory, @@ -91,9 +91,9 @@ export class ListPodComponent implements OnInit, OnDestroy { this.whetherHotReflash = true; this.clusterService.getByName(this.currentCluster).subscribe( response => { - const cluster: Cluster = response.data; - if (cluster.metaData) { - const metaData = JSON.parse(cluster.metaData); + const data: Cluster = response.data; + if (data.metaData) { + const metaData = JSON.parse(data.metaData); if (metaData.logSource) { this.logSource = metaData.logSource; } @@ -124,12 +124,13 @@ export class ListPodComponent implements OnInit, OnDestroy { clearInterval(this.timer); return; } - if (this.whetherHotReflash) this.refresh(); + if (this.whetherHotReflash) { this.refresh(); } }, 5000); } refresh() { - this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, 'statefulset', this.statefulset).subscribe( + this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, + 'statefulset', this.statefulset).subscribe( response => { const pods = response.data; this.inventory.size = pods.length; @@ -157,14 +158,16 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset + /${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app + /${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts index 4275d1d1f..7eb0e5587 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts @@ -172,7 +172,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { } listPod(status: TemplateStatus, tpl: StatefulsetTemplate) { - if (status.cluster && status.state != TemplateState.NOT_FOUND) { + if (status.cluster && status.state !== TemplateState.NOT_FOUND) { this.listPodComponent.openModal(status.cluster, tpl.name); } } diff --git a/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts b/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts index b07264a49..b57400db3 100644 --- a/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts +++ b/src/frontend/src/app/portal/statefulset/publish-tpl/publish-tpl.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; - +import { forkJoin } from 'rxjs'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { NgForm } from '@angular/forms'; @@ -170,7 +170,7 @@ export class PublishStatefulsetTplComponent { offline() { Object.getOwnPropertyNames(this.clusterMetas).map(cluster => { if (this.clusterMetas[cluster].checked) { - let state = this.getStatusByCluster(this.statefulsetTpl.status, cluster); + const state = this.getStatusByCluster(this.statefulsetTpl.status, cluster); this.statefulsetClient.deleteByName(this.appId, cluster, this.cacheService.kubeNamespace, this.statefulset.name).subscribe( response => { this.deletePublishStatus(state.id); @@ -217,7 +217,7 @@ export class PublishStatefulsetTplComponent { kubeStatefulSet)); } }); - Observable.forkJoin(observables).subscribe( + forkJoin(observables).subscribe( response => { this.published.emit(true); this.messageHandlerService.showSuccess('发布成功！'); diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts b/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts index 3296817c1..3f0bac8b8 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor-box/ace-editor-box.component.ts @@ -32,7 +32,7 @@ export class AceEditorBoxComponent implements OnInit, OnDestroy { ngOnInit() { this.aceEditorMsgSub = this.aceEditorService.aceMessageAnnouncedSource$.subscribe( message => { - const modalOpened = true + const modalOpened = true; let title: string, hiddenFooter: boolean; this.aceMode = 'ace/mode/json'; // 这里分为三种情况，不传edit时候是嵌套在其他模板中，true为编辑模板，false为查看模板。 diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts index 6fca223a8..62ee048ef 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts @@ -37,7 +37,9 @@ export class AceEditorComponent implements OnInit { modalInfo(info: ModalInfo) { Object.getOwnPropertyNames(info).map(key => { - if (info[key]) this[key] = info[key]; + if (info[key]) { + this[key] = info[key]; + } }); } diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.service.ts b/src/frontend/src/app/shared/ace-editor/ace-editor.service.ts index 7f87632c3..8839f1dfd 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.service.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.service.ts @@ -15,10 +15,6 @@ export class AceEditorService { this.aceMessageAnnouncedSource.next(message); } - ngOnInit(): void { - - } - clear() { this.clearSource.next(true); } diff --git a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts index e326b3818..8c09dfe0e 100644 --- a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts @@ -5,8 +5,8 @@ import { AceEditorComponent } from '../../ace-editor/ace-editor.component'; import { AuthService } from '../../auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; import { ClusterService } from '../../client/v1/cluster.service'; -import {PageState} from '../../page/page-state'; -import {State} from '@clr/angular'; +import { PageState } from '../../page/page-state'; +import { State } from '@clr/angular'; export class KubernetesResource { listResourceComponent: any; diff --git a/src/frontend/src/app/shared/base/resource/publish-template.ts b/src/frontend/src/app/shared/base/resource/publish-template.ts index 47678a9d1..a3884004d 100644 --- a/src/frontend/src/app/shared/base/resource/publish-template.ts +++ b/src/frontend/src/app/shared/base/resource/publish-template.ts @@ -107,7 +107,7 @@ export class PublishTemplate { } offline(cluster: Cluster) { - let state = this.getStatusByCluster(this.template.status, cluster.name); + const state = this.getStatusByCluster(this.template.status, cluster.name); this.resourceClient.deleteByName(this.appId, cluster.name, this.cacheService.kubeNamespace, this.template.name).subscribe( response => { this.deletePublishStatus(state.id); diff --git a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts index 60e5b6d58..fcd5954f3 100644 --- a/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts +++ b/src/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts @@ -28,11 +28,15 @@ export class BreadcrumbComponent implements OnInit, OnDestroy { } navigateTo(url: string, avail: boolean) { - if (avail) this.router.navigateByUrl(url); + if (avail) { + this.router.navigateByUrl(url); + } } generateTrail(url: string) { - if (url === '') return; + if (url === '') { + return; + } if (!this.breadcrumbService.isRouteHidden(url)) { this.urls.unshift(url); } diff --git a/src/frontend/src/app/shared/checkbox-group/checkbox-group.component.ts b/src/frontend/src/app/shared/checkbox-group/checkbox-group.component.ts index 8a111ed1d..79da5340d 100644 --- a/src/frontend/src/app/shared/checkbox-group/checkbox-group.component.ts +++ b/src/frontend/src/app/shared/checkbox-group/checkbox-group.component.ts @@ -19,7 +19,7 @@ export class CheckboxGroupComponent implements ControlValueAccessor { _boxs: QueryList; eventList: any[] = new Array(); updateEmit = (_: any) => { - }; + } constructor(private eventManage: EventManager) { diff --git a/src/frontend/src/app/shared/client/v1/autoscale.service.ts b/src/frontend/src/app/shared/client/v1/autoscale.service.ts index 9374507d4..e94c3fac4 100644 --- a/src/frontend/src/app/shared/client/v1/autoscale.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscale.service.ts @@ -48,7 +48,7 @@ export class AutoscaleService { filterList.push(`${key}__contains=${value}`); } } - }) + }); if (filterList.length) { params = params.set('filter', filterList.join(',')); } diff --git a/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts b/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts index ee053c40b..1725cddab 100644 --- a/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts @@ -41,7 +41,7 @@ export class AutoscaleTplService { filterList.push(`${key}__contains=${value}`); } } - }) + }); if (filterList.length) { params = params.set('filter', filterList.join(',')); } diff --git a/src/frontend/src/app/shared/client/v1/cluster.service.ts b/src/frontend/src/app/shared/client/v1/cluster.service.ts index f17655aa5..160dbf913 100644 --- a/src/frontend/src/app/shared/client/v1/cluster.service.ts +++ b/src/frontend/src/app/shared/client/v1/cluster.service.ts @@ -19,11 +19,10 @@ export class ClusterService { getNames(): Observable { return this.http .get('/api/v1/clusters/names') - .catch(error => Observable.throw(error)); } - list(pageState: PageState, deleted?: string,): Observable { + list(pageState: PageState, deleted?: string): Observable { let params = new HttpParams(); params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); diff --git a/src/frontend/src/app/shared/client/v1/configmap.service.ts b/src/frontend/src/app/shared/client/v1/configmap.service.ts index 737e1d5e3..f0e6b72ba 100644 --- a/src/frontend/src/app/shared/client/v1/configmap.service.ts +++ b/src/frontend/src/app/shared/client/v1/configmap.service.ts @@ -18,7 +18,7 @@ export class ConfigMapService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } diff --git a/src/frontend/src/app/shared/client/v1/copy.service.ts b/src/frontend/src/app/shared/client/v1/copy.service.ts index 2e4ff0bd7..85363e107 100644 --- a/src/frontend/src/app/shared/client/v1/copy.service.ts +++ b/src/frontend/src/app/shared/client/v1/copy.service.ts @@ -38,11 +38,6 @@ export class CopyService { return this.document.execCommand('copy'); } - /** - * @param {textElement} input or textarea element - * @returns {boolean} 返回成功或者失败结果 - */ - private selectText(textElement: HTMLInputElement | HTMLTextAreaElement): boolean { try { textElement.select(); @@ -60,8 +55,9 @@ export class CopyService { } private judgeModal() { - if (this.document.querySelector('.modal') && this.document.querySelector('.modal').hasAttribute('tabindex')) + if (this.document.querySelector('.modal') && this.document.querySelector('.modal').hasAttribute('tabindex')) { this.document.querySelector('.modal').removeAttribute('tabindex'); + } } copy(value: any) { diff --git a/src/frontend/src/app/shared/client/v1/cronjob.service.ts b/src/frontend/src/app/shared/client/v1/cronjob.service.ts index d34f0f77d..11ee324f5 100644 --- a/src/frontend/src/app/shared/client/v1/cronjob.service.ts +++ b/src/frontend/src/app/shared/client/v1/cronjob.service.ts @@ -18,7 +18,7 @@ export class CronjobService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } diff --git a/src/frontend/src/app/shared/client/v1/daemonset.service.ts b/src/frontend/src/app/shared/client/v1/daemonset.service.ts index 2b690408a..2f39d0272 100644 --- a/src/frontend/src/app/shared/client/v1/daemonset.service.ts +++ b/src/frontend/src/app/shared/client/v1/daemonset.service.ts @@ -18,7 +18,7 @@ export class DaemonSetService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } @@ -33,7 +33,9 @@ export class DaemonSetService { params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); params = params.set('sortby', '-id'); - if (deleted) params = params.set('deleted', deleted); + if (deleted) { + params = params.set('deleted', deleted); + } // query param Object.getOwnPropertyNames(pageState.params).map(key => { const value = pageState.params[key]; diff --git a/src/frontend/src/app/shared/client/v1/deployment.service.ts b/src/frontend/src/app/shared/client/v1/deployment.service.ts index 1782f2e08..aeae973b6 100644 --- a/src/frontend/src/app/shared/client/v1/deployment.service.ts +++ b/src/frontend/src/app/shared/client/v1/deployment.service.ts @@ -18,7 +18,7 @@ export class DeploymentService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } diff --git a/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts b/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts index 5f01322f4..7bac51268 100644 --- a/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders, HttpParams} from '@angular/common/http'; +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; @@ -41,7 +41,7 @@ export class IngressTplService { filterList.push(`${key}__contains=${value}`); } } - }) + }); if (filterList.length) { params = params.set('filter', filterList.join(',')); } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts index 67b4e3120..2ed8b9f6f 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts @@ -31,8 +31,7 @@ export class KubernetesClient { } ListPage(pageState: PageState, cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { - let params = BaseClient.buildParam(pageState); - + const params = BaseClient.buildParam(pageState); if ((typeof (appId) === 'undefined') || (!appId)) { appId = '0'; } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts index 82b813a9b..2e6068885 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts @@ -11,8 +11,7 @@ export class DeploymentClient { } listPage(pageState: PageState, cluster: string, namespace: string, appId?: string): Observable { - let params = BaseClient.buildParam(pageState); - + const params = BaseClient.buildParam(pageState); if ((typeof (appId) === 'undefined') || (!appId)) { appId = '0'; } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts b/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts index d0975b0fd..1afeacbb9 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts @@ -1,6 +1,6 @@ -import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {HttpClient} from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class IngressClient { @@ -16,7 +16,7 @@ export class IngressClient { get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/ingresses/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)) + .catch(error => Observable.throw(error)); } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts index 79b1560b7..e0d2cf043 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts @@ -11,7 +11,8 @@ export class LogClient { let params = new HttpParams(); params = params.set('tailLines', tailLines + ''); return this.http - .get(`/api/v1/kubernetes/apps/${appId}/podlogs/${pod}/containers/${container}/namespaces/${namespace}/clusters/${cluster}`, {params: params}) + .get(`/api/v1/kubernetes/apps/${appId}/podlogs/${pod}/containers/${container}/ + namespaces/${namespace}/clusters/${cluster}`, {params: params}) .catch(error => Observable.throw(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts index f901e1c23..6bee83b6c 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts @@ -17,7 +17,7 @@ export class NamespaceClient { } listPage(pageState: PageState, cluster: string): Observable { - let params = BaseClient.buildParam(pageState); + const params = BaseClient.buildParam(pageState); return this.http .get(`/api/v1/kubernetes/namespaces/clusters/${cluster}`, {params: params}) .catch(error => Observable.throw(error)); diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts index e24cf7bbc..b91d3e995 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts @@ -51,25 +51,30 @@ export class PersistentVolumeClaimRobinClient { createSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .post(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + .post( + `/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin + /${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => Observable.throw(error)); } deleteSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) + .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims + /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) .catch(error => Observable.throw(error)); } deleteAllSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) + .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims + /robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) .catch(error => Observable.throw(error)); } rollBackSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims + /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => Observable.throw(error)); } diff --git a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts index 9253115a9..b5d3bfe22 100644 --- a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts +++ b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts @@ -22,7 +22,7 @@ export class PersistentVolumeClaimService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } diff --git a/src/frontend/src/app/shared/client/v1/secret.service.ts b/src/frontend/src/app/shared/client/v1/secret.service.ts index 7f4757e6e..be1d8c253 100644 --- a/src/frontend/src/app/shared/client/v1/secret.service.ts +++ b/src/frontend/src/app/shared/client/v1/secret.service.ts @@ -18,7 +18,7 @@ export class SecretService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } diff --git a/src/frontend/src/app/shared/client/v1/select-copy.service.ts b/src/frontend/src/app/shared/client/v1/select-copy.service.ts index dcea2d493..8a5a36729 100644 --- a/src/frontend/src/app/shared/client/v1/select-copy.service.ts +++ b/src/frontend/src/app/shared/client/v1/select-copy.service.ts @@ -100,13 +100,21 @@ export class SelectCopyService implements OnDestroy, AfterViewInit { mouseUpEvent(event) { const target = event.target; - if (this.getSelectText().trim() === '') return; - if (this.isButton(target) || this.isCopyButton(target)) return; + if (this.getSelectText().trim() === '') { + return; + } + if (this.isButton(target) || this.isCopyButton(target)) { + return; + } const dom = this.render.createElement('div'); dom.id = 'copy-button'; const result = this.buttonPosition(event, this.getSelectPosition()); dom.style.cssText = `width: 30px;height: 30px; position: fixed;z-index: 1051;left: ${result.left}px; top: ${result.top}px`; - dom.innerHTML = ''; + dom.innerHTML = '' + + ''; this.render.appendChild(this.document.body, dom); this.boxAddScroll(target); this.isCopy = true; @@ -118,7 +126,7 @@ export class SelectCopyService implements OnDestroy, AfterViewInit { this.copyService.copy(this.getSelectText()); } this.removeCopyButton(); - if (this.isAceBox(eventDom)) return; + if (this.isAceBox(eventDom)) { return; } this.removeSelect(); } @@ -165,6 +173,7 @@ export class SelectCopyService implements OnDestroy, AfterViewInit { } getSelectPosition() { - return this.supportSelection ? this.document.selection.createRange().getBoundingClientRect() : this.document.getSelection().getRangeAt(0).getBoundingClientRect(); + return this.supportSelection ? + this.document.selection.createRange().getBoundingClientRect() : this.document.getSelection().getRangeAt(0).getBoundingClientRect(); } } diff --git a/src/frontend/src/app/shared/client/v1/statefulset.service.ts b/src/frontend/src/app/shared/client/v1/statefulset.service.ts index 6ce457d5c..210f5ba76 100644 --- a/src/frontend/src/app/shared/client/v1/statefulset.service.ts +++ b/src/frontend/src/app/shared/client/v1/statefulset.service.ts @@ -18,7 +18,7 @@ export class StatefulsetService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof (appId) === 'undefined') { appId = 0; } @@ -28,11 +28,13 @@ export class StatefulsetService { .catch(error => Observable.throw(error)); } - listPage(pageState: PageState, appId: number, deleted?: string,): Observable { + listPage(pageState: PageState, appId: number, deleted?: string): Observable { let params = new HttpParams(); params = params.set('pageNo', pageState.page.pageNo + ''); params = params.set('pageSize', pageState.page.pageSize + ''); - if (deleted) params = params.set('deleted', deleted); + if (deleted) { + params = params.set('deleted', deleted); + } params = params.set('sortby', '-id'); // query param Object.getOwnPropertyNames(pageState.params).map(key => { diff --git a/src/frontend/src/app/shared/client/v1/storage.service.ts b/src/frontend/src/app/shared/client/v1/storage.service.ts index e62bf15bb..f104437e7 100644 --- a/src/frontend/src/app/shared/client/v1/storage.service.ts +++ b/src/frontend/src/app/shared/client/v1/storage.service.ts @@ -22,7 +22,7 @@ export class StorageService { save(k: any, v: any) { const key = this._toString(k); const value = this._toString(v); - if (!(key && value)) return; + if (!(key && value)) { return; } if (window.localStorage) { try { localStorage.setItem(key, value); @@ -36,7 +36,7 @@ export class StorageService { get(k: any) { const key = this._toString(k); - if (!key) return; + if (!key) { return; } if (window.localStorage) { try { return localStorage.getItem(key); @@ -59,7 +59,7 @@ export class StorageService { getCookie(key: string) { const arr = document.cookie.match(new RegExp('(^| )' + key + '=([^;]*)(;|$)')); - if (arr !== null) return arr[2]; + if (arr !== null) { return arr[2]; } return null; } diff --git a/src/frontend/src/app/shared/client/v1/tip.service.ts b/src/frontend/src/app/shared/client/v1/tip.service.ts index 9a1dc0125..90a30d000 100644 --- a/src/frontend/src/app/shared/client/v1/tip.service.ts +++ b/src/frontend/src/app/shared/client/v1/tip.service.ts @@ -23,8 +23,8 @@ export class TipService { * @description 获取可是窗口信息可以使用getBoundingClientRect方法 * 在样式中显示了显示长度是60，高度为260.宽度为250. */ - if (this.dragEvent) return; - if (!message.background) message.background = '#000'; + if (this.dragEvent) { return; } + if (!message.background) { message.background = '#000'; } const tipDiv = this.render.createElement('div'); const bodyHeight = this.document.querySelector('body').getBoundingClientRect().height; const span = this.render.createElement('span'); @@ -57,8 +57,8 @@ export class TipService { } close(text: string) { - if (this._enter) return; - if (this.dragEvent) return; + if (this._enter) { return; } + if (this.dragEvent) { return; } if (this.eventList.length !== 0) { this.eventList.forEach(item => { item(); diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index ff4e861b4..41d867c59 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -26,7 +26,7 @@ export class ConfirmationDialogComponent implements OnDestroy { this.dialogTitle = msg.title; this.dialogContent = msg.message; this.message = msg; - //Open dialog + // Open dialog this.buttons = msg.buttons; this.open(); }); @@ -47,7 +47,7 @@ export class ConfirmationDialogComponent implements OnDestroy { } cancel(): void { - if (!this.message) {//Inproper condition + if (!this.message) {// Inproper condition this.close(); return; } @@ -63,7 +63,7 @@ export class ConfirmationDialogComponent implements OnDestroy { } confirm(): void { - if (!this.message) {//Inproper condition + if (!this.message) {// Inproper condition this.close(); return; } diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts index 639e104fe..9a40a2b1c 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts @@ -11,7 +11,7 @@ export class ConfirmationMessage { title: string; message: string; - data: any = {};//default is empty + data: any = {}; // default is empty targetId: ConfirmationTargets = ConfirmationTargets.EMPTY; param: string; buttons: ConfirmationButtons; diff --git a/src/frontend/src/app/shared/dropdown/dropdown.component.ts b/src/frontend/src/app/shared/dropdown/dropdown.component.ts index 5e964dd19..21b88a779 100644 --- a/src/frontend/src/app/shared/dropdown/dropdown.component.ts +++ b/src/frontend/src/app/shared/dropdown/dropdown.component.ts @@ -8,9 +8,6 @@ import { EventManager } from '@angular/platform-browser'; selector: 'wayne-dropdown', templateUrl: './dropdown.component.html', styleUrls: ['./dropdown.component.scss'], - host: { - 'class': 'wanye-dropdown' - }, animations: [ trigger('contentState', [ state('show', style({height: '*'})), @@ -60,6 +57,7 @@ export class DropDownComponent implements OnInit { private scrollBar: ScrollBarService, private eventManager: EventManager ) { + el.nativeElement.setAttribute('class', 'wanye-dropdown'); } @HostListener('mouseenter') diff --git a/src/frontend/src/app/shared/dropdown/item/dropdown-item.component.ts b/src/frontend/src/app/shared/dropdown/item/dropdown-item.component.ts index c63eaa21f..1f1e942f0 100644 --- a/src/frontend/src/app/shared/dropdown/item/dropdown-item.component.ts +++ b/src/frontend/src/app/shared/dropdown/item/dropdown-item.component.ts @@ -7,5 +7,5 @@ import { Component, Input } from '@angular/core'; }) export class DropdownItemComponent { - @Input('name') title: string; + @Input('title') title: string; } diff --git a/src/frontend/src/app/shared/dual-list-box/array.pipes.ts b/src/frontend/src/app/shared/dual-list-box/array.pipes.ts index 91b31ffc8..0183526a0 100644 --- a/src/frontend/src/app/shared/dual-list-box/array.pipes.ts +++ b/src/frontend/src/app/shared/dual-list-box/array.pipes.ts @@ -9,7 +9,6 @@ export class SortOptions { * Static property to defined ASC and DESC values * to avoid hardcoding and repeating * replaces string enums - * @type {{ASC: string; DESC: string}} */ static direction: { ASC: string, diff --git a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts index 49bf54092..003b535bd 100644 --- a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts +++ b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core'; import { ControlValueAccessor, FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; -import 'rxjs/Rx'; +// import 'rxjs/Rx'; import * as _ from 'lodash'; import { IItemsMovedEvent, IListBoxItem } from './models'; import { TranslateService } from '@ngx-translate/core'; @@ -17,6 +17,17 @@ import { TranslateService } from '@ngx-translate/core'; }) export class DualListBoxComponent implements OnInit, ControlValueAccessor { + // private variables to manage class + searchTermAvailable = ''; + searchTermSelected = ''; + availableItems: Array = []; + backupItems: Array = []; + selectedItems: Array = []; + listBoxForm: FormGroup; + availableListBoxControl: FormControl = new FormControl(); + selectedListBoxControl: FormControl = new FormControl(); + availableSearchInputControl: FormControl = new FormControl(); + selectedSearchInputControl: FormControl = new FormControl(); // array of items to display in left box @Input() set data(items: Array<{}>) { this.availableItems = [...(items || []).map((item: {}, index: number) => ({ @@ -24,19 +35,19 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { text: item[this.textField] }))]; this.backupItems = this.availableItems; - }; + } // input to set search term for available list box from the outside @Input() set availableSearch(searchTerm: string) { this.searchTermAvailable = searchTerm; this.availableSearchInputControl.setValue(searchTerm); - }; + } // input to set search term for selected list box from the outside @Input() set selectedSearch(searchTerm: string) { this.searchTermSelected = searchTerm; this.selectedSearchInputControl.setValue(searchTerm); - }; + } // field to use for value of option @Input() valueField = 'id'; @@ -56,31 +67,18 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { @Input() availableFilterPlaceholder = 'Filter...'; // set placeholder text in selected items list box @Input() selectedFilterPlaceholder = 'Filter...'; - // event called when item or items from available items(left box) is selected - @Output() onAvailableItemSelected: EventEmitter<{} | Array<{}>> = new EventEmitter<{} | Array<{}>>(); + @Output() availableItemSelected: EventEmitter<{} | Array<{}>> = new EventEmitter<{} | Array<{}>>(); // event called when item or items from selected items(right box) is selected - @Output() onSelectedItemsSelected: EventEmitter<{} | Array<{}>> = new EventEmitter<{} | Array<{}>>(); + @Output() selectedItemsSelected: EventEmitter<{} | Array<{}>> = new EventEmitter<{} | Array<{}>>(); // event called when items are moved between boxes, returns state of both boxes and item moved - @Output() onItemsMoved: EventEmitter = new EventEmitter(); - - // private variables to manage class - searchTermAvailable = ''; - searchTermSelected = ''; - availableItems: Array = []; - backupItems: Array = []; - selectedItems: Array = []; - listBoxForm: FormGroup; - availableListBoxControl: FormControl = new FormControl(); - selectedListBoxControl: FormControl = new FormControl(); - availableSearchInputControl: FormControl = new FormControl(); - selectedSearchInputControl: FormControl = new FormControl(); + @Output() itemsMoved: EventEmitter = new EventEmitter(); // control value accessors - _onChange = (_: any) => { - }; + _onChange = (v: any) => { + } _onTouched = () => { - }; + } constructor(public fb: FormBuilder, public translate: TranslateService) { this.listBoxForm = this.fb.group({ @@ -94,10 +92,10 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { ngOnInit(): void { this.availableListBoxControl .valueChanges - .subscribe((items: Array<{}>) => this.onAvailableItemSelected.emit(items)); + .subscribe((items: Array<{}>) => this.availableItemSelected.emit(items)); this.selectedListBoxControl .valueChanges - .subscribe((items: Array<{}>) => this.onSelectedItemsSelected.emit(items)); + .subscribe((items: Array<{}>) => this.selectedItemsSelected.emit(items)); this.availableSearchInputControl .valueChanges .debounceTime(this.debounceTime) @@ -131,7 +129,7 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { }); this.selectedItems = [...this.selectedItems, ...selectedItems]; this.availableItems = [...leftItems]; - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: selectedItems.map(item => item.value) @@ -159,7 +157,7 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { }); this.availableItems = [...this.availableItems, ...selectedItems]; this.selectedItems = [...leftItems]; - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: selectedItems.map(item => item.value) @@ -176,11 +174,13 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { // first move items to selected this.selectedItems = [...this.selectedItems, - ..._.intersectionWith(this.availableItems, this.availableListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; + ..._.intersectionWith(this.availableItems, + this.availableListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; // now filter available items to not include marked values - this.availableItems = [..._.differenceWith(this.availableItems, this.availableListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; + this.availableItems = [..._.differenceWith(this.availableItems, + this.availableListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; // clear marked available items and emit event - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: this.availableListBoxControl.value @@ -196,11 +196,13 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { // first move items to available this.availableItems = [...this.availableItems, - ..._.intersectionWith(this.selectedItems, this.selectedListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; + ..._.intersectionWith(this.selectedItems, + this.selectedListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; // now filter available items to not include marked values - this.selectedItems = [..._.differenceWith(this.selectedItems, this.selectedListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; + this.selectedItems = [..._.differenceWith(this.selectedItems, + this.selectedListBoxControl.value, (item: IListBoxItem, value: string) => item.value === value)]; // clear marked available items and emit event - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: this.selectedListBoxControl.value @@ -217,7 +219,7 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { this.availableItems = this.availableItems.filter((listItem: IListBoxItem) => listItem.value !== item.value); this.selectedItems = [...this.selectedItems, item]; - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: [item.value] @@ -234,7 +236,7 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { this.selectedItems = this.selectedItems.filter((listItem: IListBoxItem) => listItem.value !== item.value); this.availableItems = [...this.availableItems, item]; - this.onItemsMoved.emit({ + this.itemsMoved.emit({ available: this.availableItems, selected: this.selectedItems, movedItems: [item.value] @@ -248,36 +250,37 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { * by the value field * @param index * @param item - * @returns {any} + * @returns any */ trackByValue(index: number, item: {}): string { return item[this.valueField]; } /* Methods from ControlValueAccessor interface, required for ngModel and formControlName - begin */ - writeValue(value: any, source: boolean = false): void { + writeValue(val: any, source: boolean = false): void { if (source) { - if (this.selectedItems && value && value.length > 0) { + if (this.selectedItems && val && val.length > 0) { this.selectedItems = [...this.selectedItems, - ..._.intersectionWith(this.availableItems, value, (item: IListBoxItem, value: string) => item.value === value)]; - this.availableItems = [..._.differenceWith(this.availableItems, value, (item: IListBoxItem, value: string) => item.value === value)]; + ..._.intersectionWith(this.availableItems, val, (item: IListBoxItem, value: string) => item.value === value)]; + this.availableItems = [..._.differenceWith(this.availableItems, + val, (item: IListBoxItem, value: string) => item.value === value)]; } } else { - if (this.selectedItems && value && value.length > 0) { + if (this.selectedItems && val && val.length > 0) { this.availableItems = this.backupItems; this.selectedItems = [ - ..._.intersectionWith(this.availableItems, value, (item: IListBoxItem, value: string) => item.value === value) + ..._.intersectionWith(this.availableItems, val, (item: IListBoxItem, value: string) => item.value === value) ]; this.availableItems = [ - ..._.differenceWith(this.availableItems, value, (item: IListBoxItem, value: string) => item.value === value) + ..._.differenceWith(this.availableItems, val, (item: IListBoxItem, value: string) => item.value === value) ]; } - if (value && value.length === 0) { + if (val && val.length === 0) { this.selectedItems = []; this.availableItems = this.backupItems; } } - this._onChange(value); + this._onChange(val); } registerOnChange(fn: (_: any) => {}): void { @@ -293,7 +296,7 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { /** * Utility method to get values from * selected items - * @returns {string[]} + * @returns string[] */ private getValues(): any[] { return (this.selectedItems || []).map((item: IListBoxItem) => item.value); diff --git a/src/frontend/src/app/shared/filter-box/filter-box.component.ts b/src/frontend/src/app/shared/filter-box/filter-box.component.ts index 89e6334c7..2d9113c0d 100644 --- a/src/frontend/src/app/shared/filter-box/filter-box.component.ts +++ b/src/frontend/src/app/shared/filter-box/filter-box.component.ts @@ -27,20 +27,26 @@ export class FilterBoxComponent implements OnInit { } clickEvent(event) { - if (this.isBox(event.target)) return; + if (this.isBox(event.target)) { + return; + } this._cancel(); } isBox(target: HTMLElement): boolean { while (target && target.tagName.toLocaleLowerCase() !== 'body') { - if (target.tagName.toLocaleLowerCase() === 'wayne-filter-box') return true; + if (target.tagName.toLocaleLowerCase() === 'wayne-filter-box') { + return true; + } target = target.parentElement; } return false; } destroyEvent() { - if (this.eventTarget) this.eventTarget(); + if (this.eventTarget) { + this.eventTarget(); + } this.show = false; } diff --git a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts index 936950985..e73500aa8 100644 --- a/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window-item/float-window-item.component.ts @@ -23,6 +23,9 @@ export class FloatWindowItemComponent implements OnInit { index: number; length: number; + boxState = 'leave'; + itemState = ''; + @Input() tip: string; @Input() value: string; @@ -32,9 +35,6 @@ export class FloatWindowItemComponent implements OnInit { ngOnInit() { } - boxState = 'leave'; - itemState = ''; - get getStyle() { return { 'transition-delay': this.boxState === 'enter' ? this.index * 60 + 'ms' : (this.length - 1 - this.index) * 60 + 'ms', diff --git a/src/frontend/src/app/shared/float-window/float-window.component.ts b/src/frontend/src/app/shared/float-window/float-window.component.ts index 2e6641422..fbb4bf4fd 100644 --- a/src/frontend/src/app/shared/float-window/float-window.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window.component.ts @@ -18,10 +18,7 @@ import { DOCUMENT, EventManager } from '@angular/platform-browser'; transition('* => enter', animate('0s')), transition('* => leave', animate('4ms 1s')) ]) - ], - host: { - 'draggable': 'false' - } + ] }) /** * @Input name: 作为主按钮的文案 @@ -39,6 +36,7 @@ export class FloatWindowComponent { private eventManager: EventManager, @Inject(DOCUMENT) private document: any ) { + el.nativeElement.setAttribute('draggable', 'false'); } @Input() value: string; @@ -52,7 +50,7 @@ export class FloatWindowComponent { item.index = index; item.length = 4; }); - }; + } @HostListener('mousedown', ['$event']) downEvent(evt) { @@ -94,7 +92,7 @@ export class FloatWindowComponent { getBox(element: any): HTMLElement { while (element.tagName.toLocaleLowerCase() !== 'body') { element = element.parentElement; - if (element.tagName.toLocaleLowerCase() === 'wayne-float-window') break; + if (element.tagName.toLocaleLowerCase() === 'wayne-float-window') { break; } } return element; } diff --git a/src/frontend/src/app/shared/input/input.component.ts b/src/frontend/src/app/shared/input/input.component.ts index 522cc9621..71f4aeb5e 100644 --- a/src/frontend/src/app/shared/input/input.component.ts +++ b/src/frontend/src/app/shared/input/input.component.ts @@ -13,13 +13,6 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; }) export class InputComponent implements ControlValueAccessor { - - updateEmit = (_: any) => { - }; - value: string; - readOnly = false; - showSearch = false; - focusState = false; @ViewChild('input') inputElement; @Input('placeholder') placeholder = ''; @Input('type') type = 'text'; @@ -42,6 +35,13 @@ export class InputComponent implements ControlValueAccessor { @Output() input = new EventEmitter(); @Output() change = new EventEmitter(); + value: string; + readOnly = false; + showSearch = false; + focusState = false; + updateEmit = (_: any) => { + } + writeValue(value: any): void { if (value !== this.value) { this.value = value; diff --git a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts index 89f337d2d..679ae1259 100644 --- a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts +++ b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts @@ -19,7 +19,7 @@ export class AuthInterceptor implements HttpInterceptor { // HttpHeader object immutable - copy values const headerSettings: { [name: string]: string | string[]; } = {}; - for (let key of request.headers.keys()) { + for (const key of request.headers.keys()) { headerSettings[key] = request.headers.getAll(key); } if (token) { diff --git a/src/frontend/src/app/shared/message-handler/message-handler.service.ts b/src/frontend/src/app/shared/message-handler/message-handler.service.ts index d0eed2d1d..718c744d4 100644 --- a/src/frontend/src/app/shared/message-handler/message-handler.service.ts +++ b/src/frontend/src/app/shared/message-handler/message-handler.service.ts @@ -12,19 +12,19 @@ export class MessageHandlerService { @Inject(DOCUMENT) private document: any) { } - public handleError(error: any | string): void { - if (!error) { + public handleError(err: any | string): void { + if (!err) { return; } - const code = error.statusCode | error.status; - console.log(error); + const code = err.statusCode || err.status; + console.log(err); if (code === httpStatusCode.Unauthorized) { const currentUrl = document.location.origin; - if (document.location.pathname != '/sign-in') { + if (document.location.pathname !== '/sign-in') { this.injector.get(Router).navigateByUrl(`sign-in?ref=${document.location.pathname}`); } } else { - this.msgService.announceMessage(code, error.error ? error.error.msg : error.error, AlertType.DANGER); + this.msgService.announceMessage(code, err.error ? err.error.msg : err.error, AlertType.DANGER); } } From e609f601ce6986312506cd640b0de6b40bf77575 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 11:15:08 +0800 Subject: [PATCH 010/112] backend:update travis and add fronten lint --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ecb5904c..5449cacc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,4 @@ matrix: script: - # npm run test Wayne 前端测试尚未编排 - npm run build - -notifications: - email: - - 792400644@qq.com \ No newline at end of file + - npm run lint \ No newline at end of file From ea6e7383eee79f7964f06ed4b042a4c7830d8376 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 11:51:41 +0800 Subject: [PATCH 011/112] frontend:update lib --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index e6bd213a1..673a74613 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit e6bd213a1f7d37d91fa7d48782749ec1b6fd5c25 +Subproject commit 673a746134d7297ba994a1bfa66f3e8848c1807c From 5cee7fa617605428da9026f5385d0c4e65758aa7 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 11:56:04 +0800 Subject: [PATCH 012/112] frontend: update lib --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index 673a74613..74bfb5ade 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 673a746134d7297ba994a1bfa66f3e8848c1807c +Subproject commit 74bfb5adeb92cdb2a97b9df55e2245d411f53545 From ab1f167d9efc5deec24c6d3147c31169e200b9be Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 15 Jan 2019 15:11:48 +0800 Subject: [PATCH 013/112] update lib --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index 74bfb5ade..f18fdbf97 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 74bfb5adeb92cdb2a97b9df55e2245d411f53545 +Subproject commit f18fdbf97b72bb6439ad1cff4e4564229c05952f From e8dcec8cfaf5360d7d9835143cf260a879925ce5 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Wed, 16 Jan 2019 14:41:05 +0800 Subject: [PATCH 014/112] frontend:fix ingress route bug --- src/frontend/src/app/admin/admin-routing.module.ts | 2 ++ .../ingress/list-ingress/list-ingress.component.ts | 4 ++-- .../src/app/admin/ingresstpl/ingresstpl.component.ts | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 45a5616a4..84838dcc1 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -149,6 +149,8 @@ const routes: Routes = [ {path: 'ingress/trash', component: TrashIngressComponent}, {path: 'ingress/tpl', component: IngressTplComponent}, {path: 'ingress/tpl/trash', component: TrashIngressTplComponent}, + {path: 'ingress/relate-tpl/:gid', component: IngressTplComponent}, + {path: 'ingress/app/:aid', component: AppComponent}, {path: 'kubernetes/deployment', component: KubeDeploymentComponent}, {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent}, {path: 'kubernetes/namespace', component: KubeNamespaceComponent}, diff --git a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts index 3773f1816..7eb33799b 100644 --- a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts @@ -61,11 +61,11 @@ export class ListIngressComponent implements OnInit { switch (gate) { case 'tpl': this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/ingress/relate-tpl/[0-9]*', '[' + ingress.name + ']模板列表'); - linkUrl = ['admin', 'service', 'relate-tpl', ingress.id]; + linkUrl = ['admin', 'ingress', 'relate-tpl', ingress.id]; break; case 'app': this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/ingress/app/[0-9]*', '[' + ingress.app.name + ']项目详情'); - linkUrl = ['admin', 'service', 'app', ingress.app.id]; + linkUrl = ['admin', 'ingress', 'app', ingress.app.id]; break; default: break; diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index 5fb369314..0524a640a 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -26,7 +26,7 @@ export class IngressTplComponent implements OnInit, OnDestroy { pageState: PageState = new PageState({pageSize: 10}); ingressTpls: IngressTpl[]; - serviceId: string; + ingressId: string; componentName = 'Ingress 模板'; subscription: Subscription; @@ -60,9 +60,9 @@ export class IngressTplComponent implements OnInit, OnDestroy { ngOnInit() { this.route.params.subscribe(params => { - this.serviceId = params['sid']; - if (typeof(this.serviceId) === 'undefined') { - this.serviceId = ''; + this.ingressId = params['gid']; + if (typeof(this.ingressId) === 'undefined') { + this.ingressId = ''; } }); } @@ -79,7 +79,7 @@ export class IngressTplComponent implements OnInit, OnDestroy { PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; - this.ingressTplService.listPage(this.pageState, 0, this.serviceId) + this.ingressTplService.listPage(this.pageState, 0, this.ingressId) .subscribe( response => { const data = response.data; From 64f3b2ef40582e7a1a6751445fab9f8490dac362 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Wed, 16 Jan 2019 15:00:33 +0800 Subject: [PATCH 015/112] frontend:fix service route bug --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index f18fdbf97..33779a137 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit f18fdbf97b72bb6439ad1cff4e4564229c05952f +Subproject commit 33779a137e2be48d202f627fcd9898bb1f544a41 From 27eeac17d61ca5fe031f5b4863ea4f59f5214fe2 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Wed, 16 Jan 2019 18:14:03 +0800 Subject: [PATCH 016/112] frontend:fix ingress remove bug in trash --- .../trash-ingresstpl/trash-ingresstpl.component.html | 4 ++-- .../trash-ingresstpl/trash-ingresstpl.component.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html index 9fa1a9721..2923b2a4c 100644 --- a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html +++ b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html @@ -32,8 +32,8 @@

已删除 Ingress 模版列表

- - + + {{ingressTpl.id}} {{ingressTpl.name}} diff --git a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts index fe14d1e3b..854d554fd 100644 --- a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts @@ -82,9 +82,9 @@ export class TrashIngressTplComponent implements OnInit, OnDestroy { ); } - deleteServiceTpl(ingressTpl: IngressTpl) { + deleteTemplate(ingressTpl: IngressTpl) { const deletionMessage = new ConfirmationMessage( - '删除服务确认', + '删除 Ingress 模板确认', '你确认永久删除 Ingress 模版 ' + ingressTpl.name + ' ？删除后将不可恢复！', ingressTpl.id, ConfirmationTargets.TRASH_INGRESS_TPL, @@ -97,7 +97,7 @@ export class TrashIngressTplComponent implements OnInit, OnDestroy { this.aceEditorService.announceMessage(AceEditorMsg.Instance(ingressTpl.template, false, '详情')); } - recoverServiceTpl(ingressTpl: IngressTpl) { + recoverTemplate(ingressTpl: IngressTpl) { ingressTpl.deleted = false; this.ingressTplService.update(ingressTpl, 0) .subscribe( From facfa34e31e0496d324413c08f147077e47eb84c Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 17 Jan 2019 16:48:44 +0800 Subject: [PATCH 017/112] frontend: backend cronjob i18n --- .../create-edit-cronjob/create-edit-cronjob.component.html | 2 +- src/frontend/src/app/admin/cronjob/cronjob.component.html | 2 +- src/frontend/src/assets/i18n/zh-Hans.json | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html index ca7fda371..e1fba64b4 100644 --- a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html @@ -31,7 +31,7 @@

{{title}}

- +
diff --git a/src/frontend/src/app/admin/cronjob/cronjob.component.html b/src/frontend/src/app/admin/cronjob/cronjob.component.html index 401605fff..cbea1568d 100644 --- a/src/frontend/src/app/admin/cronjob/cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/cronjob.component.html @@ -7,7 +7,7 @@

{{'CRONJOB.LIST' | translate}}

diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 090c54efa..040c06b21 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -121,6 +121,9 @@ "RUN_CYCLE_MESSAGE": "计划任务的定时周期,cron 表达式", "TIMER": "次数" }, + "CRONJOB_ADMIN": { + "CRONJOB_CREATE": "创建计划任务" + }, "DAEMONSET": { "CREATE": "创建守护进程集", "CREATE_EDIT": { From 2c020aa1bd3069a5eeb981026249aa258e1801e4 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 17 Jan 2019 16:56:43 +0800 Subject: [PATCH 018/112] frontend: backend cronjobtpl i18n --- .../create-edit-cronjobtpl.component.html | 4 ++-- .../list-cronjobtpl/list-cronjobtpl.component.html | 2 +- src/frontend/src/assets/i18n/zh-Hans.json | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html index db0a83afc..cee746588 100644 --- a/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html @@ -6,7 +6,7 @@

{{title}}
- +
@@ -28,7 +28,7 @@

{{title}}

- +
diff --git a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.html index 6fe1d13a4..6d0e4e0ac 100644 --- a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.html @@ -1,13 +1,13 @@
-

守护进程集模版列表

+

{{'DAEMONSET_ADMIN.TPL.DAEMONSET_TPL_LIST' | translate}}

diff --git a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html index 395697a69..37d6affb2 100644 --- a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html @@ -1,7 +1,7 @@
-

已删除守护进程集模版列表

+

{{'DAEMONSET_ADMIN.TPL.TRASH.DAEMONSET_TPL_DELETE_LIST' | translate}}

diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index e7b2b57c3..40ff62490 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -149,6 +149,17 @@ "DAEMONSET_LIST": "守护进程列表", "TRASH": { "DAEMONSET_DELETE_LIST": "已删除守护进程集列表" + }, + "TPL": { + "DAEMONSET_TPL_LIST": "守护进程集模版列表", + "DAEMONSET_TPL_CREATE": "创建守护进程集模版", + "CREATE": { + "CONFIGMAP": "守护进程集", + "TEMPLATE": "模板" + }, + "TRASH": { + "DAEMONSET_TPL_DELETE_LIST": "已删除守护进程集模版列表" + } } }, "DEPLOYMENT": { From 3c328e648d12200cb3c0d28cf0e5564961645470 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 17 Jan 2019 17:24:56 +0800 Subject: [PATCH 020/112] frontend: fix i18n json file cache --- src/frontend/src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/app/app.module.ts b/src/frontend/src/app/app.module.ts index 324c07d27..0672c6445 100644 --- a/src/frontend/src/app/app.module.ts +++ b/src/frontend/src/app/app.module.ts @@ -17,7 +17,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; export function HttpLoaderFactory(httpClient: HttpClient) { - return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json'); + return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json?hash=' + +new Date()); } export function initUser(authService: AuthService, injector: Injector) { From 1e530ba43d57d9ad7e2b861545bbc60ae46b8d59 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Fri, 18 Jan 2019 14:40:48 +0800 Subject: [PATCH 021/112] frontend: change json query --- src/frontend/src/app/app.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/app.module.ts b/src/frontend/src/app/app.module.ts index 0672c6445..6734bdbad 100644 --- a/src/frontend/src/app/app.module.ts +++ b/src/frontend/src/app/app.module.ts @@ -15,9 +15,9 @@ import { AuthInterceptor } from './shared/interceptor/auth-interceptor'; // translate import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; - +const pageageJson = require('../../package.json'); export function HttpLoaderFactory(httpClient: HttpClient) { - return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json?hash=' + +new Date()); + return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json?v=' + pageageJson.version); } export function initUser(authService: AuthService, injector: Injector) { From a57b9c9c887384bac4ae74db28bf3c6c5ad2cda1 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Fri, 18 Jan 2019 14:43:00 +0800 Subject: [PATCH 022/112] frontend: change variable name --- src/frontend/src/app/app.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/app.module.ts b/src/frontend/src/app/app.module.ts index 6734bdbad..cbc3a10ba 100644 --- a/src/frontend/src/app/app.module.ts +++ b/src/frontend/src/app/app.module.ts @@ -15,9 +15,9 @@ import { AuthInterceptor } from './shared/interceptor/auth-interceptor'; // translate import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -const pageageJson = require('../../package.json'); +const packageJson = require('../../package.json'); export function HttpLoaderFactory(httpClient: HttpClient) { - return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json?v=' + pageageJson.version); + return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json?v=' + packageJson.version); } export function initUser(authService: AuthService, injector: Injector) { From cbeb91fb2a4f934b2fae78d059611f7e8570b26a Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 18 Jan 2019 18:59:53 +0800 Subject: [PATCH 023/112] Upgrade Deployment API can add env --- src/backend/controllers/openapi/deployment.go | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/backend/controllers/openapi/deployment.go b/src/backend/controllers/openapi/deployment.go index 44632a3e5..e55a0b960 100644 --- a/src/backend/controllers/openapi/deployment.go +++ b/src/backend/controllers/openapi/deployment.go @@ -76,6 +76,10 @@ type UpgradeDeploymentParam struct { // Required: false Images string `json:"images"` imageMap map[string]string + // 该字段为扁平化为字符串的 key-value 字典，填写格式为 环境变量1=值1,环境变量2=值2 (即:多个环境变量之间使用英文半角的逗号分隔） + // Required: false + Environments string `json:"environments"` + envMap map[string]string } // swagger:parameters ScaleDeploymentParam @@ -310,11 +314,12 @@ func (c *OpenAPIController) RestartDeployment() { // @router /upgrade_deployment [get] func (c *OpenAPIController) UpgradeDeployment() { param := UpgradeDeploymentParam{ - Deployment: c.GetString("deployment"), - Namespace: c.GetString("namespace"), - Cluster: c.GetString("cluster"), - Description: c.GetString("description"), - Images: c.GetString("images"), + Deployment: c.GetString("deployment"), + Namespace: c.GetString("namespace"), + Cluster: c.GetString("cluster"), + Description: c.GetString("description"), + Images: c.GetString("images"), + Environments: c.GetString("environments"), } if !c.CheckoutRoutePermission(UpgradeDeploymentAction) || !c.CheckDeploymentPermission(param.Deployment) || !c.CheckNamespacePermission(param.Namespace) { return @@ -362,8 +367,19 @@ func (c *OpenAPIController) UpgradeDeployment() { param.imageMap[arr[0]] = arr[1] } } - if len(param.imageMap) == 0 { - c.AddErrorAndResponse(fmt.Sprintf("Invalid images parameter: %s", param.Images), http.StatusBadRequest) + // 拼凑环境变量 + param.envMap = make(map[string]string) + envArr := strings.Split(param.Environments, ",") + param.envMap = make(map[string]string) + for _, env := range envArr { + arr := strings.Split(env, "=") + if len(arr) == 2 && arr[1] != "" { + param.envMap[arr[0]] = arr[1] + } + } + + if len(param.imageMap) == 0 && len(param.envMap) == 0 { + c.AddErrorAndResponse(fmt.Sprintf("Invalid images/environments parameter: %s %s", param.Images, param.Environments), http.StatusBadRequest) return } @@ -398,6 +414,13 @@ func (c *OpenAPIController) UpgradeDeployment() { c.AddError(fmt.Sprintf("Deployment template don't have container: %s", strings.Join(keys, ","))) continue } + for k, v := range deployInfo.DeploymentObject.Spec.Template.Spec.Containers { + for i, e := range v.Env { + if param.envMap[e.Name] != "" { + deployInfo.DeploymentObject.Spec.Template.Spec.Containers[k].Env[i].Value = param.envMap[e.Name] + } + } + } deployInfoMap[tmplId] = append(deployInfoMap[tmplId], deployInfo) } From 43c528d32dba4f3086ca555e47c5a27836139ce3 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Mon, 21 Jan 2019 11:41:46 +0800 Subject: [PATCH 024/112] backend:Prevent users from changing default system variables --- src/backend/controllers/openapi/deployment.go | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/backend/controllers/openapi/deployment.go b/src/backend/controllers/openapi/deployment.go index e55a0b960..fd917088c 100644 --- a/src/backend/controllers/openapi/deployment.go +++ b/src/backend/controllers/openapi/deployment.go @@ -300,10 +300,11 @@ func (c *OpenAPIController) RestartDeployment() { // // 用于 CI/CD 中的集成升级部署 // -// 该接口只能使用 app 级别的 apikey，这样做的目的主要是防止 apikey 的滥用 -// 目前用户可以选择两种用法，第一种是默认的，会根据请求的 images 对特定部署线上模板进行修改并创建新模板，然后使用新模板进行升级； -// 第二种是通过指定 publish=false 来关掉直接上线，这种条件下会根据 images 字段创建新的模板，并返回新模板id，用户可以选择去平台上手动上线或者通过本接口指定template_id参数上线。 -// cluster 字段可以选择单个机房也可以选择多个机房，对于创建模板并上线的用法，会根据指定的机房之前的模板进行分类（如果机房a和机房b使用同一个模板，那么调用以后仍然共用一个新模板） +// 该接口只能使用 app 级别的 apikey，这样做的目的主要是防止 apikey 的滥用。 +// 目前用户可以选择两种用法，第一种是默认的，会根据请求的 images 和 environments 对特定部署线上模板进行修改并创建新模板，然后使用新模板进行升级； +// 需要说明的是，environments 列表会对 deployment 内所有容器中包含指定环境变量 key 的环境变量进行更新，如不包含，则不更新。 +// 第二种是通过指定 publish=false 来关掉直接上线，这种条件下会根据 images 和 environments 字段创建新的模板，并返回新模板id，用户可以选择去平台上手动上线或者通过本接口指定template_id参数上线。 +// cluster 字段可以选择单个机房也可以选择多个机房，对于创建模板并上线的用法，会根据指定的机房之前的模板进行分类（如果机房 a 和机房 b 使用同一个模板，那么调用以后仍然共用一个新模板） // 而对于指定 template_id 来上线的形式，则会忽略掉所有检查，直接使用特定模板上线到所有机房。 // // Responses: @@ -390,6 +391,16 @@ func (c *OpenAPIController) UpgradeDeployment() { c.AddError(fmt.Sprintf("Failed to get online deployment info on %s", cluster)) continue } + + // 率先把强制指定的环境变量，如和系统环境变量冲突，后面会覆盖 + for k, v := range deployInfo.DeploymentObject.Spec.Template.Spec.Containers { + for i, e := range v.Env { + if param.envMap[e.Name] != "" { + deployInfo.DeploymentObject.Spec.Template.Spec.Containers[k].Env[i].Value = param.envMap[e.Name] + } + } + } + common.DeploymentPreDeploy(deployInfo.DeploymentObject, deployInfo.Deployment, deployInfo.Cluster, deployInfo.Namespace) tmplId := deployInfo.DeploymentTemplete.Id deployInfo.DeploymentTemplete.Id = 0 @@ -414,13 +425,6 @@ func (c *OpenAPIController) UpgradeDeployment() { c.AddError(fmt.Sprintf("Deployment template don't have container: %s", strings.Join(keys, ","))) continue } - for k, v := range deployInfo.DeploymentObject.Spec.Template.Spec.Containers { - for i, e := range v.Env { - if param.envMap[e.Name] != "" { - deployInfo.DeploymentObject.Spec.Template.Spec.Containers[k].Env[i].Value = param.envMap[e.Name] - } - } - } deployInfoMap[tmplId] = append(deployInfoMap[tmplId], deployInfo) } From 2d7a1b220d20352868f7b51c35698b43e7a35261 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Mon, 21 Jan 2019 17:01:13 +0800 Subject: [PATCH 025/112] frontend:fix error route in jump url --- .../portal/cronjob/list-pod/list-pod.component.ts | 8 ++++---- .../portal/daemonset/list-pod/list-pod.component.ts | 8 ++++---- .../portal/deployment/list-pod/list-pod.component.ts | 8 ++++---- .../app/portal/pod-logging/pod-logging.component.ts | 12 ++++++------ .../portal/pod-terminal/pod-terminal.component.ts | 12 ++++++------ .../statefulset/list-pod/list-pod.component.ts | 8 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts index cde82c6c4..3954c542a 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts @@ -113,15 +113,15 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app - /${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app` + + `/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app - /${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + + `/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts index 3e3e63b1b..3d75253e1 100644 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts @@ -155,8 +155,8 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app - /${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app` + + `/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } @@ -164,8 +164,8 @@ export class ListPodComponent implements OnInit, OnDestroy { podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app - /${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + + `/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts index b8e451923..3a6c45340 100644 --- a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts @@ -160,8 +160,8 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment - /${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment` + + `/${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } @@ -185,8 +185,8 @@ export class ListPodComponent implements OnInit, OnDestroy { podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment} - /pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment}` + + `/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } diff --git a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts index a3f77fb02..8ca0958b1 100644 --- a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts +++ b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts @@ -71,8 +71,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { if (this.pods && this.pods.length > 0) { const pod = this.getPodByName(podName); if (!pod) { - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/ - ${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/` + + `${this.resourceType}/${this.resourceName}/pod/${this.pods[0].name}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -123,8 +123,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { } containerChange() { - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/ - ${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/` + + `${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); this.refreshLog(); } @@ -157,8 +157,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy { this.containers = this.selectedPod.containerStatus; if (this.containers && this.containers.length > 0) { this.selectedContainer = this.containers[0].name; - const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/ - ${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; + const url = `portal/logging/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/` + + `${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } } diff --git a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts index bf87a3bde..8bd26bee4 100644 --- a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts +++ b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts @@ -55,8 +55,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { if (this.pods && this.pods.length > 0) { const pod = this.getPodByName(podName); if (!pod) { - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType} - /${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}` + + `/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -83,8 +83,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { } containerChange() { - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType} - /${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}` + + `/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -104,8 +104,8 @@ export class PodTerminalComponent implements OnInit, OnDestroy { podChange() { this.containers = this.selectedPod.containerStatus; this.selectedContainer = this.containers[0].name; - const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName} - /pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}` + + `/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts index 302a64a92..f1715daeb 100644 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts @@ -158,16 +158,16 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset - /${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset` + + `/${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app - /${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + + `/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } } From 61219246728418ad99fa54167d71b96c179cb4d1 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 24 Jan 2019 10:48:08 +0800 Subject: [PATCH 026/112] frontend: update angular/cli --- src/frontend/package-lock.json | 4667 ++++++++++++++++++++++---------- src/frontend/package.json | 5 +- src/frontend/src/polyfills.ts | 2 +- src/frontend/tsconfig.json | 1 + 4 files changed, 3171 insertions(+), 1504 deletions(-) diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 47a8dffff..b45401457 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -5,166 +5,568 @@ "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.6.8", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.6.8.tgz", - "integrity": "sha1-l3rMYFq6RdIblcpwTMmUkuFCmd0=", + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.12.3.tgz", + "integrity": "sha1-k2cdbPR6PXUQR1Ok5OrEzIGk050=", "dev": true, "requires": { - "@angular-devkit/core": "0.6.8", - "rxjs": "6.2.1" + "@angular-devkit/core": "7.2.3", + "rxjs": "6.3.3" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + } } }, "@angular-devkit/build-angular": { - "version": "0.6.8", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/build-angular/download/@angular-devkit/build-angular-0.6.8.tgz", - "integrity": "sha1-6hCFCflw78nNkIekeJTAFk3S0MA=", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.6.8", - "@angular-devkit/build-optimizer": "0.6.8", - "@angular-devkit/core": "0.6.8", - "@ngtools/webpack": "6.0.8", - "ajv": "6.4.0", - "autoprefixer": "8.6.4", - "cache-loader": "1.2.2", - "chalk": "2.2.2", + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/build-angular/download/@angular-devkit/build-angular-0.12.3.tgz", + "integrity": "sha1-y2BFVlRRCFF78UGChw5T0ps44hg=", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.12.3", + "@angular-devkit/build-optimizer": "0.12.3", + "@angular-devkit/build-webpack": "0.12.3", + "@angular-devkit/core": "7.2.3", + "@ngtools/webpack": "7.2.3", + "ajv": "6.6.2", + "autoprefixer": "9.4.3", "circular-dependency-plugin": "5.0.2", - "clean-css": "4.1.11", - "copy-webpack-plugin": "4.5.2", - "file-loader": "1.1.11", - "glob": "7.1.2", - "html-webpack-plugin": "3.2.0", + "clean-css": "4.2.1", + "copy-webpack-plugin": "4.6.0", + "file-loader": "2.0.0", + "glob": "7.1.3", "istanbul": "0.4.5", "istanbul-instrumenter-loader": "3.0.1", "karma-source-map-support": "1.3.0", - "less": "3.0.4", + "less": "3.9.0", "less-loader": "4.1.0", - "license-webpack-plugin": "1.3.1", - "lodash": "4.17.10", - "memory-fs": "0.4.1", - "mini-css-extract-plugin": "0.4.1", + "license-webpack-plugin": "2.0.4", + "loader-utils": "1.1.0", + "mini-css-extract-plugin": "0.4.4", "minimatch": "3.0.4", - "node-sass": "4.9.1", - "opn": "5.3.0", + "node-sass": "4.10.0", + "opn": "5.4.0", "parse5": "4.0.0", - "portfinder": "1.0.13", - "postcss": "6.0.23", - "postcss-import": "11.1.0", - "postcss-loader": "2.1.5", - "postcss-url": "7.3.2", + "portfinder": "1.0.17", + "postcss": "7.0.13", + "postcss-import": "12.0.1", + "postcss-loader": "3.0.0", "raw-loader": "0.5.1", - "resolve": "1.8.1", - "rxjs": "6.2.1", - "sass-loader": "7.0.3", - "silent-error": "1.1.0", - "source-map-support": "0.5.6", - "stats-webpack-plugin": "0.6.2", - "style-loader": "0.21.0", + "rxjs": "6.3.3", + "sass-loader": "7.1.0", + "semver": "5.5.1", + "source-map-loader": "0.2.4", + "source-map-support": "0.5.9", + "speed-measure-webpack-plugin": "1.2.5", + "stats-webpack-plugin": "0.7.0", + "style-loader": "0.23.1", "stylus": "0.54.5", "stylus-loader": "3.0.2", + "terser-webpack-plugin": "1.2.1", "tree-kill": "1.2.0", - "uglifyjs-webpack-plugin": "1.2.7", - "url-loader": "1.0.1", - "webpack": "4.8.3", - "webpack-dev-middleware": "3.1.3", - "webpack-dev-server": "3.1.4", - "webpack-merge": "4.1.3", - "webpack-sources": "1.1.0", - "webpack-subresource-integrity": "1.1.0-rc.4" + "webpack": "4.28.4", + "webpack-dev-middleware": "3.4.0", + "webpack-dev-server": "3.1.14", + "webpack-merge": "4.1.4", + "webpack-sources": "1.3.0", + "webpack-subresource-integrity": "1.1.0-rc.6" }, "dependencies": { + "@webassemblyjs/ast": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.7.11.tgz", + "integrity": "sha1-uYhYLK+7Kwlei1VlJvMMkNBXys4=", + "dev": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.7.11.tgz", + "integrity": "sha1-pp8K9lAuuaPARVVbGmEp09Py4xM=", + "dev": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.7.11.tgz", + "integrity": "sha1-MSLUjcxslFbtmC3r4WyPNxAd85s=", + "dev": true + }, + "@webassemblyjs/helper-code-frame": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.7.11.tgz", + "integrity": "sha1-z48QbnRmYqDaKb3vY1/NPRJINks=", + "dev": true, + "requires": { + "@webassemblyjs/wast-printer": "1.7.11" + } + }, + "@webassemblyjs/helper-fsm": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.7.11.tgz", + "integrity": "sha1-3ziIKmJAgNA/dQP5Pj8XrFrAEYE=", + "dev": true + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.7.11.tgz", + "integrity": "sha1-3ZoegX8cLrEFtM8QEwk8ufPJywY=", + "dev": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.7.11.tgz", + "integrity": "sha1-nJrEHs+fvP/8lvbSZ14t4zgR5oo=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11" + } + }, + "@webassemblyjs/leb128": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.7.11.tgz", + "integrity": "sha1-1yZ6HunEWU/T9+NymIGOxlaH22M=", + "dev": true, + "requires": { + "@xtuc/long": "4.2.1" + } + }, + "@webassemblyjs/wasm-edit": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.7.11.tgz", + "integrity": "sha1-jHTKR01PlR0B266b1wgU7iKoIAU=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/helper-wasm-section": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-opt": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "@webassemblyjs/wast-printer": "1.7.11" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.7.11.tgz", + "integrity": "sha1-m7upQvIjdWhqb7dZr816ycRdoag=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.7.11.tgz", + "integrity": "sha1-szHo5874+OLwB9QsOjagWAp9bKc=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.7.11.tgz", + "integrity": "sha1-bj0g+mo1GfawhO+Tka1YIR77Cho=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" + } + }, + "@webassemblyjs/wast-parser": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.7.11.tgz", + "integrity": "sha1-Jb0RdWLKjAAnIP+BFu+QctnKhpw=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/floating-point-hex-parser": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-code-frame": "1.7.11", + "@webassemblyjs/helper-fsm": "1.7.11", + "@xtuc/long": "4.2.1" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.7.11.tgz", + "integrity": "sha1-xCRbbeJCy1CizJUBdP2/ZceNeBM=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11", + "@xtuc/long": "4.2.1" + } + }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "chrome-trace-event": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.0.tgz", + "integrity": "sha1-Rakb0sIMlBHwljtarrmhuV4JzEg=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, + "eslint-scope": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.0.tgz", + "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=", + "dev": true, + "requires": { + "esrecurse": "4.2.1", + "estraverse": "4.2.0" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "http://registry.npm.taobao.org/estraverse/download/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "glob": { + "version": "7.1.3", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "opn": { + "version": "5.4.0", + "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.4.0.tgz", + "integrity": "sha1-y1Reeqt4VivrEao7+rxwQuF2EDU=", + "dev": true, + "requires": { + "is-wsl": "1.1.0" + } + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, + "semver": { + "version": "5.5.1", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.1.tgz", + "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "source-map-support": { + "version": "0.5.9", + "resolved": "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.9.tgz", + "integrity": "sha1-QbyVOyU0Jn6i1gW8z6e/oxEc7V8=", + "dev": true, + "requires": { + "buffer-from": "1.1.0", + "source-map": "0.6.1" + } + }, + "tapable": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz", + "integrity": "sha1-TSl5I8WnKkI2DeKrUtrfquwAAY4=", + "dev": true + }, + "webpack": { + "version": "4.28.4", + "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.28.4.tgz", + "integrity": "sha1-HdrmyJiH1++3Uq3ww80yubB+rNA=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/wasm-edit": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "acorn": "5.7.1", + "acorn-dynamic-import": "3.0.0", + "ajv": "6.6.2", + "ajv-keywords": "3.2.0", + "chrome-trace-event": "1.0.0", + "enhanced-resolve": "4.1.0", + "eslint-scope": "4.0.0", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.3.0", + "loader-utils": "1.1.0", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "neo-async": "2.5.1", + "node-libs-browser": "2.1.0", + "schema-utils": "0.4.5", + "tapable": "1.1.1", + "terser-webpack-plugin": "1.2.1", + "watchpack": "1.6.0", + "webpack-sources": "1.3.0" + } + }, + "webpack-sources": { + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz", + "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.6.1" } } } }, "@angular-devkit/build-optimizer": { - "version": "0.6.8", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/build-optimizer/download/@angular-devkit/build-optimizer-0.6.8.tgz", - "integrity": "sha1-nhik9EcpDTqOMt8REKrIuYuA3sI=", + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/build-optimizer/download/@angular-devkit/build-optimizer-0.12.3.tgz", + "integrity": "sha1-uEB6uwNgOueSrbYdlk6kMyBNz88=", "dev": true, "requires": { "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.9.2", - "webpack-sources": "1.1.0" + "source-map": "0.5.6", + "typescript": "3.2.4", + "webpack-sources": "1.2.0" }, "dependencies": { + "source-map": { + "version": "0.5.6", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "dev": true + }, "typescript": { - "version": "2.9.2", - "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-2.9.2.tgz", - "integrity": "sha1-HL9h0F1rliaSROtqO85L2RTg8Aw=", + "version": "3.2.4", + "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-3.2.4.tgz", + "integrity": "sha1-xYXLlSkSJj2RW0YnJs4kS6UQ7z0=", "dev": true + }, + "webpack-sources": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.2.0.tgz", + "integrity": "sha1-GBgeDQE/zglvr2+ObUHu///c6sI=", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + } + } + } + } + }, + "@angular-devkit/build-webpack": { + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/build-webpack/download/@angular-devkit/build-webpack-0.12.3.tgz", + "integrity": "sha1-gkuq/VeiKTVI43q4nlHpMYs7RqU=", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.12.3", + "@angular-devkit/core": "7.2.3", + "rxjs": "6.3.3" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } } } }, "@angular-devkit/core": { - "version": "0.6.8", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-0.6.8.tgz", - "integrity": "sha1-OwnZe9JYjwCR3xGSH37XckMYBqo=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", + "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.6.2", "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" }, "dependencies": { "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" } + }, + "source-map": { + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", + "dev": true } } }, "@angular-devkit/schematics": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/schematics/download/@angular-devkit/schematics-0.7.5.tgz", - "integrity": "sha1-9GsSHynLQK1glShdJ6UVEUpWxdY=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/schematics/download/@angular-devkit/schematics-7.2.3.tgz", + "integrity": "sha1-6FJp/ETYf9eTFIdQhOzezcQgILU=", "dev": true, "requires": { - "@angular-devkit/core": "0.7.5", - "rxjs": "6.2.1" + "@angular-devkit/core": "7.2.3", + "rxjs": "6.3.3" }, "dependencies": { "@angular-devkit/core": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-0.7.5.tgz", - "integrity": "sha1-SfeFTMrfPd2o0OpDWVQ6HL3GhU0=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", + "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.6.2", "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" } }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", + "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "dev": true, + "requires": { + "punycode": "2.1.1" } } } @@ -178,76 +580,97 @@ } }, "@angular/cli": { - "version": "6.1.5", - "resolved": "http://registry.npm.taobao.org/@angular/cli/download/@angular/cli-6.1.5.tgz", - "integrity": "sha1-MSwGJjEoX/Bv0H7N6K/iLN71oOE=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular/cli/download/@angular/cli-7.2.3.tgz", + "integrity": "sha1-Es0LsVI4q/0oMDn/wkr3yXynMmg=", "dev": true, "requires": { - "@angular-devkit/architect": "0.7.5", - "@angular-devkit/core": "0.7.5", - "@angular-devkit/schematics": "0.7.5", - "@schematics/angular": "0.7.5", - "@schematics/update": "0.7.5", + "@angular-devkit/architect": "0.12.3", + "@angular-devkit/core": "7.2.3", + "@angular-devkit/schematics": "7.2.3", + "@schematics/angular": "7.2.3", + "@schematics/update": "0.12.3", + "inquirer": "6.2.1", "opn": "5.3.0", - "rxjs": "6.2.1", "semver": "5.5.1", - "symbol-observable": "1.2.0", - "yargs-parser": "10.1.0" + "symbol-observable": "1.2.0" }, "dependencies": { "@angular-devkit/architect": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.7.5.tgz", - "integrity": "sha1-4thWtnH+iwYV2x78FEp/dbVftuE=", + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.12.3.tgz", + "integrity": "sha1-k2cdbPR6PXUQR1Ok5OrEzIGk050=", "dev": true, "requires": { - "@angular-devkit/core": "0.7.5", - "rxjs": "6.2.1" + "@angular-devkit/core": "7.2.3", + "rxjs": "6.3.3" } }, "@angular-devkit/core": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-0.7.5.tgz", - "integrity": "sha1-SfeFTMrfPd2o0OpDWVQ6HL3GhU0=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", + "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.6.2", "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" } }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, - "camelcase": { - "version": "4.1.0", - "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, "semver": { "version": "5.5.1", "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.1.tgz", "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", "dev": true }, - "yargs-parser": { - "version": "10.1.0", - "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-10.1.0.tgz", - "integrity": "sha1-cgImW4n36eny5XZeD+c1qQXtuqg=", + "source-map": { + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", + "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", "dev": true, "requires": { - "camelcase": "4.1.0" + "punycode": "2.1.1" } } } @@ -485,14 +908,43 @@ "integrity": "sha1-VxbAEy/Iljn9hcOWf9qo41L/KBw=" }, "@ngtools/webpack": { - "version": "6.0.8", - "resolved": "http://registry.npm.taobao.org/@ngtools/webpack/download/@ngtools/webpack-6.0.8.tgz", - "integrity": "sha1-oFvOUmrunaYrsjCpX7qD/umdC8o=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@ngtools/webpack/download/@ngtools/webpack-7.2.3.tgz", + "integrity": "sha1-EdacMYP/V277qJpRCBf9d/jofak=", "dev": true, "requires": { - "@angular-devkit/core": "0.6.8", + "@angular-devkit/core": "7.2.3", + "enhanced-resolve": "4.1.0", + "rxjs": "6.3.3", "tree-kill": "1.2.0", - "webpack-sources": "1.1.0" + "webpack-sources": "1.2.0" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "webpack-sources": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.2.0.tgz", + "integrity": "sha1-GBgeDQE/zglvr2+ObUHu///c6sI=", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.6.1" + } + } } }, "@ngx-translate/core": { @@ -512,78 +964,145 @@ } }, "@schematics/angular": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@schematics/angular/download/@schematics/angular-0.7.5.tgz", - "integrity": "sha1-zLXOWHFhskBCGV4QC+VWrhmzt/Y=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@schematics/angular/download/@schematics/angular-7.2.3.tgz", + "integrity": "sha1-4IuvZC+tT/eyeickN5xFg6WjgbU=", "dev": true, "requires": { - "@angular-devkit/core": "0.7.5", - "@angular-devkit/schematics": "0.7.5", - "typescript": "2.7.2" + "@angular-devkit/core": "7.2.3", + "@angular-devkit/schematics": "7.2.3", + "typescript": "3.2.2" }, "dependencies": { "@angular-devkit/core": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-0.7.5.tgz", - "integrity": "sha1-SfeFTMrfPd2o0OpDWVQ6HL3GhU0=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", + "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.6.2", "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" } }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", + "dev": true + }, + "typescript": { + "version": "3.2.2", + "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-3.2.2.tgz", + "integrity": "sha1-/oEBxGqhI/g1NSPr3PVzDCrkk+U=", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", + "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "dev": true, + "requires": { + "punycode": "2.1.1" } } } }, "@schematics/update": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@schematics/update/download/@schematics/update-0.7.5.tgz", - "integrity": "sha1-ycxoxEZOpOKaLzpyVBct92jIasQ=", + "version": "0.12.3", + "resolved": "http://registry.npm.taobao.org/@schematics/update/download/@schematics/update-0.12.3.tgz", + "integrity": "sha1-u3IIQ1fIMz/JySyk8M7tLk7qGgU=", "dev": true, "requires": { - "@angular-devkit/core": "0.7.5", - "@angular-devkit/schematics": "0.7.5", - "npm-registry-client": "8.6.0", - "rxjs": "6.2.1", + "@angular-devkit/core": "7.2.3", + "@angular-devkit/schematics": "7.2.3", + "@yarnpkg/lockfile": "1.1.0", + "ini": "1.3.5", + "pacote": "9.1.1", + "rxjs": "6.3.3", "semver": "5.5.1", "semver-intersect": "1.4.0" }, "dependencies": { "@angular-devkit/core": { - "version": "0.7.5", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-0.7.5.tgz", - "integrity": "sha1-SfeFTMrfPd2o0OpDWVQ6HL3GhU0=", + "version": "7.2.3", + "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", + "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", "dev": true, "requires": { - "ajv": "6.4.0", + "ajv": "6.6.2", "chokidar": "2.0.4", - "rxjs": "6.2.1", - "source-map": "0.5.7" + "fast-json-stable-stringify": "2.0.0", + "rxjs": "6.3.3", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, - "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "rxjs": { + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "tslib": "1.9.3" } }, "semver": { @@ -591,6 +1110,21 @@ "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.1.tgz", "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", "dev": true + }, + "source-map": { + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", + "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "dev": true, + "requires": { + "punycode": "2.1.1" + } } } }, @@ -689,6 +1223,31 @@ "integrity": "sha1-LePXGIGbwgFldUxKWa+36YM/Zwc=", "dev": true }, + "@types/source-list-map": { + "version": "0.1.2", + "resolved": "http://registry.npm.taobao.org/@types/source-list-map/download/@types/source-list-map-0.1.2.tgz", + "integrity": "sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk=", + "dev": true + }, + "@types/webpack-sources": { + "version": "0.1.5", + "resolved": "http://registry.npm.taobao.org/@types/webpack-sources/download/@types/webpack-sources-0.1.5.tgz", + "integrity": "sha1-vkfBD3g9PW7+FHH/fwQmEb1GSpI=", + "dev": true, + "requires": { + "@types/node": "8.9.5", + "@types/source-list-map": "0.1.2", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + } + } + }, "@webassemblyjs/ast": { "version": "1.4.3", "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.4.3.tgz", @@ -724,6 +1283,12 @@ "integrity": "sha1-9a7kw3anF8dCZNe6ytqYHn5E+q0=", "dev": true }, + "@webassemblyjs/helper-api-error": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.7.11.tgz", + "integrity": "sha1-x7a7gQX4QDlRGis5zklPGTgYoyo=", + "dev": true + }, "@webassemblyjs/helper-buffer": { "version": "1.4.3", "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.4.3.tgz", @@ -765,6 +1330,12 @@ "integrity": "sha1-Zakh20j7Q+ho8XsnSXhwvcriK3k=", "dev": true }, + "@webassemblyjs/helper-module-context": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-module-context/download/@webassemblyjs/helper-module-context-1.7.11.tgz", + "integrity": "sha1-2HTXIuUeYqwgJHaTXWScgC+g4gk=", + "dev": true + }, "@webassemblyjs/helper-wasm-bytecode": { "version": "1.4.3", "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.4.3.tgz", @@ -801,6 +1372,15 @@ } } }, + "@webassemblyjs/ieee754": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.7.11.tgz", + "integrity": "sha1-yVg562N1ejGICq7HtlEtQZGsZAs=", + "dev": true, + "requires": { + "@xtuc/ieee754": "1.2.0" + } + }, "@webassemblyjs/leb128": { "version": "1.4.3", "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.4.3.tgz", @@ -810,6 +1390,12 @@ "leb": "0.3.0" } }, + "@webassemblyjs/utf8": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.7.11.tgz", + "integrity": "sha1-Btchjqn9yUpnk6qSIIFg2z0m7oI=", + "dev": true + }, "@webassemblyjs/validation": { "version": "1.4.3", "resolved": "http://registry.npm.taobao.org/@webassemblyjs/validation/download/@webassemblyjs/validation-1.4.3.tgz", @@ -937,79 +1523,32 @@ "resolved": "http://r.cnpmjs.org/@webcomponents/custom-elements/download/@webcomponents/custom-elements-1.1.2.tgz", "integrity": "sha1-BB5MIN81JF9NFgtQ0ES4z/GSliw=" }, - "@webpack-contrib/schema-utils": { - "version": "1.0.0-beta.0", - "resolved": "http://registry.npm.taobao.org/@webpack-contrib/schema-utils/download/@webpack-contrib/schema-utils-1.0.0-beta.0.tgz", - "integrity": "sha1-v5Y4yUZNF3tIIJ6EIJ4jvuLrT2U=", + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz", + "integrity": "sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A=", + "dev": true + }, + "@xtuc/long": { + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.1.tgz", + "integrity": "sha1-XIXWYvdvodNFdXZsXc1mFavNMNg=", + "dev": true + }, + "@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/@yarnpkg/lockfile/download/@yarnpkg/lockfile-1.1.0.tgz", + "integrity": "sha1-53qX+9NFt22DJF7c0X05OxtB+zE=", + "dev": true + }, + "JSONStream": { + "version": "1.3.5", + "resolved": "http://registry.npm.taobao.org/JSONStream/download/JSONStream-1.3.5.tgz", + "integrity": "sha1-MgjB8I06TZkmGrZPkjArwV4RHKA=", "dev": true, "requires": { - "ajv": "6.5.2", - "ajv-keywords": "3.2.0", - "chalk": "2.4.1", - "strip-ansi": "4.0.0", - "text-table": "0.2.0", - "webpack-log": "1.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.5.2.tgz", - "integrity": "sha1-Z4SV+bgvfMpr4kjdkvWb/14fQ2A=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "chalk": { - "version": "2.4.1", - "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz", - "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } - } + "jsonparse": "1.3.1", + "through": "2.3.8" } }, "abbrev": { @@ -1088,6 +1627,15 @@ "semver": "5.0.1" } }, + "agentkeepalive": { + "version": "3.5.2", + "resolved": "http://registry.npm.taobao.org/agentkeepalive/download/agentkeepalive-3.5.2.tgz", + "integrity": "sha1-oROSTdP6JKC8O3gQjEUMKr7gD2c=", + "dev": true, + "requires": { + "humanize-ms": "1.2.1" + } + }, "ajv": { "version": "5.5.2", "resolved": "http://r.cnpmjs.org/ajv/download/ajv-5.5.2.tgz", @@ -1100,6 +1648,12 @@ "json-schema-traverse": "0.3.1" } }, + "ajv-errors": { + "version": "1.0.1", + "resolved": "http://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz", + "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=", + "dev": true + }, "ajv-keywords": { "version": "3.2.0", "resolved": "http://r.cnpmjs.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz", @@ -1134,6 +1688,18 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "ansi-colors": { + "version": "3.2.3", + "resolved": "http://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.3.tgz", + "integrity": "sha1-V9NbhoboUeLMBMQD8cACA5dqGBM=", + "dev": true + }, + "ansi-escapes": { + "version": "3.1.0", + "resolved": "http://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.1.0.tgz", + "integrity": "sha1-9zIHu4EgfXX9bIPxJa8m7qN4yjA=", + "dev": true + }, "ansi-html": { "version": "0.0.7", "resolved": "http://r.cnpmjs.org/ansi-html/download/ansi-html-0.0.7.tgz", @@ -1236,24 +1802,15 @@ "version": "1.0.2", "resolved": "http://r.cnpmjs.org/array-find-index/download/array-find-index-1.0.2.tgz", "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true + "dev": true, + "optional": true }, "array-flatten": { - "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/array-flatten/download/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", + "version": "2.1.2", + "resolved": "http://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.2.tgz", + "integrity": "sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk=", "dev": true }, - "array-includes": { - "version": "3.0.3", - "resolved": "http://r.cnpmjs.org/array-includes/download/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" - } - }, "array-slice": { "version": "0.2.3", "resolved": "http://r.cnpmjs.org/array-slice/download/array-slice-0.2.3.tgz", @@ -1409,17 +1966,17 @@ "dev": true }, "autoprefixer": { - "version": "8.6.4", - "resolved": "http://registry.npm.taobao.org/autoprefixer/download/autoprefixer-8.6.4.tgz", - "integrity": "sha1-a/UB3kJqO5WXP10jfbzJGB6ZBNI=", + "version": "9.4.3", + "resolved": "http://registry.npm.taobao.org/autoprefixer/download/autoprefixer-9.4.3.tgz", + "integrity": "sha1-yXOEqP2AR3t4BJFjqRu8cl2cQdk=", "dev": true, "requires": { - "browserslist": "3.2.8", - "caniuse-lite": "1.0.30000864", + "browserslist": "4.4.1", + "caniuse-lite": "1.0.30000930", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0" + "postcss": "7.0.13", + "postcss-value-parser": "3.3.1" } }, "aws-sign2": { @@ -1831,7 +2388,7 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.1", + "array-flatten": "2.1.2", "deep-equal": "1.0.1", "dns-equal": "1.0.0", "dns-txt": "2.0.2", @@ -1839,21 +2396,6 @@ "multicast-dns-service-types": "1.1.0" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/boolbase/download/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "http://r.cnpmjs.org/boom/download/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, "bootstrap": { "version": "4.0.0-alpha.5", "resolved": "http://registry.npm.taobao.org/bootstrap/download/bootstrap-4.0.0-alpha.5.tgz", @@ -1982,13 +2524,14 @@ } }, "browserslist": { - "version": "3.2.8", - "resolved": "http://registry.npm.taobao.org/browserslist/download/browserslist-3.2.8.tgz", - "integrity": "sha1-sABTYdZHHw9ZUnl6dvyYXx+Xj8Y=", + "version": "4.4.1", + "resolved": "http://registry.npm.taobao.org/browserslist/download/browserslist-4.4.1.tgz", + "integrity": "sha1-QugolUtrKaelPjUid75ClHimkGI=", "dev": true, "requires": { - "caniuse-lite": "1.0.30000864", - "electron-to-chromium": "1.3.51" + "caniuse-lite": "1.0.30000930", + "electron-to-chromium": "1.3.106", + "node-releases": "1.1.3" } }, "buffer": { @@ -2079,34 +2622,12 @@ "unset-value": "1.0.0" } }, - "cache-loader": { - "version": "1.2.2", - "resolved": "http://r.cnpmjs.org/cache-loader/download/cache-loader-1.2.2.tgz", - "integrity": "sha1-bVw43tlZoJzF1YGQq1r29zvTU/U=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mkdirp": "0.5.1", - "neo-async": "2.5.1", - "schema-utils": "0.4.5" - } - }, "callsite": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/callsite/download/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", "dev": true }, - "camel-case": { - "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/camel-case/download/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" - } - }, "camelcase": { "version": "1.2.1", "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz", @@ -2119,6 +2640,7 @@ "resolved": "http://r.cnpmjs.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, + "optional": true, "requires": { "camelcase": "2.1.1", "map-obj": "1.0.1" @@ -2128,14 +2650,15 @@ "version": "2.1.1", "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz", "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true + "dev": true, + "optional": true } } }, "caniuse-lite": { - "version": "1.0.30000864", - "resolved": "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000864.tgz", - "integrity": "sha1-egjHjaZw8jwG8RqpGIMbjy3WDdw=", + "version": "1.0.30000930", + "resolved": "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000930.tgz", + "integrity": "sha1-wji6uCvttGK8vcYdAzSTLcwITYo=", "dev": true }, "capture-stack-trace": { @@ -2188,6 +2711,12 @@ } } }, + "chardet": { + "version": "0.7.0", + "resolved": "http://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz", + "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=", + "dev": true + }, "chokidar": { "version": "2.0.4", "resolved": "http://registry.npm.taobao.org/chokidar/download/chokidar-2.0.4.tgz", @@ -2260,14 +2789,37 @@ } }, "clean-css": { - "version": "4.1.11", - "resolved": "http://r.cnpmjs.org/clean-css/download/clean-css-4.1.11.tgz", - "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz", + "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + } + } + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" } }, + "cli-width": { + "version": "2.2.0", + "resolved": "http://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, "clipboard": { "version": "2.0.1", "resolved": "http://r.cnpmjs.org/clipboard/download/clipboard-2.0.1.tgz", @@ -2301,9 +2853,9 @@ } }, "clone": { - "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/clone/download/clone-2.1.1.tgz", - "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "version": "2.1.2", + "resolved": "http://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", "dev": true }, "clone-deep": { @@ -2430,34 +2982,34 @@ "dev": true }, "compressible": { - "version": "2.0.14", - "resolved": "http://r.cnpmjs.org/compressible/download/compressible-2.0.14.tgz", - "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", + "version": "2.0.15", + "resolved": "http://registry.npm.taobao.org/compressible/download/compressible-2.0.15.tgz", + "integrity": "sha1-hXqasKfloH2Ng37UP+Le//ZP4hI=", "dev": true, "requires": { - "mime-db": "1.34.0" + "mime-db": "1.37.0" }, "dependencies": { "mime-db": { - "version": "1.34.0", - "resolved": "http://r.cnpmjs.org/mime-db/download/mime-db-1.34.0.tgz", - "integrity": "sha1-RS0Oz/XDA0am3B5kseruDTcZ/5o=", + "version": "1.37.0", + "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz", + "integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=", "dev": true } } }, "compression": { - "version": "1.7.2", - "resolved": "http://r.cnpmjs.org/compression/download/compression-1.7.2.tgz", - "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=", + "version": "1.7.3", + "resolved": "http://registry.npm.taobao.org/compression/download/compression-1.7.3.tgz", + "integrity": "sha1-J+DhdqryYPfywoE8PkQK258Zk9s=", "dev": true, "requires": { "accepts": "1.3.5", "bytes": "3.0.0", - "compressible": "2.0.14", + "compressible": "2.0.15", "debug": "2.6.9", "on-headers": "1.0.1", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "vary": "1.1.2" }, "dependencies": { @@ -2475,12 +3027,6 @@ "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "http://r.cnpmjs.org/safe-buffer/download/safe-buffer-5.1.1.tgz", - "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", - "dev": true } } }, @@ -2552,9 +3098,9 @@ } }, "connect-history-api-fallback": { - "version": "1.5.0", - "resolved": "http://r.cnpmjs.org/connect-history-api-fallback/download/connect-history-api-fallback-1.5.0.tgz", - "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", + "version": "1.6.0", + "resolved": "http://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w=", "dev": true }, "console-browserify": { @@ -2591,10 +3137,13 @@ "dev": true }, "convert-source-map": { - "version": "1.5.1", - "resolved": "http://r.cnpmjs.org/convert-source-map/download/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true + "version": "1.6.0", + "resolved": "http://registry.npm.taobao.org/convert-source-map/download/convert-source-map-1.6.0.tgz", + "integrity": "sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } }, "cookie": { "version": "0.3.1", @@ -2629,9 +3178,9 @@ "dev": true }, "copy-webpack-plugin": { - "version": "4.5.2", - "resolved": "http://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-4.5.2.tgz", - "integrity": "sha1-1TREqP6ikS2AbniTc5Dd1+Yy7lw=", + "version": "4.6.0", + "resolved": "http://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-4.6.0.tgz", + "integrity": "sha1-5/QN2KaEd9QF3Rt6hUquMksVi64=", "dev": true, "requires": { "cacache": "10.0.4", @@ -2655,18 +3204,27 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { - "version": "2.2.2", - "resolved": "http://r.cnpmjs.org/cosmiconfig/download/cosmiconfig-2.2.2.tgz", - "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-4.0.0.tgz", + "integrity": "sha1-dgORVJWAu9LfHlYrwXexPCkJctw=", "dev": true, "requires": { "is-directory": "0.3.1", "js-yaml": "3.12.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "os-homedir": "1.0.2", - "parse-json": "2.2.0", - "require-from-string": "1.2.1" + "parse-json": "4.0.0", + "require-from-string": "2.0.2" + }, + "dependencies": { + "parse-json": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/parse-json/download/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" + } + } } }, "create-ecdh": { @@ -2735,16 +3293,6 @@ "which": "1.3.1" } }, - "cryptiles": { - "version": "2.0.5", - "resolved": "http://r.cnpmjs.org/cryptiles/download/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, "crypto-browserify": { "version": "3.12.0", "resolved": "http://r.cnpmjs.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz", @@ -2770,18 +3318,6 @@ "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", "dev": true }, - "css-select": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/css-select/download/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "dev": true, - "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", - "domutils": "1.5.1", - "nth-check": "1.0.1" - } - }, "css-selector-tokenizer": { "version": "0.7.0", "resolved": "http://r.cnpmjs.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.0.tgz", @@ -2793,12 +3329,6 @@ "regexpu-core": "1.0.0" } }, - "css-what": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/css-what/download/css-what-2.1.0.tgz", - "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", - "dev": true - }, "cssauron": { "version": "1.4.0", "resolved": "http://r.cnpmjs.org/cssauron/download/cssauron-1.4.0.tgz", @@ -2814,17 +3344,12 @@ "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", "dev": true }, - "cuint": { - "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/cuint/download/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", - "dev": true - }, "currently-unhandled": { "version": "0.4.1", "resolved": "http://r.cnpmjs.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, + "optional": true, "requires": { "array-find-index": "1.0.2" } @@ -2841,15 +3366,6 @@ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, - "d": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/d/download/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.45" - } - }, "d3-array": { "version": "1.2.1", "resolved": "http://registry.npm.taobao.org/d3-array/download/d3-array-1.2.1.tgz", @@ -2965,6 +3481,16 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "default-gateway": { + "version": "2.7.2", + "resolved": "http://registry.npm.taobao.org/default-gateway/download/default-gateway-2.7.2.tgz", + "integrity": "sha1-t+8znl4CSwRUZ69APVA0jbRkLQ8=", + "dev": true, + "requires": { + "execa": "0.10.0", + "ip-regex": "2.1.0" + } + }, "default-require-extensions": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/default-require-extensions/download/default-require-extensions-2.0.0.tgz", @@ -3126,9 +3652,9 @@ } }, "detect-node": { - "version": "2.0.3", - "resolved": "http://r.cnpmjs.org/detect-node/download/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", + "version": "2.0.4", + "resolved": "http://registry.npm.taobao.org/detect-node/download/detect-node-2.0.4.tgz", + "integrity": "sha1-AU7o+PZpxcWAI9pkuBecCDooxGw=", "dev": true }, "dezalgo": { @@ -3181,12 +3707,11 @@ } }, "dir-glob": { - "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/dir-glob/download/dir-glob-2.0.0.tgz", - "integrity": "sha1-CyBdK2rvmCOMooZZioIE0p0KADQ=", + "version": "2.2.2", + "resolved": "http://registry.npm.taobao.org/dir-glob/download/dir-glob-2.2.2.tgz", + "integrity": "sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=", "dev": true, "requires": { - "arrify": "1.0.1", "path-type": "3.0.0" } }, @@ -3215,23 +3740,6 @@ "buffer-indexof": "1.1.1" } }, - "dom-converter": { - "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/dom-converter/download/dom-converter-0.1.4.tgz", - "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", - "dev": true, - "requires": { - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "http://r.cnpmjs.org/utila/download/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, "dom-serialize": { "version": "2.2.1", "resolved": "http://r.cnpmjs.org/dom-serialize/download/dom-serialize-2.2.1.tgz", @@ -3244,55 +3752,12 @@ "void-elements": "2.0.1" } }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "http://r.cnpmjs.org/dom-serializer/download/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/domelementtype/download/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, "domain-browser": { "version": "1.2.0", "resolved": "http://r.cnpmjs.org/domain-browser/download/domain-browser-1.2.0.tgz", "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=", "dev": true }, - "domelementtype": { - "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/domelementtype/download/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/domhandler/download/domhandler-2.1.0.tgz", - "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "http://r.cnpmjs.org/domutils/download/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" - } - }, "duplexer2": { "version": "0.1.4", "resolved": "http://r.cnpmjs.org/duplexer2/download/duplexer2-0.1.4.tgz", @@ -3341,16 +3806,10 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "ejs": { - "version": "2.6.1", - "resolved": "http://r.cnpmjs.org/ejs/download/ejs-2.6.1.tgz", - "integrity": "sha1-SY7A1JVlWrxvI81hho2SZGQHGqA=", - "dev": true - }, "electron-to-chromium": { - "version": "1.3.51", - "resolved": "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.51.tgz", - "integrity": "sha1-akK0nar38ipbN7mR2vlJ8029ubU=", + "version": "1.3.106", + "resolved": "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.106.tgz", + "integrity": "sha1-ZyGDFg54PLVGz/g9mpjV9pzZGHQ=", "dev": true }, "elliptic": { @@ -3380,6 +3839,15 @@ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, + "encoding": { + "version": "0.1.12", + "resolved": "http://registry.npm.taobao.org/encoding/download/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "dev": true, + "requires": { + "iconv-lite": "0.4.19" + } + }, "end-of-stream": { "version": "1.4.1", "resolved": "http://r.cnpmjs.org/end-of-stream/download/end-of-stream-1.4.1.tgz", @@ -3497,10 +3965,10 @@ "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true }, - "entities": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/entities/download/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "err-code": { + "version": "1.1.2", + "resolved": "http://registry.npm.taobao.org/err-code/download/err-code-1.1.2.tgz", + "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=", "dev": true }, "errno": { @@ -3520,52 +3988,6 @@ "is-arrayish": "0.2.1" } }, - "es-abstract": { - "version": "1.12.0", - "resolved": "http://r.cnpmjs.org/es-abstract/download/es-abstract-1.12.0.tgz", - "integrity": "sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=", - "dev": true, - "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/es-to-primitive/download/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" - } - }, - "es5-ext": { - "version": "0.10.45", - "resolved": "http://r.cnpmjs.org/es5-ext/download/es5-ext-0.10.45.tgz", - "integrity": "sha1-C/33tHPaWRnVrfO9Jc63VPzMNlM=", - "dev": true, - "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "http://r.cnpmjs.org/es6-iterator/download/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-symbol": "3.1.1" - } - }, "es6-promise": { "version": "3.3.1", "resolved": "http://r.cnpmjs.org/es6-promise/download/es6-promise-3.3.1.tgz", @@ -3579,16 +4001,6 @@ "es6-promise": "3.3.1" } }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "http://r.cnpmjs.org/es6-symbol/download/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" - } - }, "escape-html": { "version": "1.0.3", "resolved": "http://r.cnpmjs.org/escape-html/download/escape-html-1.0.3.tgz", @@ -3721,12 +4133,12 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "http://r.cnpmjs.org/execa/download/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "0.10.0", + "resolved": "http://registry.npm.taobao.org/execa/download/execa-0.10.0.tgz", + "integrity": "sha1-/0Vqj1P5D47MxxqW0Rvfx/CCy1A=", "dev": true, "requires": { - "cross-spawn": "5.1.0", + "cross-spawn": "6.0.5", "get-stream": "3.0.0", "is-stream": "1.1.0", "npm-run-path": "2.0.2", @@ -3736,15 +4148,23 @@ }, "dependencies": { "cross-spawn": { - "version": "5.1.0", - "resolved": "http://r.cnpmjs.org/cross-spawn/download/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "6.0.5", + "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz", + "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", "dev": true, "requires": { - "lru-cache": "4.1.3", + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.6.0", "shebang-command": "1.2.0", "which": "1.3.1" } + }, + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true } } }, @@ -3906,14 +4326,14 @@ } }, "express": { - "version": "4.16.3", - "resolved": "http://r.cnpmjs.org/express/download/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "version": "4.16.4", + "resolved": "http://registry.npm.taobao.org/express/download/express-4.16.4.tgz", + "integrity": "sha1-/d72GSYQniTFFeqX/S8b2/Yt8S4=", "dev": true, "requires": { "accepts": "1.3.5", "array-flatten": "1.1.1", - "body-parser": "1.18.2", + "body-parser": "1.18.3", "content-disposition": "0.5.2", "content-type": "1.0.4", "cookie": "0.3.1", @@ -3930,10 +4350,10 @@ "on-finished": "2.3.0", "parseurl": "1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.3", - "qs": "6.5.1", + "proxy-addr": "2.0.4", + "qs": "6.5.2", "range-parser": "1.2.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", @@ -3949,6 +4369,24 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true }, + "body-parser": { + "version": "1.18.3", + "resolved": "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.3.tgz", + "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "content-type": "1.0.4", + "debug": "2.6.9", + "depd": "1.1.2", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", + "on-finished": "2.3.0", + "qs": "6.5.2", + "raw-body": "2.3.3", + "type-is": "1.6.16" + } + }, "debug": { "version": "2.6.9", "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", @@ -3958,23 +4396,32 @@ "ms": "2.0.0" } }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz", + "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, "ms": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "qs": { - "version": "6.5.1", - "resolved": "http://r.cnpmjs.org/qs/download/qs-6.5.1.tgz", - "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "http://r.cnpmjs.org/safe-buffer/download/safe-buffer-5.1.1.tgz", - "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", - "dev": true + "raw-body": { + "version": "2.3.3", + "resolved": "http://registry.npm.taobao.org/raw-body/download/raw-body-2.3.3.tgz", + "integrity": "sha1-GzJOzmtXBuFThVvBFIxlu39uoMM=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", + "unpipe": "1.0.0" + } } } }, @@ -4004,6 +4451,37 @@ } } }, + "external-editor": { + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/external-editor/download/external-editor-3.0.3.tgz", + "integrity": "sha1-WGbbKal4Jtvkvzr9JAcOrZ6kOic=", + "dev": true, + "requires": { + "chardet": "0.7.0", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz", + "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "tmp": { + "version": "0.0.33", + "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + } + } + }, "extglob": { "version": "2.0.4", "resolved": "http://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz", @@ -4107,14 +4585,66 @@ "websocket-driver": "0.7.0" } }, + "figgy-pudding": { + "version": "3.5.1", + "resolved": "http://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.1.tgz", + "integrity": "sha1-hiRwESkBxyeg5JWoB0S9W6odZ5A=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, "file-loader": { - "version": "1.1.11", - "resolved": "http://r.cnpmjs.org/file-loader/download/file-loader-1.1.11.tgz", - "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=", + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/file-loader/download/file-loader-2.0.0.tgz", + "integrity": "sha1-OXScgvAguehZAdz/mOgATmQBz94=", "dev": true, "requires": { "loader-utils": "1.1.0", - "schema-utils": "0.4.5" + "schema-utils": "1.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", + "dev": true, + "requires": { + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" + } + } } }, "filename-regex": { @@ -4333,6 +4863,15 @@ "rimraf": "2.6.2" } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "http://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.5.tgz", + "integrity": "sha1-BsJ3IYRU7CiN93raVKA7hwKqy50=", + "dev": true, + "requires": { + "minipass": "2.3.5" + } + }, "fs-promise": { "version": "0.5.0", "resolved": "http://r.cnpmjs.org/fs-promise/download/fs-promise-0.5.0.tgz", @@ -4372,12 +4911,6 @@ "rimraf": "2.6.2" } }, - "function-bind": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/function-bind/download/function-bind-1.1.1.tgz", - "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", - "dev": true - }, "gauge": { "version": "2.7.4", "resolved": "http://r.cnpmjs.org/gauge/download/gauge-2.7.4.tgz", @@ -4404,10 +4937,16 @@ "globule": "1.2.1" } }, + "genfun": { + "version": "5.0.0", + "resolved": "http://registry.npm.taobao.org/genfun/download/genfun-5.0.0.tgz", + "integrity": "sha1-ndlxCgaQClxKW/V6yl2k5S/nZTc=", + "dev": true + }, "get-caller-file": { - "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/get-caller-file/download/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz", + "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=", "dev": true }, "get-stdin": { @@ -4520,7 +5059,7 @@ "dev": true, "requires": { "array-union": "1.0.2", - "dir-glob": "2.0.0", + "dir-glob": "2.2.2", "glob": "7.1.2", "ignore": "3.3.10", "pify": "3.0.0", @@ -4587,9 +5126,9 @@ } }, "handle-thing": { - "version": "1.2.5", - "resolved": "http://r.cnpmjs.org/handle-thing/download/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.0.tgz", + "integrity": "sha1-DgOWlf9QyT/CiFV9aW88HcZ3Z1Q=", "dev": true }, "handlebars": { @@ -4652,15 +5191,6 @@ "har-schema": "2.0.0" } }, - "has": { - "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/has/download/has-1.0.3.tgz", - "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=", - "dev": true, - "requires": { - "function-bind": "1.1.1" - } - }, "has-ansi": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/has-ansi/download/has-ansi-2.0.0.tgz", @@ -4699,12 +5229,6 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, - "has-symbols": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true - }, "has-unicode": { "version": "2.0.1", "resolved": "http://r.cnpmjs.org/has-unicode/download/has-unicode-2.0.1.tgz", @@ -4763,25 +5287,6 @@ "minimalistic-assert": "1.0.1" } }, - "hawk": { - "version": "3.1.3", - "resolved": "http://r.cnpmjs.org/hawk/download/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "he": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/he/download/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "http://r.cnpmjs.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz", @@ -4793,12 +5298,6 @@ "minimalistic-crypto-utils": "1.0.1" } }, - "hoek": { - "version": "2.16.3", - "resolved": "http://r.cnpmjs.org/hoek/download/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, "hogan.js": { "version": "3.0.2", "resolved": "http://registry.npm.taobao.org/hogan.js/download/hogan.js-3.0.2.tgz", @@ -4810,133 +5309,48 @@ "dependencies": { "mkdirp": { "version": "0.3.0", - "resolved": "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.3.0.tgz", - "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" - }, - "nopt": { - "version": "1.0.10", - "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "requires": { - "abbrev": "1.0.9" - } - } - } - }, - "hosted-git-info": { - "version": "2.6.1", - "resolved": "http://r.cnpmjs.org/hosted-git-info/download/hosted-git-info-2.6.1.tgz", - "integrity": "sha1-bkzueLAbuEnc+TUncIxp/b7kEN8=" - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "http://r.cnpmjs.org/hpack.js/download/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" - } - }, - "html-entities": { - "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/html-entities/download/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "html-minifier": { - "version": "3.5.18", - "resolved": "http://r.cnpmjs.org/html-minifier/download/html-minifier-3.5.18.tgz", - "integrity": "sha1-/IsCgmy7r8beGaEDxByDCpHP/lo=", - "dev": true, - "requires": { - "camel-case": "3.0.0", - "clean-css": "4.1.11", - "commander": "2.16.0", - "he": "1.1.1", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.3" - } - }, - "html-webpack-plugin": { - "version": "3.2.0", - "resolved": "http://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", - "dev": true, - "requires": { - "html-minifier": "3.5.18", - "loader-utils": "0.2.17", - "lodash": "4.17.10", - "pretty-error": "2.1.1", - "tapable": "1.0.0", - "toposort": "1.0.7", - "util.promisify": "1.0.0" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "http://r.cnpmjs.org/loader-utils/download/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, - "htmlparser2": { - "version": "3.3.0", - "resolved": "http://r.cnpmjs.org/htmlparser2/download/htmlparser2-3.3.0.tgz", - "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", - "dev": true, - "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.1.0", - "domutils": "1.1.6", - "readable-stream": "1.0.34" - }, - "dependencies": { - "domutils": { - "version": "1.1.6", - "resolved": "http://r.cnpmjs.org/domutils/download/domutils-1.1.6.tgz", - "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/isarray/download/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true + "resolved": "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.3.0.tgz", + "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" }, - "readable-stream": { - "version": "1.0.34", - "resolved": "http://r.cnpmjs.org/readable-stream/download/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, + "nopt": { + "version": "1.0.10", + "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" + "abbrev": "1.0.9" } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "http://r.cnpmjs.org/string_decoder/download/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true } } }, + "hosted-git-info": { + "version": "2.6.1", + "resolved": "http://r.cnpmjs.org/hosted-git-info/download/hosted-git-info-2.6.1.tgz", + "integrity": "sha1-bkzueLAbuEnc+TUncIxp/b7kEN8=" + }, + "hpack.js": { + "version": "2.1.6", + "resolved": "http://r.cnpmjs.org/hpack.js/download/hpack.js-2.1.6.tgz", + "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "obuf": "1.1.2", + "readable-stream": "2.3.6", + "wbuf": "1.7.3" + } + }, + "html-entities": { + "version": "1.2.1", + "resolved": "http://r.cnpmjs.org/html-entities/download/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", + "dev": true + }, + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "http://registry.npm.taobao.org/http-cache-semantics/download/http-cache-semantics-3.8.1.tgz", + "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI=", + "dev": true + }, "http-deceiver": { "version": "1.2.7", "resolved": "http://r.cnpmjs.org/http-deceiver/download/http-deceiver-1.2.7.tgz", @@ -4971,6 +5385,57 @@ "requires-port": "1.0.0" } }, + "http-proxy-agent": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/http-proxy-agent/download/http-proxy-agent-2.1.0.tgz", + "integrity": "sha1-5IIb7vWyFCogJr1zkm/lN2McVAU=", + "dev": true, + "requires": { + "agent-base": "4.2.1", + "debug": "3.1.0" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-4.2.1.tgz", + "integrity": "sha1-2J5ZmfeXh1Z0wH2H8mD8Qeg+jKk=", + "dev": true, + "requires": { + "es6-promisify": "5.0.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "es6-promise": { + "version": "4.2.5", + "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.5.tgz", + "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=", + "dev": true + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "http://registry.npm.taobao.org/es6-promisify/download/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "requires": { + "es6-promise": "4.2.5" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, "http-proxy-middleware": { "version": "0.18.0", "resolved": "http://registry.npm.taobao.org/http-proxy-middleware/download/http-proxy-middleware-0.18.0.tgz", @@ -5010,6 +5475,23 @@ "extend": "3.0.1" } }, + "humanize-ms": { + "version": "1.2.1", + "resolved": "http://registry.npm.taobao.org/humanize-ms/download/humanize-ms-1.2.1.tgz", + "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", + "dev": true, + "requires": { + "ms": "2.1.1" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", + "dev": true + } + } + }, "iconv-lite": { "version": "0.4.19", "resolved": "http://r.cnpmjs.org/iconv-lite/download/iconv-lite-0.4.19.tgz", @@ -5034,6 +5516,15 @@ "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=", "dev": true }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "http://registry.npm.taobao.org/ignore-walk/download/ignore-walk-3.0.1.tgz", + "integrity": "sha1-qD5i59JyrA47VRqqgoMaGbafgvg=", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, "image-size": { "version": "0.5.5", "resolved": "http://r.cnpmjs.org/image-size/download/image-size-0.5.5.tgz", @@ -5047,14 +5538,86 @@ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", "dev": true }, + "import-cwd": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", + "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", + "dev": true, + "requires": { + "import-from": "2.1.0" + } + }, + "import-from": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/import-from/download/import-from-2.1.0.tgz", + "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", + "dev": true, + "requires": { + "resolve-from": "3.0.0" + } + }, "import-local": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/import-local/download/import-local-1.0.0.tgz", - "integrity": "sha1-Xk/9wD9P5sAJxnKb6yljHC+CJ7w=", + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/import-local/download/import-local-2.0.0.tgz", + "integrity": "sha1-VQcL44pZk88Y72236WH1vuXFoJ0=", "dev": true, "requires": { - "pkg-dir": "2.0.0", + "pkg-dir": "3.0.0", "resolve-cwd": "2.0.0" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz", + "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", + "dev": true, + "requires": { + "locate-path": "3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz", + "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", + "dev": true, + "requires": { + "p-locate": "3.0.0", + "path-exists": "3.0.0" + } + }, + "p-limit": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/p-limit/download/p-limit-2.1.0.tgz", + "integrity": "sha1-HVoNIPsScHx1imVfa7xDhrWTDWg=", + "dev": true, + "requires": { + "p-try": "2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz", + "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", + "dev": true, + "requires": { + "p-limit": "2.1.0" + } + }, + "p-try": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-2.0.0.tgz", + "integrity": "sha1-hQgLuHxkaI+keZb+j3376CEXYLE=", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz", + "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", + "dev": true, + "requires": { + "find-up": "3.0.0" + } + } } }, "imurmurhash": { @@ -5075,6 +5638,7 @@ "resolved": "http://r.cnpmjs.org/indent-string/download/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, + "optional": true, "requires": { "repeating": "2.0.1" } @@ -5134,13 +5698,87 @@ } } }, + "inquirer": { + "version": "6.2.1", + "resolved": "http://registry.npm.taobao.org/inquirer/download/inquirer-6.2.1.tgz", + "integrity": "sha1-mUP8SIIWG9sLDJJ2dpx1sy2/zVI=", + "dev": true, + "requires": { + "ansi-escapes": "3.1.0", + "chalk": "2.2.2", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "3.0.3", + "figures": "2.0.0", + "lodash": "4.17.10", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rxjs": "6.2.1", + "string-width": "2.1.1", + "strip-ansi": "5.0.0", + "through": "2.3.8" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.0.0", + "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.0.0.tgz", + "integrity": "sha1-949otdCGbCCyybjGG1KYUI3IdW8=", + "dev": true, + "requires": { + "ansi-regex": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.0.0.tgz", + "integrity": "sha1-cN55Ht8CFATD/WFaqJEYrgQy5ak=", + "dev": true + } + } + } + } + }, "internal-ip": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/internal-ip/download/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", + "version": "3.0.1", + "resolved": "http://registry.npm.taobao.org/internal-ip/download/internal-ip-3.0.1.tgz", + "integrity": "sha1-31yZh24dLrLqLXT1IOP2aaAOzic=", "dev": true, "requires": { - "meow": "3.7.0" + "default-gateway": "2.7.2", + "ipaddr.js": "1.8.0" } }, "invariant": { @@ -5156,7 +5794,8 @@ "version": "1.0.0", "resolved": "http://r.cnpmjs.org/invert-kv/download/invert-kv-1.0.0.tgz", "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true + "dev": true, + "optional": true }, "ip": { "version": "1.1.5", @@ -5164,10 +5803,16 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, + "ip-regex": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/ip-regex/download/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true + }, "ipaddr.js": { - "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/ipaddr.js/download/ipaddr.js-1.6.0.tgz", - "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=", + "version": "1.8.0", + "resolved": "http://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.8.0.tgz", + "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=", "dev": true }, "is-accessor-descriptor": { @@ -5218,12 +5863,6 @@ "builtin-modules": "1.1.1" } }, - "is-callable": { - "version": "1.1.4", - "resolved": "http://r.cnpmjs.org/is-callable/download/is-callable-1.1.4.tgz", - "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=", - "dev": true - }, "is-data-descriptor": { "version": "0.1.4", "resolved": "http://r.cnpmjs.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz", @@ -5244,12 +5883,6 @@ } } }, - "is-date-object": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-date-object/download/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, "is-descriptor": { "version": "0.1.6", "resolved": "http://r.cnpmjs.org/is-descriptor/download/is-descriptor-0.1.6.tgz", @@ -5407,31 +6040,22 @@ "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", "dev": true }, + "is-promise": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, "is-redirect": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/is-redirect/download/is-redirect-1.0.0.tgz", "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" }, - "is-regex": { - "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/is-regex/download/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "1.0.3" - } - }, "is-stream": { "version": "1.1.0", "resolved": "http://r.cnpmjs.org/is-stream/download/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, - "is-symbol": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-symbol/download/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true - }, "is-typedarray": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/is-typedarray/download/is-typedarray-1.0.0.tgz", @@ -5586,7 +6210,7 @@ "integrity": "sha1-mVe9WSUrNz+uXFK3tRiOb94qCUk=", "dev": true, "requires": { - "convert-source-map": "1.5.1", + "convert-source-map": "1.6.0", "istanbul-lib-instrument": "1.10.1", "loader-utils": "1.1.0", "schema-utils": "0.3.0" @@ -5813,16 +6437,6 @@ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "dev": true }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/json-stable-stringify/download/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "http://r.cnpmjs.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz", @@ -5848,12 +6462,11 @@ "graceful-fs": "4.1.11" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "http://r.cnpmjs.org/jsonify/download/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true, - "optional": true + "jsonparse": { + "version": "1.3.1", + "resolved": "http://registry.npm.taobao.org/jsonparse/download/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", + "dev": true }, "jsprim": { "version": "1.4.1", @@ -6138,9 +6751,9 @@ } }, "killable": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/killable/download/killable-1.0.0.tgz", - "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", + "version": "1.0.1", + "resolved": "http://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz", + "integrity": "sha1-TIzkQRh6Bhx0dPuHygjipjgZSJI=", "dev": true }, "kind-of": { @@ -6169,6 +6782,7 @@ "resolved": "http://r.cnpmjs.org/lcid/download/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, + "optional": true, "requires": { "invert-kv": "1.0.0" } @@ -6180,11 +6794,12 @@ "dev": true }, "less": { - "version": "3.0.4", - "resolved": "http://registry.npm.taobao.org/less/download/less-3.0.4.tgz", - "integrity": "sha1-0n3O26yWAxyee3bx2h5LfYN2CBQ=", + "version": "3.9.0", + "resolved": "http://registry.npm.taobao.org/less/download/less-3.9.0.tgz", + "integrity": "sha1-t1EcQ/N89X3Iff/ZiD7BISibFHQ=", "dev": true, "requires": { + "clone": "2.1.2", "errno": "0.1.7", "graceful-fs": "4.1.11", "image-size": "0.5.5", @@ -6210,7 +6825,7 @@ "integrity": "sha1-LBNSxbCaT4QQFJAnT9UWdN5BNj4=", "dev": true, "requires": { - "clone": "2.1.1", + "clone": "2.1.2", "loader-utils": "1.1.0", "pify": "3.0.0" } @@ -6226,12 +6841,31 @@ } }, "license-webpack-plugin": { - "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/license-webpack-plugin/download/license-webpack-plugin-1.3.1.tgz", - "integrity": "sha1-aIt2RyGI71l5GLfK4+7H3C+loOg=", + "version": "2.0.4", + "resolved": "http://registry.npm.taobao.org/license-webpack-plugin/download/license-webpack-plugin-2.0.4.tgz", + "integrity": "sha1-SFMufXtF9s6yGmi2gmznJB1+pto=", "dev": true, "requires": { - "ejs": "2.6.1" + "@types/webpack-sources": "0.1.5", + "webpack-sources": "1.3.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "webpack-sources": { + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz", + "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.6.1" + } + } } }, "lie": { @@ -6329,15 +6963,6 @@ "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", "dev": true }, - "log-symbols": { - "version": "2.2.0", - "resolved": "http://registry.npm.taobao.org/log-symbols/download/log-symbols-2.2.0.tgz", - "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=", - "dev": true, - "requires": { - "chalk": "2.2.2" - } - }, "log4js": { "version": "0.6.38", "resolved": "http://r.cnpmjs.org/log4js/download/log4js-0.6.38.tgz", @@ -6386,16 +7011,6 @@ "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", "dev": true }, - "loglevelnext": { - "version": "1.0.5", - "resolved": "http://registry.npm.taobao.org/loglevelnext/download/loglevelnext-1.0.5.tgz", - "integrity": "sha1-NvxPWZbWZA9Tn/IDuoGWQWgNdaI=", - "dev": true, - "requires": { - "es6-symbol": "3.1.1", - "object.assign": "4.1.0" - } - }, "long": { "version": "3.2.0", "resolved": "http://registry.npm.taobao.org/long/download/long-3.2.0.tgz", @@ -6422,17 +7037,12 @@ "resolved": "http://r.cnpmjs.org/loud-rejection/download/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, + "optional": true, "requires": { "currently-unhandled": "0.4.1", "signal-exit": "3.0.2" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "http://r.cnpmjs.org/lower-case/download/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, "lowercase-keys": { "version": "1.0.1", "resolved": "http://r.cnpmjs.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz", @@ -6463,6 +7073,212 @@ "integrity": "sha1-GZeO1XX56VRdL/jBPjO10Ypn1TU=", "dev": true }, + "make-fetch-happen": { + "version": "4.0.1", + "resolved": "http://registry.npm.taobao.org/make-fetch-happen/download/make-fetch-happen-4.0.1.tgz", + "integrity": "sha1-FBSXy4ePJDupMTbIPYq6EsIWwIM=", + "dev": true, + "requires": { + "agentkeepalive": "3.5.2", + "cacache": "11.3.2", + "http-cache-semantics": "3.8.1", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.1", + "lru-cache": "4.1.3", + "mississippi": "3.0.0", + "node-fetch-npm": "2.0.2", + "promise-retry": "1.1.1", + "socks-proxy-agent": "4.0.1", + "ssri": "6.0.1" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-4.2.1.tgz", + "integrity": "sha1-2J5ZmfeXh1Z0wH2H8mD8Qeg+jKk=", + "dev": true, + "requires": { + "es6-promisify": "5.0.0" + } + }, + "bluebird": { + "version": "3.5.3", + "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", + "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", + "dev": true + }, + "cacache": { + "version": "11.3.2", + "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-11.3.2.tgz", + "integrity": "sha1-LYHjCOPSWMo4Eltna5iyrJzmm/o=", + "dev": true, + "requires": { + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz", + "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=", + "dev": true, + "requires": { + "yallist": "3.0.3" + } + } + } + }, + "chownr": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", + "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", + "dev": true + }, + "debug": { + "version": "3.2.6", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", + "dev": true, + "requires": { + "ms": "2.1.1" + } + }, + "es6-promise": { + "version": "4.2.5", + "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.5.tgz", + "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=", + "dev": true + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "http://registry.npm.taobao.org/es6-promisify/download/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "requires": { + "es6-promise": "4.2.5" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.15", + "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", + "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", + "dev": true + }, + "https-proxy-agent": { + "version": "2.2.1", + "resolved": "http://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-2.2.1.tgz", + "integrity": "sha1-UVUpcPoE1yPgTFbQQXjD+SWSu8A=", + "dev": true, + "requires": { + "agent-base": "4.2.1", + "debug": "3.2.6" + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz", + "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.2", + "through2": "2.0.5" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz", + "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "ssri": { + "version": "6.0.1", + "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz", + "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=", + "dev": true, + "requires": { + "figgy-pudding": "3.5.1" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz", + "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", + "dev": true, + "requires": { + "readable-stream": "2.3.6", + "xtend": "4.0.1" + } + }, + "unique-filename": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", + "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", + "dev": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "yallist": { + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", + "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", + "dev": true + } + } + }, + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "http://registry.npm.taobao.org/map-age-cleaner/download/map-age-cleaner-0.1.3.tgz", + "integrity": "sha1-fVg6cwZDTAVf5HSw9FB45uG0uSo=", + "dev": true, + "requires": { + "p-defer": "1.0.0" + } + }, "map-cache": { "version": "0.2.2", "resolved": "http://r.cnpmjs.org/map-cache/download/map-cache-0.2.2.tgz", @@ -6512,12 +7328,14 @@ "dev": true }, "mem": { - "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/mem/download/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/mem/download/mem-4.0.0.tgz", + "integrity": "sha1-ZDdpDZRxZ49syDZZwAy6/Nawza8=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "map-age-cleaner": "0.1.3", + "mimic-fn": "1.2.0", + "p-is-promise": "1.1.0" } }, "memory-fs": { @@ -6535,6 +7353,7 @@ "resolved": "http://r.cnpmjs.org/meow/download/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, + "optional": true, "requires": { "camelcase-keys": "2.1.0", "decamelize": "1.2.0", @@ -6619,14 +7438,51 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.4.1.tgz", - "integrity": "sha1-0rz3e7JZa45L2SV+Q9P5Fkwuhss=", + "version": "0.4.4", + "resolved": "http://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.4.4.tgz", + "integrity": "sha1-wQQQoASVG9PO2sHaaQU5QPzLYl0=", "dev": true, "requires": { - "@webpack-contrib/schema-utils": "1.0.0-beta.0", "loader-utils": "1.1.0", + "schema-utils": "1.0.0", "webpack-sources": "1.1.0" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", + "dev": true, + "requires": { + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" + } + } } }, "minimalistic-assert": { @@ -6654,6 +7510,33 @@ "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, + "minipass": { + "version": "2.3.5", + "resolved": "http://registry.npm.taobao.org/minipass/download/minipass-2.3.5.tgz", + "integrity": "sha1-ys6+SSAiSX9law8PUeJoKp7S2Eg=", + "dev": true, + "requires": { + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", + "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", + "dev": true + } + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "http://registry.npm.taobao.org/minizlib/download/minizlib-1.2.1.tgz", + "integrity": "sha1-3SfqYTYkPHyIBoToZyuzpF/ZthQ=", + "dev": true, + "requires": { + "minipass": "2.3.5" + } + }, "mississippi": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/mississippi/download/mississippi-2.0.0.tgz", @@ -6786,7 +7669,7 @@ "dev": true, "requires": { "dns-packet": "1.3.1", - "thunky": "1.0.2" + "thunky": "1.0.3" } }, "multicast-dns-service-types": { @@ -6816,9 +7699,9 @@ } }, "nan": { - "version": "2.10.0", - "resolved": "http://r.cnpmjs.org/nan/download/nan-2.10.0.tgz", - "integrity": "sha1-ltDNYQ69WNS03pzAxoKM2pnHVI8=", + "version": "2.12.1", + "resolved": "http://registry.npm.taobao.org/nan/download/nan-2.12.1.tgz", + "integrity": "sha1-exqhk+mqhgV+PHu9CsRI53CSVVI=", "dev": true, "optional": true }, @@ -6853,12 +7736,6 @@ "integrity": "sha1-rLkJ4yex6H7J7xX0G4omlRKtQe4=", "dev": true }, - "next-tick": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/next-tick/download/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, "ngx-markdown": { "version": "6.3.0", "resolved": "http://r.cnpmjs.org/ngx-markdown/download/ngx-markdown-6.3.0.tgz", @@ -6870,13 +7747,21 @@ "tslib": "1.9.3" } }, - "no-case": { - "version": "2.3.2", - "resolved": "http://r.cnpmjs.org/no-case/download/no-case-2.3.2.tgz", - "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", + "nice-try": { + "version": "1.0.5", + "resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz", + "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=", + "dev": true + }, + "node-fetch-npm": { + "version": "2.0.2", + "resolved": "http://registry.npm.taobao.org/node-fetch-npm/download/node-fetch-npm-2.0.2.tgz", + "integrity": "sha1-cljJBGGC3KNFtCCO2pGNrzNpf/c=", "dev": true, "requires": { - "lower-case": "1.1.4" + "encoding": "0.1.12", + "json-parse-better-errors": "1.0.2", + "safe-buffer": "5.1.2" } }, "node-forge": { @@ -6886,9 +7771,9 @@ "dev": true }, "node-gyp": { - "version": "3.7.0", - "resolved": "http://r.cnpmjs.org/node-gyp/download/node-gyp-3.7.0.tgz", - "integrity": "sha1-eJR46PbEXid6oBTz4o+VjyhvkgM=", + "version": "3.8.0", + "resolved": "http://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz", + "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=", "dev": true, "optional": true, "requires": { @@ -6899,138 +7784,19 @@ "nopt": "3.0.6", "npmlog": "4.1.2", "osenv": "0.1.5", - "request": "2.81.0", + "request": "2.87.0", "rimraf": "2.6.2", "semver": "5.3.0", "tar": "2.2.1", "which": "1.3.1" }, "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" - } - }, - "har-schema": { - "version": "1.0.5", - "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "http-signature": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.2" - } - }, - "performance-now": { - "version": "0.2.0", - "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "dev": true, - "optional": true - }, - "request": { - "version": "2.81.0", - "resolved": "http://registry.npm.taobao.org/request/download/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.2", - "stringstream": "0.0.6", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" - } - }, "semver": { "version": "5.3.0", "resolved": "http://r.cnpmjs.org/semver/download/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true, "optional": true - }, - "uuid": { - "version": "3.3.2", - "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz", - "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=", - "dev": true, - "optional": true } } }, @@ -7088,10 +7854,27 @@ } } }, + "node-releases": { + "version": "1.1.3", + "resolved": "http://registry.npm.taobao.org/node-releases/download/node-releases-1.1.3.tgz", + "integrity": "sha1-qtnODcuYEpx1P3csCqATYPuQ+9I=", + "dev": true, + "requires": { + "semver": "5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + } + } + }, "node-sass": { - "version": "4.9.1", - "resolved": "http://registry.npm.taobao.org/node-sass/download/node-sass-4.9.1.tgz", - "integrity": "sha1-VBaucHnZkfDnAC5iyLC6P+3BXHk=", + "version": "4.10.0", + "resolved": "http://registry.npm.taobao.org/node-sass/download/node-sass-4.10.0.tgz", + "integrity": "sha1-3MKzZMCRNjCUXMv3orvx+Sbv/KQ=", "dev": true, "optional": true, "requires": { @@ -7107,15 +7890,28 @@ "lodash.mergewith": "4.6.1", "meow": "3.7.0", "mkdirp": "0.5.1", - "nan": "2.10.0", - "node-gyp": "3.7.0", + "nan": "2.12.1", + "node-gyp": "3.8.0", "npmlog": "4.1.2", - "request": "2.87.0", + "request": "2.88.0", "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" + "stdout-stream": "1.4.1", + "true-case-path": "1.0.3" }, "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "optional": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, "ansi-styles": { "version": "2.2.1", "resolved": "http://r.cnpmjs.org/ansi-styles/download/ansi-styles-2.2.1.tgz", @@ -7123,6 +7919,13 @@ "dev": true, "optional": true }, + "aws4": { + "version": "1.8.0", + "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz", + "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=", + "dev": true, + "optional": true + }, "chalk": { "version": "1.1.3", "resolved": "http://r.cnpmjs.org/chalk/download/chalk-1.1.3.tgz", @@ -7137,12 +7940,122 @@ "supports-color": "2.0.0" } }, + "extend": { + "version": "3.0.2", + "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", + "dev": true, + "optional": true + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true, + "optional": true + }, + "har-validator": { + "version": "5.1.3", + "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-5.1.3.tgz", + "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", + "dev": true, + "optional": true, + "requires": { + "ajv": "6.7.0", + "har-schema": "2.0.0" + } + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true, + "optional": true + }, + "mime-db": { + "version": "1.37.0", + "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz", + "integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=", + "dev": true, + "optional": true + }, + "mime-types": { + "version": "2.1.21", + "resolved": "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.21.tgz", + "integrity": "sha1-KJlaoey3cHQv5q5+WPkYHHRLP5Y=", + "dev": true, + "optional": true, + "requires": { + "mime-db": "1.37.0" + } + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", + "dev": true, + "optional": true + }, + "punycode": { + "version": "1.4.1", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true, + "optional": true + }, + "request": { + "version": "2.88.0", + "resolved": "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz", + "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.21", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" + } + }, "supports-color": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/supports-color/download/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true, "optional": true + }, + "tough-cookie": { + "version": "2.4.3", + "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.4.3.tgz", + "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", + "dev": true, + "optional": true, + "requires": { + "psl": "1.1.31", + "punycode": "1.4.1" + } + }, + "uuid": { + "version": "3.3.2", + "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz", + "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=", + "dev": true, + "optional": true } } }, @@ -7191,6 +8104,12 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, + "npm-bundled": { + "version": "1.0.5", + "resolved": "http://registry.npm.taobao.org/npm-bundled/download/npm-bundled-1.0.5.tgz", + "integrity": "sha1-PBcyt7qTazoQMlrvYWRnwMy8yXk=", + "dev": true + }, "npm-package-arg": { "version": "4.1.0", "resolved": "http://r.cnpmjs.org/npm-package-arg/download/npm-package-arg-4.1.0.tgz", @@ -7200,31 +8119,108 @@ "semver": "5.0.1" } }, - "npm-registry-client": { - "version": "8.6.0", - "resolved": "http://registry.npm.taobao.org/npm-registry-client/download/npm-registry-client-8.6.0.tgz", - "integrity": "sha1-fxUp+RRQcy6J+FGODyFFne6j5MQ=", + "npm-packlist": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.2.0.tgz", + "integrity": "sha1-VaYOeT4nLwCGLHCJJ0Q5pMwx/H8=", "dev": true, "requires": { - "concat-stream": "1.6.2", - "graceful-fs": "4.1.11", - "normalize-package-data": "2.4.0", - "npm-package-arg": "4.1.0", - "npmlog": "4.1.2", - "once": "1.4.0", - "request": "2.87.0", - "retry": "0.10.1", - "safe-buffer": "5.1.2", - "semver": "5.0.1", - "slide": "1.1.6", - "ssri": "5.3.0" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.5" + } + }, + "npm-pick-manifest": { + "version": "2.2.3", + "resolved": "http://registry.npm.taobao.org/npm-pick-manifest/download/npm-pick-manifest-2.2.3.tgz", + "integrity": "sha1-MhEdKpViY4uyyPK/J/fzCSyPrkA=", + "dev": true, + "requires": { + "figgy-pudding": "3.5.1", + "npm-package-arg": "6.1.0", + "semver": "5.6.0" }, "dependencies": { - "retry": { - "version": "0.10.1", - "resolved": "http://registry.npm.taobao.org/retry/download/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", + "builtins": { + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/builtins/download/builtins-1.0.3.tgz", + "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", + "dev": true + }, + "npm-package-arg": { + "version": "6.1.0", + "resolved": "http://registry.npm.taobao.org/npm-package-arg/download/npm-package-arg-6.1.0.tgz", + "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", + "dev": true, + "requires": { + "hosted-git-info": "2.6.1", + "osenv": "0.1.5", + "semver": "5.6.0", + "validate-npm-package-name": "3.0.0" + } + }, + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + }, + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/validate-npm-package-name/download/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "dev": true, + "requires": { + "builtins": "1.0.3" + } + } + } + }, + "npm-registry-fetch": { + "version": "3.8.0", + "resolved": "http://registry.npm.taobao.org/npm-registry-fetch/download/npm-registry-fetch-3.8.0.tgz", + "integrity": "sha1-qn2afJKv+U9I26CYS970vRMciMw=", + "dev": true, + "requires": { + "JSONStream": "1.3.5", + "bluebird": "3.5.1", + "figgy-pudding": "3.5.1", + "lru-cache": "4.1.3", + "make-fetch-happen": "4.0.1", + "npm-package-arg": "6.1.0" + }, + "dependencies": { + "builtins": { + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/builtins/download/builtins-1.0.3.tgz", + "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", + "dev": true + }, + "npm-package-arg": { + "version": "6.1.0", + "resolved": "http://registry.npm.taobao.org/npm-package-arg/download/npm-package-arg-6.1.0.tgz", + "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", + "dev": true, + "requires": { + "hosted-git-info": "2.6.1", + "osenv": "0.1.5", + "semver": "5.6.0", + "validate-npm-package-name": "3.0.0" + } + }, + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", "dev": true + }, + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/validate-npm-package-name/download/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "dev": true, + "requires": { + "builtins": "1.0.3" + } } } }, @@ -7249,15 +8245,6 @@ "set-blocking": "2.0.0" } }, - "nth-check": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/nth-check/download/nth-check-1.0.1.tgz", - "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", - "dev": true, - "requires": { - "boolbase": "1.0.0" - } - }, "null-check": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/null-check/download/null-check-1.0.0.tgz", @@ -7338,36 +8325,6 @@ "isobject": "3.0.1" } }, - "object.assign": { - "version": "4.1.0", - "resolved": "http://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz", - "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "function-bind": "1.1.1", - "has-symbols": "1.0.0", - "object-keys": "1.0.12" - }, - "dependencies": { - "object-keys": { - "version": "1.0.12", - "resolved": "http://registry.npm.taobao.org/object-keys/download/object-keys-1.0.12.tgz", - "integrity": "sha1-CcU4VTd1dTEMymL1W7M0q/97PtI=", - "dev": true - } - } - }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "http://registry.npm.taobao.org/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" - } - }, "object.omit": { "version": "2.0.1", "resolved": "http://r.cnpmjs.org/object.omit/download/object.omit-2.0.1.tgz", @@ -7427,6 +8384,15 @@ "wrappy": "1.0.2" } }, + "onetime": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "1.2.0" + } + }, "opn": { "version": "5.3.0", "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.3.0.tgz", @@ -7521,18 +8487,29 @@ "resolved": "http://r.cnpmjs.org/osenv/download/osenv-0.1.5.tgz", "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, - "optional": true, "requires": { "os-homedir": "1.0.2", "os-tmpdir": "1.0.2" } }, + "p-defer": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "dev": true + }, "p-finally": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/p-finally/download/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/p-is-promise/download/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", + "dev": true + }, "p-limit": { "version": "1.3.0", "resolved": "http://r.cnpmjs.org/p-limit/download/p-limit-1.3.0.tgz", @@ -7551,18 +8528,239 @@ "p-limit": "1.3.0" } }, - "p-map": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/p-map/download/p-map-1.2.0.tgz", - "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=", - "dev": true - }, - "p-try": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/p-try/download/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, + "p-map": { + "version": "1.2.0", + "resolved": "http://r.cnpmjs.org/p-map/download/p-map-1.2.0.tgz", + "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=", + "dev": true + }, + "p-try": { + "version": "1.0.0", + "resolved": "http://r.cnpmjs.org/p-try/download/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "pacote": { + "version": "9.1.1", + "resolved": "http://registry.npm.taobao.org/pacote/download/pacote-9.1.1.tgz", + "integrity": "sha1-JQkfdaJQId6L6NNMxkCHKPyjV5s=", + "dev": true, + "requires": { + "bluebird": "3.5.3", + "cacache": "11.3.2", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "glob": "7.1.3", + "lru-cache": "4.1.3", + "make-fetch-happen": "4.0.1", + "minimatch": "3.0.4", + "minipass": "2.3.5", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "normalize-package-data": "2.4.0", + "npm-package-arg": "6.1.0", + "npm-packlist": "1.2.0", + "npm-pick-manifest": "2.2.3", + "npm-registry-fetch": "3.8.0", + "osenv": "0.1.5", + "promise-inflight": "1.0.1", + "promise-retry": "1.1.1", + "protoduck": "5.0.1", + "rimraf": "2.6.2", + "safe-buffer": "5.1.2", + "semver": "5.6.0", + "ssri": "6.0.1", + "tar": "4.4.8", + "unique-filename": "1.1.1", + "which": "1.3.1" + }, + "dependencies": { + "bluebird": { + "version": "3.5.3", + "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", + "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", + "dev": true + }, + "builtins": { + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/builtins/download/builtins-1.0.3.tgz", + "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", + "dev": true + }, + "cacache": { + "version": "11.3.2", + "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-11.3.2.tgz", + "integrity": "sha1-LYHjCOPSWMo4Eltna5iyrJzmm/o=", + "dev": true, + "requires": { + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz", + "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=", + "dev": true, + "requires": { + "yallist": "3.0.3" + } + } + } + }, + "chownr": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", + "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz", + "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=", + "dev": true, + "requires": { + "pump": "3.0.0" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.15", + "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", + "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", + "dev": true + }, + "mississippi": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz", + "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.2", + "through2": "2.0.5" + } + }, + "npm-package-arg": { + "version": "6.1.0", + "resolved": "http://registry.npm.taobao.org/npm-package-arg/download/npm-package-arg-6.1.0.tgz", + "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", + "dev": true, + "requires": { + "hosted-git-info": "2.6.1", + "osenv": "0.1.5", + "semver": "5.6.0", + "validate-npm-package-name": "3.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz", + "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + }, + "ssri": { + "version": "6.0.1", + "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz", + "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=", + "dev": true, + "requires": { + "figgy-pudding": "3.5.1" + } + }, + "tar": { + "version": "4.4.8", + "resolved": "http://registry.npm.taobao.org/tar/download/tar-4.4.8.tgz", + "integrity": "sha1-sZ7sP94qluZGZt+f20DFyhvDdH0=", + "dev": true, + "requires": { + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz", + "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", + "dev": true, + "requires": { + "readable-stream": "2.3.6", + "xtend": "4.0.1" + } + }, + "unique-filename": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", + "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", + "dev": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/validate-npm-package-name/download/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "dev": true, + "requires": { + "builtins": "1.0.3" + } + }, + "yallist": { + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", + "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", + "dev": true + } + } + }, "pako": { "version": "0.2.9", "resolved": "http://registry.npm.taobao.org/pako/download/pako-0.2.9.tgz", @@ -7579,15 +8777,6 @@ "readable-stream": "2.3.6" } }, - "param-case": { - "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/param-case/download/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, - "requires": { - "no-case": "2.3.2" - } - }, "parse-asn1": { "version": "5.1.1", "resolved": "http://r.cnpmjs.org/parse-asn1/download/parse-asn1-5.1.1.tgz", @@ -7823,9 +9012,9 @@ } }, "portfinder": { - "version": "1.0.13", - "resolved": "http://r.cnpmjs.org/portfinder/download/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", + "version": "1.0.17", + "resolved": "http://registry.npm.taobao.org/portfinder/download/portfinder-1.0.17.tgz", + "integrity": "sha1-qKFpEUPkbEc17e/PT7zM7a0mRWo=", "dev": true, "requires": { "async": "1.5.2", @@ -7840,25 +9029,36 @@ "dev": true }, "postcss": { - "version": "6.0.23", - "resolved": "http://r.cnpmjs.org/postcss/download/postcss-6.0.23.tgz", - "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", + "version": "7.0.13", + "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-7.0.13.tgz", + "integrity": "sha1-Qr9xZBPo8ceGq3HcbnIrNnGxZwg=", "dev": true, "requires": { - "chalk": "2.4.1", + "chalk": "2.4.2", "source-map": "0.6.1", - "supports-color": "5.4.0" + "supports-color": "6.1.0" }, "dependencies": { "chalk": { - "version": "2.4.1", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-2.4.1.tgz", - "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", + "version": "2.4.2", + "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "supports-color": "5.5.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } } }, "source-map": { @@ -7866,82 +9066,93 @@ "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "dev": true + }, + "supports-color": { + "version": "6.1.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", + "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } } } }, "postcss-import": { - "version": "11.1.0", - "resolved": "http://r.cnpmjs.org/postcss-import/download/postcss-import-11.1.0.tgz", - "integrity": "sha1-Vck2LJGSmU7GiGXSJEGd8dspgfA=", + "version": "12.0.1", + "resolved": "http://registry.npm.taobao.org/postcss-import/download/postcss-import-12.0.1.tgz", + "integrity": "sha1-z4x6sLXMq1ZJAkU25WX4QZKLcVM=", "dev": true, "requires": { - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0", + "postcss": "7.0.13", + "postcss-value-parser": "3.3.1", "read-cache": "1.0.0", "resolve": "1.8.1" } }, "postcss-load-config": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/postcss-load-config/download/postcss-load-config-1.2.0.tgz", - "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1", - "postcss-load-options": "1.2.0", - "postcss-load-plugins": "2.3.0" - } - }, - "postcss-load-options": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/postcss-load-options/download/postcss-load-options-1.2.0.tgz", - "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } - }, - "postcss-load-plugins": { - "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/postcss-load-plugins/download/postcss-load-plugins-2.3.0.tgz", - "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-2.0.0.tgz", + "integrity": "sha1-8TEt2/WRLNdHF3CDxe96GdYu5IQ=", "dev": true, "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" + "cosmiconfig": "4.0.0", + "import-cwd": "2.1.0" } }, "postcss-loader": { - "version": "2.1.5", - "resolved": "http://r.cnpmjs.org/postcss-loader/download/postcss-loader-2.1.5.tgz", - "integrity": "sha1-PGM27mQcj5UTgXJTOuRhqDWV54g=", + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/postcss-loader/download/postcss-loader-3.0.0.tgz", + "integrity": "sha1-a5eUPkfHLYRfqeA/Jzdz1OjdbC0=", "dev": true, "requires": { "loader-utils": "1.1.0", - "postcss": "6.0.23", - "postcss-load-config": "1.2.0", - "schema-utils": "0.4.5" - } - }, - "postcss-url": { - "version": "7.3.2", - "resolved": "http://r.cnpmjs.org/postcss-url/download/postcss-url-7.3.2.tgz", - "integrity": "sha1-X+onOAf7hLOMRhw8mp6KvSNfcSA=", - "dev": true, - "requires": { - "mime": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.23", - "xxhashjs": "0.2.2" + "postcss": "7.0.13", + "postcss-load-config": "2.0.0", + "schema-utils": "1.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", + "dev": true, + "requires": { + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" + } + } } }, "postcss-value-parser": { - "version": "3.3.0", - "resolved": "http://r.cnpmjs.org/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "version": "3.3.1", + "resolved": "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz", + "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=", "dev": true }, "prelude-ls": { @@ -7961,16 +9172,6 @@ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, - "pretty-error": { - "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/pretty-error/download/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", - "dev": true, - "requires": { - "renderkid": "2.0.1", - "utila": "0.4.0" - } - }, "prismjs": { "version": "1.15.0", "resolved": "http://r.cnpmjs.org/prismjs/download/prismjs-1.15.0.tgz", @@ -8006,6 +9207,24 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "promise-retry": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/promise-retry/download/promise-retry-1.1.1.tgz", + "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", + "dev": true, + "requires": { + "err-code": "1.1.2", + "retry": "0.10.1" + }, + "dependencies": { + "retry": { + "version": "0.10.1", + "resolved": "http://registry.npm.taobao.org/retry/download/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", + "dev": true + } + } + }, "promzard": { "version": "0.3.0", "resolved": "http://r.cnpmjs.org/promzard/download/promzard-0.3.0.tgz", @@ -8014,6 +9233,15 @@ "read": "1.0.7" } }, + "protoduck": { + "version": "5.0.1", + "resolved": "http://registry.npm.taobao.org/protoduck/download/protoduck-5.0.1.tgz", + "integrity": "sha1-A8NlnKGAB7aaUP2Cp+vMUWJhFR8=", + "dev": true, + "requires": { + "genfun": "5.0.0" + } + }, "protractor": { "version": "5.3.2", "resolved": "http://registry.npm.taobao.org/protractor/download/protractor-5.3.2.tgz", @@ -8146,13 +9374,13 @@ } }, "proxy-addr": { - "version": "2.0.3", - "resolved": "http://r.cnpmjs.org/proxy-addr/download/proxy-addr-2.0.3.tgz", - "integrity": "sha1-NV8mJQWmIWRrMTCnKOtkfiIFU0E=", + "version": "2.0.4", + "resolved": "http://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.4.tgz", + "integrity": "sha1-7PxzO/Iv+Mb0B/onUye5q2fki5M=", "dev": true, "requires": { "forwarded": "0.1.2", - "ipaddr.js": "1.6.0" + "ipaddr.js": "1.8.0" } }, "prr": { @@ -8167,6 +9395,13 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, + "psl": { + "version": "1.1.31", + "resolved": "http://registry.npm.taobao.org/psl/download/psl-1.1.31.tgz", + "integrity": "sha1-6aqG0BAbWxBcvpOsa3hM1UcnYYQ=", + "dev": true, + "optional": true + }, "public-encrypt": { "version": "4.0.2", "resolved": "http://r.cnpmjs.org/public-encrypt/download/public-encrypt-4.0.2.tgz", @@ -8482,6 +9717,7 @@ "resolved": "http://r.cnpmjs.org/redent/download/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, + "optional": true, "requires": { "indent-string": "2.1.0", "strip-indent": "1.0.1" @@ -8558,39 +9794,12 @@ } } }, - "relateurl": { - "version": "0.2.7", - "resolved": "http://r.cnpmjs.org/relateurl/download/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "http://r.cnpmjs.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, - "renderkid": { - "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/renderkid/download/renderkid-2.0.1.tgz", - "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", - "dev": true, - "requires": { - "css-select": "1.2.0", - "dom-converter": "0.1.4", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "http://r.cnpmjs.org/utila/download/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, "repeat-element": { "version": "1.1.2", "resolved": "http://r.cnpmjs.org/repeat-element/download/repeat-element-1.1.2.tgz", @@ -8655,9 +9864,9 @@ "dev": true }, "require-from-string": { - "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/require-from-string/download/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", + "version": "2.0.2", + "resolved": "http://registry.npm.taobao.org/require-from-string/download/require-from-string-2.0.2.tgz", + "integrity": "sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk=", "dev": true }, "require-main-filename": { @@ -8701,6 +9910,16 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, "ret": { "version": "0.1.15", "resolved": "http://r.cnpmjs.org/ret/download/ret-0.1.15.tgz", @@ -8740,6 +9959,15 @@ "inherits": "2.0.3" } }, + "run-async": { + "version": "2.3.0", + "resolved": "http://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "2.1.0" + } + }, "run-queue": { "version": "1.0.3", "resolved": "http://r.cnpmjs.org/run-queue/download/run-queue-1.0.3.tgz", @@ -8831,7 +10059,7 @@ "camelcase": "3.0.0", "cliui": "3.2.0", "decamelize": "1.2.0", - "get-caller-file": "1.0.2", + "get-caller-file": "1.0.3", "os-locale": "1.4.0", "read-pkg-up": "1.0.1", "require-directory": "2.1.1", @@ -8846,16 +10074,25 @@ } }, "sass-loader": { - "version": "7.0.3", - "resolved": "http://registry.npm.taobao.org/sass-loader/download/sass-loader-7.0.3.tgz", - "integrity": "sha1-bKEIcaHMdUn4FD21qZWCQsTkyio=", + "version": "7.1.0", + "resolved": "http://registry.npm.taobao.org/sass-loader/download/sass-loader-7.1.0.tgz", + "integrity": "sha1-Fv1ROMuLQkv4p1lSihly1yqtBp0=", "dev": true, "requires": { "clone-deep": "2.0.2", "loader-utils": "1.1.0", "lodash.tail": "4.1.1", "neo-async": "2.5.1", - "pify": "3.0.0" + "pify": "3.0.0", + "semver": "5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + } } }, "saucelabs": { @@ -9028,9 +10265,9 @@ } }, "selfsigned": { - "version": "1.10.3", - "resolved": "http://r.cnpmjs.org/selfsigned/download/selfsigned-1.10.3.tgz", - "integrity": "sha1-1ijs+eNzX4TouvupNrPPhb6kOCM=", + "version": "1.10.4", + "resolved": "http://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.4.tgz", + "integrity": "sha1-zdfsz8pO12NdR6CL8tXTB0CS4s0=", "dev": true, "requires": { "node-forge": "0.7.5" @@ -9258,24 +10495,15 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "silent-error": { - "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/silent-error/download/silent-error-1.1.0.tgz", - "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", - "dev": true, - "requires": { - "debug": "2.2.0" - } - }, "slash": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/slash/download/slash-1.0.0.tgz", "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, - "slide": { - "version": "1.1.6", - "resolved": "http://registry.npm.taobao.org/slide/download/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "smart-buffer": { + "version": "4.0.1", + "resolved": "http://registry.npm.taobao.org/smart-buffer/download/smart-buffer-4.0.1.tgz", + "integrity": "sha1-B+ocqNTbJOtMrIZTfX0YmVIhrOM=", "dev": true }, "snapdragon": { @@ -9385,16 +10613,6 @@ } } }, - "sntp": { - "version": "1.0.9", - "resolved": "http://r.cnpmjs.org/sntp/download/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, "socket.io": { "version": "1.7.3", "resolved": "http://r.cnpmjs.org/socket.io/download/socket.io-1.7.3.tgz", @@ -9577,6 +10795,52 @@ } } }, + "socks": { + "version": "2.2.2", + "resolved": "http://registry.npm.taobao.org/socks/download/socks-2.2.2.tgz", + "integrity": "sha1-8GEhn8LU0zKvtK+T6GXITT+ibis=", + "dev": true, + "requires": { + "ip": "1.1.5", + "smart-buffer": "4.0.1" + } + }, + "socks-proxy-agent": { + "version": "4.0.1", + "resolved": "http://registry.npm.taobao.org/socks-proxy-agent/download/socks-proxy-agent-4.0.1.tgz", + "integrity": "sha1-WTa/i3B6mTB5xvN9sgkYIb/6ZHM=", + "dev": true, + "requires": { + "agent-base": "4.2.1", + "socks": "2.2.2" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-4.2.1.tgz", + "integrity": "sha1-2J5ZmfeXh1Z0wH2H8mD8Qeg+jKk=", + "dev": true, + "requires": { + "es6-promisify": "5.0.0" + } + }, + "es6-promise": { + "version": "4.2.5", + "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.5.tgz", + "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=", + "dev": true + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "http://registry.npm.taobao.org/es6-promisify/download/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "requires": { + "es6-promise": "4.2.5" + } + } + } + }, "source-list-map": { "version": "2.0.0", "resolved": "http://r.cnpmjs.org/source-list-map/download/source-list-map-2.0.0.tgz", @@ -9589,6 +10853,27 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, + "source-map-loader": { + "version": "0.2.4", + "resolved": "http://registry.npm.taobao.org/source-map-loader/download/source-map-loader-0.2.4.tgz", + "integrity": "sha1-wYsNxuI79m9nkkN1V8VpoR4HInE=", + "dev": true, + "requires": { + "async": "2.6.1", + "loader-utils": "1.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "http://registry.npm.taobao.org/async/download/async-2.6.1.tgz", + "integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=", + "dev": true, + "requires": { + "lodash": "4.17.10" + } + } + } + }, "source-map-resolve": { "version": "0.5.2", "resolved": "http://r.cnpmjs.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz", @@ -9655,68 +10940,86 @@ "integrity": "sha1-enzShHDMbToc/m1miG9rxDDTrIc=" }, "spdy": { - "version": "3.4.7", - "resolved": "http://r.cnpmjs.org/spdy/download/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/spdy/download/spdy-4.0.0.tgz", + "integrity": "sha1-gfIitadDoymqEs6mo5DmDpthPFI=", "dev": true, "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", + "debug": "4.1.1", + "handle-thing": "2.0.0", "http-deceiver": "1.2.7", - "safe-buffer": "5.1.2", "select-hose": "2.0.0", - "spdy-transport": "2.1.0" + "spdy-transport": "3.0.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "version": "4.1.1", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", "dev": true } } }, "spdy-transport": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/spdy-transport/download/spdy-transport-2.1.0.tgz", - "integrity": "sha1-S7sVqv/tC+791WrWHb3Iuj4st6E=", + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz", + "integrity": "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=", "dev": true, "requires": { - "debug": "2.6.9", - "detect-node": "2.0.3", + "debug": "4.1.1", + "detect-node": "2.0.4", "hpack.js": "2.1.6", "obuf": "1.1.2", - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2", + "readable-stream": "3.1.1", "wbuf": "1.7.3" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "version": "4.1.1", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", "dev": true + }, + "readable-stream": { + "version": "3.1.1", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-3.1.1.tgz", + "integrity": "sha1-7Wu8bFuliwkAOf8YzmcFFXla6wY=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } } } }, + "speed-measure-webpack-plugin": { + "version": "1.2.5", + "resolved": "http://registry.npm.taobao.org/speed-measure-webpack-plugin/download/speed-measure-webpack-plugin-1.2.5.tgz", + "integrity": "sha1-gXmTbrjF6JH3SBvVB1qeqaD3SCM=", + "dev": true, + "requires": { + "chalk": "2.2.2" + } + }, "split-string": { "version": "3.1.0", "resolved": "http://r.cnpmjs.org/split-string/download/split-string-3.1.0.tgz", @@ -9779,9 +11082,9 @@ } }, "stats-webpack-plugin": { - "version": "0.6.2", - "resolved": "http://registry.npm.taobao.org/stats-webpack-plugin/download/stats-webpack-plugin-0.6.2.tgz", - "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=", + "version": "0.7.0", + "resolved": "http://registry.npm.taobao.org/stats-webpack-plugin/download/stats-webpack-plugin-0.7.0.tgz", + "integrity": "sha1-zP/pt0Xei7sVVXHgY/gmP8DivAY=", "dev": true, "requires": { "lodash": "4.17.10" @@ -9794,9 +11097,9 @@ "dev": true }, "stdout-stream": { - "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/stdout-stream/download/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "version": "1.4.1", + "resolved": "http://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz", + "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=", "dev": true, "optional": true, "requires": { @@ -9860,13 +11163,6 @@ "safe-buffer": "5.1.2" } }, - "stringstream": { - "version": "0.0.6", - "resolved": "http://r.cnpmjs.org/stringstream/download/stringstream-0.0.6.tgz", - "integrity": "sha1-eIAiWw1K0Q4wkn0Weh1vL9OzOnI=", - "dev": true, - "optional": true - }, "strip-ansi": { "version": "3.0.1", "resolved": "http://r.cnpmjs.org/strip-ansi/download/strip-ansi-3.0.1.tgz", @@ -9896,18 +11192,56 @@ "resolved": "http://r.cnpmjs.org/strip-indent/download/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, + "optional": true, "requires": { "get-stdin": "4.0.1" } }, "style-loader": { - "version": "0.21.0", - "resolved": "http://registry.npm.taobao.org/style-loader/download/style-loader-0.21.0.tgz", - "integrity": "sha1-aMUuXrKvycqStidL4nfuWa6jqFI=", + "version": "0.23.1", + "resolved": "http://registry.npm.taobao.org/style-loader/download/style-loader-0.23.1.tgz", + "integrity": "sha1-y5FUYG8+dxq2xKtjcCahBJF02SU=", "dev": true, "requires": { "loader-utils": "1.1.0", - "schema-utils": "0.4.5" + "schema-utils": "1.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", + "dev": true, + "requires": { + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" + } + } } }, "stylus": { @@ -9938,70 +11272,336 @@ "path-is-absolute": "1.0.1" } }, - "source-map": { - "version": "0.1.43", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "source-map": { + "version": "0.1.43", + "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "stylus-loader": { + "version": "3.0.2", + "resolved": "http://r.cnpmjs.org/stylus-loader/download/stylus-loader-3.0.2.tgz", + "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz", + "integrity": "sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q=", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz", + "integrity": "sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ=", + "dev": true + }, + "tapable": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.0.0.tgz", + "integrity": "sha1-y7Y52QAu7ZxrWXXrIFmNeTbx+fI=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "http://r.cnpmjs.org/tar/download/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "terser": { + "version": "3.14.1", + "resolved": "http://registry.npm.taobao.org/terser/download/terser-3.14.1.tgz", + "integrity": "sha1-zEdkAUr1cLx5x5dCNYvUaSYBijI=", + "dev": true, + "requires": { + "commander": "2.17.1", + "source-map": "0.6.1", + "source-map-support": "0.5.6" + }, + "dependencies": { + "commander": { + "version": "2.17.1", + "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz", + "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + } + } + }, + "terser-webpack-plugin": { + "version": "1.2.1", + "resolved": "http://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.2.1.tgz", + "integrity": "sha1-dUXamuX0+a5qCslh60b158hFzCY=", + "dev": true, + "requires": { + "cacache": "11.3.2", + "find-cache-dir": "2.0.0", + "schema-utils": "1.0.0", + "serialize-javascript": "1.5.0", + "source-map": "0.6.1", + "terser": "3.14.1", + "webpack-sources": "1.1.0", + "worker-farm": "1.6.0" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, + "bluebird": { + "version": "3.5.3", + "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", + "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", + "dev": true + }, + "cacache": { + "version": "11.3.2", + "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-11.3.2.tgz", + "integrity": "sha1-LYHjCOPSWMo4Eltna5iyrJzmm/o=", + "dev": true, + "requires": { + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" + } + }, + "chownr": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", + "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", + "dev": true + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "find-cache-dir": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-2.0.0.tgz", + "integrity": "sha1-TB+u1Z9FGEUw+51/oSOk0EqYRy0=", + "dev": true, + "requires": { + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "3.0.0" + } + }, + "find-up": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz", + "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", + "dev": true, + "requires": { + "locate-path": "3.0.0" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.15", + "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", + "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "locate-path": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz", + "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", + "dev": true, + "requires": { + "p-locate": "3.0.0", + "path-exists": "3.0.0" + } + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz", + "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=", + "dev": true, + "requires": { + "yallist": "3.0.3" + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz", + "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.2", + "through2": "2.0.5" + } + }, + "p-limit": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/p-limit/download/p-limit-2.1.0.tgz", + "integrity": "sha1-HVoNIPsScHx1imVfa7xDhrWTDWg=", + "dev": true, + "requires": { + "p-try": "2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz", + "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", + "dev": true, + "requires": { + "p-limit": "2.1.0" + } + }, + "p-try": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-2.0.0.tgz", + "integrity": "sha1-hQgLuHxkaI+keZb+j3376CEXYLE=", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz", + "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", + "dev": true, + "requires": { + "find-up": "3.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz", + "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", + "dev": true, + "requires": { + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "ssri": { + "version": "6.0.1", + "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz", + "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=", + "dev": true, + "requires": { + "figgy-pudding": "3.5.1" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz", + "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", + "dev": true, + "requires": { + "readable-stream": "2.3.6", + "xtend": "4.0.1" + } + }, + "unique-filename": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", + "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", "dev": true, "requires": { - "amdefine": "1.0.1" + "unique-slug": "2.0.0" } + }, + "yallist": { + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", + "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", + "dev": true } } }, - "stylus-loader": { - "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/stylus-loader/download/stylus-loader-3.0.2.tgz", - "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz", - "integrity": "sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q=", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz", - "integrity": "sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ=", - "dev": true - }, - "tapable": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.0.0.tgz", - "integrity": "sha1-y7Y52QAu7ZxrWXXrIFmNeTbx+fI=", - "dev": true - }, - "tar": { - "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/tar/download/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, "tether": { "version": "1.4.4", "resolved": "http://registry.npm.taobao.org/tether/download/tether-1.4.4.tgz", "integrity": "sha1-ncbrKz5gHaIJj9Jk5/eosmTeESU=" }, - "text-table": { - "version": "0.2.0", - "resolved": "http://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, "thenify": { "version": "3.3.0", "resolved": "http://r.cnpmjs.org/thenify/download/thenify-3.3.0.tgz", @@ -10065,9 +11665,9 @@ } }, "thunky": { - "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/thunky/download/thunky-1.0.2.tgz", - "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=", + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/thunky/download/thunky-1.0.3.tgz", + "integrity": "sha1-9d9zJFNAewkZHa5z4qjMc/OBqCY=", "dev": true }, "timed-out": { @@ -10159,12 +11759,6 @@ "repeat-string": "1.6.1" } }, - "toposort": { - "version": "1.0.7", - "resolved": "http://r.cnpmjs.org/toposort/download/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", - "dev": true - }, "tough-cookie": { "version": "2.3.4", "resolved": "http://r.cnpmjs.org/tough-cookie/download/tough-cookie-2.3.4.tgz", @@ -10192,7 +11786,8 @@ "version": "1.0.0", "resolved": "http://r.cnpmjs.org/trim-newlines/download/trim-newlines-1.0.0.tgz", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true + "dev": true, + "optional": true }, "trim-right": { "version": "1.0.1", @@ -10201,29 +11796,13 @@ "dev": true }, "true-case-path": { - "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/true-case-path/download/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz", + "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=", "dev": true, "optional": true, "requires": { - "glob": "6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "http://r.cnpmjs.org/glob/download/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "optional": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } + "glob": "7.1.2" } }, "ts-node": { @@ -10382,24 +11961,6 @@ "integrity": "sha1-LWFaHvSu5PV0Qlzf9wJu34GRmDY=", "dev": true }, - "uglify-js": { - "version": "3.4.3", - "resolved": "http://r.cnpmjs.org/uglify-js/download/uglify-js-3.4.3.tgz", - "integrity": "sha1-pP11e280qV9xf3p6Dcyvyqpgz38=", - "dev": true, - "requires": { - "commander": "2.16.0", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true - } - } - }, "uglify-to-browserify": { "version": "1.0.2", "resolved": "http://r.cnpmjs.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz", @@ -10563,16 +12124,10 @@ "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=", "dev": true }, - "upper-case": { - "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/upper-case/download/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, "uri-js": { - "version": "3.0.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-3.0.2.tgz", - "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", + "version": "4.2.2", + "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", + "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", "dev": true, "requires": { "punycode": "2.1.1" @@ -10602,31 +12157,6 @@ } } }, - "url-join": { - "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/url-join/download/url-join-4.0.0.tgz", - "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=", - "dev": true - }, - "url-loader": { - "version": "1.0.1", - "resolved": "http://registry.npm.taobao.org/url-loader/download/url-loader-1.0.1.tgz", - "integrity": "sha1-YbxT8fGE1zQ9onKKEonvhyLqRe4=", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mime": "2.3.1", - "schema-utils": "0.4.5" - }, - "dependencies": { - "mime": { - "version": "2.3.1", - "resolved": "http://registry.npm.taobao.org/mime/download/mime-2.3.1.tgz", - "integrity": "sha1-sWIcVNY7l8R9PP5/chX31kUXw2k=", - "dev": true - } - } - }, "url-parse": { "version": "1.4.1", "resolved": "http://r.cnpmjs.org/url-parse/download/url-parse-1.4.1.tgz", @@ -10677,22 +12207,6 @@ "resolved": "http://r.cnpmjs.org/util-deprecate/download/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "util.promisify": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.0.tgz", - "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "object.getownpropertydescriptors": "2.0.3" - } - }, - "utila": { - "version": "0.4.0", - "resolved": "http://r.cnpmjs.org/utila/download/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", - "dev": true - }, "utils-merge": { "version": "1.0.1", "resolved": "http://r.cnpmjs.org/utils-merge/download/utils-merge-1.0.1.tgz", @@ -10921,64 +12435,75 @@ } }, "webpack-dev-middleware": { - "version": "3.1.3", - "resolved": "http://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.1.3.tgz", - "integrity": "sha1-izKqQ9qa55Nowb8Rg/K2z14fOe0=", + "version": "3.4.0", + "resolved": "http://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.4.0.tgz", + "integrity": "sha1-ETL+zJAm/ZDw7O2sXL/3XR+0WJA=", "dev": true, "requires": { - "loud-rejection": "1.6.0", "memory-fs": "0.4.1", - "mime": "2.3.1", - "path-is-absolute": "1.0.1", + "mime": "2.4.0", "range-parser": "1.2.0", - "url-join": "4.0.0", - "webpack-log": "1.2.0" + "webpack-log": "2.0.0" }, "dependencies": { "mime": { - "version": "2.3.1", - "resolved": "http://registry.npm.taobao.org/mime/download/mime-2.3.1.tgz", - "integrity": "sha1-sWIcVNY7l8R9PP5/chX31kUXw2k=", + "version": "2.4.0", + "resolved": "http://registry.npm.taobao.org/mime/download/mime-2.4.0.tgz", + "integrity": "sha1-4FH9iBNYWF8yed8zP+aU2gvP/dY=", "dev": true } } }, "webpack-dev-server": { - "version": "3.1.4", - "resolved": "http://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.1.4.tgz", - "integrity": "sha1-mgjRPErd0eO22KzhFuhnFQlK1bQ=", + "version": "3.1.14", + "resolved": "http://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.1.14.tgz", + "integrity": "sha1-YPsim5l/xaCh/GI3QhAwGAlZ1Gk=", "dev": true, "requires": { "ansi-html": "0.0.7", - "array-includes": "3.0.3", "bonjour": "3.5.0", "chokidar": "2.0.4", - "compression": "1.7.2", - "connect-history-api-fallback": "1.5.0", - "debug": "3.1.0", + "compression": "1.7.3", + "connect-history-api-fallback": "1.6.0", + "debug": "3.2.6", "del": "3.0.0", - "express": "4.16.3", + "express": "4.16.4", "html-entities": "1.2.1", "http-proxy-middleware": "0.18.0", - "import-local": "1.0.0", - "internal-ip": "1.2.0", + "import-local": "2.0.0", + "internal-ip": "3.0.1", "ip": "1.1.5", - "killable": "1.0.0", + "killable": "1.0.1", "loglevel": "1.6.1", "opn": "5.3.0", - "portfinder": "1.0.13", - "selfsigned": "1.10.3", + "portfinder": "1.0.17", + "schema-utils": "1.0.0", + "selfsigned": "1.10.4", + "semver": "5.6.0", "serve-index": "1.9.1", "sockjs": "0.3.19", - "sockjs-client": "1.1.4", - "spdy": "3.4.7", + "sockjs-client": "1.3.0", + "spdy": "4.0.0", "strip-ansi": "3.0.1", "supports-color": "5.4.0", - "webpack-dev-middleware": "3.1.3", - "webpack-log": "1.2.0", - "yargs": "11.0.0" + "url": "0.11.0", + "webpack-dev-middleware": "3.4.0", + "webpack-log": "2.0.0", + "yargs": "12.0.2" }, "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", + "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", + "dev": true, + "requires": { + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" + } + }, "ansi-regex": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", @@ -11013,61 +12538,202 @@ } } }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz", + "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", + "dev": true, + "requires": { + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.6.0", + "shebang-command": "1.2.0", + "which": "1.3.1" + } + }, "debug": { - "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "version": "3.2.6", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" + } + }, + "decamelize": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/decamelize/download/decamelize-2.0.0.tgz", + "integrity": "sha1-ZW17vICUxMeI6lPFhAkIycfQY8c=", + "dev": true, + "requires": { + "xregexp": "4.0.0" + } + }, + "eventsource": { + "version": "1.0.7", + "resolved": "http://registry.npm.taobao.org/eventsource/download/eventsource-1.0.7.tgz", + "integrity": "sha1-j7xyyT/NNAiAkLwKTmT0tc7m2NA=", + "dev": true, + "requires": { + "original": "1.0.1" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/execa/download/execa-1.0.0.tgz", + "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=", + "dev": true, + "requires": { + "cross-spawn": "6.0.5", + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz", + "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", + "dev": true, + "requires": { + "locate-path": "3.0.0" } }, + "get-stream": { + "version": "4.1.0", + "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz", + "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=", + "dev": true, + "requires": { + "pump": "3.0.0" + } + }, + "invert-kv": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz", + "integrity": "sha1-c5P1r6Weyf9fZ6J2INEcIm4+7AI=", + "dev": true + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "ms": { + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "lcid": { "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "resolved": "http://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz", + "integrity": "sha1-bvXS32DlL4LrIopMNz6NHzlyU88=", + "dev": true, + "requires": { + "invert-kv": "2.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz", + "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", + "dev": true, + "requires": { + "p-locate": "3.0.0", + "path-exists": "3.0.0" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", "dev": true }, "os-locale": { + "version": "3.1.0", + "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz", + "integrity": "sha1-qAKm7hfyTBBIOrmTVxnO9O0Wvxo=", + "dev": true, + "requires": { + "execa": "1.0.0", + "lcid": "2.0.0", + "mem": "4.0.0" + } + }, + "p-limit": { "version": "2.1.0", - "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz", - "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", + "resolved": "http://registry.npm.taobao.org/p-limit/download/p-limit-2.1.0.tgz", + "integrity": "sha1-HVoNIPsScHx1imVfa7xDhrWTDWg=", + "dev": true, + "requires": { + "p-try": "2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz", + "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", + "dev": true, + "requires": { + "p-limit": "2.1.0" + } + }, + "p-try": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-2.0.0.tgz", + "integrity": "sha1-hQgLuHxkaI+keZb+j3376CEXYLE=", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz", + "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "ajv": "6.7.0", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" } }, + "semver": { + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + }, "sockjs-client": { - "version": "1.1.4", - "resolved": "http://r.cnpmjs.org/sockjs-client/download/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.3.0.tgz", + "integrity": "sha1-EvydbLZj2lc509xftuhofalcsXc=", "dev": true, "requires": { - "debug": "2.6.9", - "eventsource": "0.1.6", + "debug": "3.2.6", + "eventsource": "1.0.7", "faye-websocket": "0.11.1", "inherits": "2.0.3", "json3": "3.3.2", - "url-parse": "1.4.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "url-parse": "1.4.4" } }, "string-width": { @@ -11091,42 +12757,46 @@ } } }, + "url-parse": { + "version": "1.4.4", + "resolved": "http://registry.npm.taobao.org/url-parse/download/url-parse-1.4.4.tgz", + "integrity": "sha1-ysFVbpX6oDA2kf7Fz51aG8NGSPg=", + "dev": true, + "requires": { + "querystringify": "2.0.0", + "requires-port": "1.0.0" + } + }, "which-module": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, - "y18n": { - "version": "3.2.1", - "resolved": "http://r.cnpmjs.org/y18n/download/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, "yargs": { - "version": "11.0.0", - "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-11.0.0.tgz", - "integrity": "sha1-wFKTEAbF7udGEOX8A1S+39CKIBs=", + "version": "12.0.2", + "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-12.0.2.tgz", + "integrity": "sha1-/lgjQ2k5KvM+y+9TgZFx7/D1qtw=", "dev": true, "requires": { "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", + "decamelize": "2.0.0", + "find-up": "3.0.0", + "get-caller-file": "1.0.3", + "os-locale": "3.1.0", "require-directory": "2.1.1", "require-main-filename": "1.0.1", "set-blocking": "2.0.0", "string-width": "2.1.1", "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "y18n": "4.0.0", + "yargs-parser": "10.1.0" } }, "yargs-parser": { - "version": "9.0.2", - "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "version": "10.1.0", + "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-10.1.0.tgz", + "integrity": "sha1-cgImW4n36eny5XZeD+c1qQXtuqg=", "dev": true, "requires": { "camelcase": "4.1.0" @@ -11135,14 +12805,12 @@ } }, "webpack-log": { - "version": "1.2.0", - "resolved": "http://registry.npm.taobao.org/webpack-log/download/webpack-log-1.2.0.tgz", - "integrity": "sha1-pLNM2msitRjbsKsy5WeWLVxypD0=", + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/webpack-log/download/webpack-log-2.0.0.tgz", + "integrity": "sha1-W3ko4GN1k/EZ0y9iJ8HgrDHhtH8=", "dev": true, "requires": { - "chalk": "2.2.2", - "log-symbols": "2.2.0", - "loglevelnext": "1.0.5", + "ansi-colors": "3.2.3", "uuid": "3.3.2" }, "dependencies": { @@ -11155,9 +12823,9 @@ } }, "webpack-merge": { - "version": "4.1.3", - "resolved": "http://r.cnpmjs.org/webpack-merge/download/webpack-merge-4.1.3.tgz", - "integrity": "sha1-iq/yEIoZwphJvJrSp/1/zmjofEo=", + "version": "4.1.4", + "resolved": "http://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.1.4.tgz", + "integrity": "sha1-D9446r8tX9hSUcJKWoxI+KP063s=", "dev": true, "requires": { "lodash": "4.17.10" @@ -11182,9 +12850,9 @@ } }, "webpack-subresource-integrity": { - "version": "1.1.0-rc.4", - "resolved": "http://registry.npm.taobao.org/webpack-subresource-integrity/download/webpack-subresource-integrity-1.1.0-rc.4.tgz", - "integrity": "sha1-xcTj1pD50vZKlVDgeodn+Xlqpdg=", + "version": "1.1.0-rc.6", + "resolved": "http://registry.npm.taobao.org/webpack-subresource-integrity/download/webpack-subresource-integrity-1.1.0-rc.6.tgz", + "integrity": "sha1-N/bxJk4es3jkFGWpjagPrXariIY=", "dev": true, "requires": { "webpack-core": "0.6.9" @@ -11323,6 +12991,12 @@ "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", "dev": true }, + "xregexp": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/xregexp/download/xregexp-4.0.0.tgz", + "integrity": "sha1-5pgYneSd0qGMxWh7BeF8jkOUMCA=", + "dev": true + }, "xtend": { "version": "4.0.1", "resolved": "http://r.cnpmjs.org/xtend/download/xtend-4.0.1.tgz", @@ -11333,15 +13007,6 @@ "resolved": "http://r.cnpmjs.org/xterm/download/xterm-3.4.1.tgz", "integrity": "sha1-EkUpeeotszcfgZWDLXQHq7qYiYA=" }, - "xxhashjs": { - "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/xxhashjs/download/xxhashjs-0.2.2.tgz", - "integrity": "sha1-imJRVnYhocRqWuIE2gJJx/jKqdg=", - "dev": true, - "requires": { - "cuint": "0.2.2" - } - }, "y18n": { "version": "4.0.0", "resolved": "http://r.cnpmjs.org/y18n/download/y18n-4.0.0.tgz", diff --git a/src/frontend/package.json b/src/frontend/package.json index f2b72fc75..7db5cf7a9 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -48,12 +48,13 @@ "rxjs": "^6.0.0", "rxjs-compat": "^6.2.1", "sockjs-client": "^1.1.4", + "tslib": "^1.9.0", "xterm": "^3.2.0", "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.6.0", - "@angular/cli": "~6.1.1", + "@angular-devkit/build-angular": "~0.12.0", + "@angular/cli": "~7.2.3", "@angular/compiler-cli": "^6.1.1", "@angular/language-service": "^6.1.1", "@angularclass/hmr": "^2.1.3", diff --git a/src/frontend/src/polyfills.ts b/src/frontend/src/polyfills.ts index bc77b2014..33977351c 100644 --- a/src/frontend/src/polyfills.ts +++ b/src/frontend/src/polyfills.ts @@ -42,7 +42,7 @@ /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; + import '_requestAnimationFrame.polyfill'; /*************************************************************************************************** * Zone JS is required by Angular itself. diff --git a/src/frontend/tsconfig.json b/src/frontend/tsconfig.json index 2e2f5a9e9..2e85ea591 100644 --- a/src/frontend/tsconfig.json +++ b/src/frontend/tsconfig.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "importHelpers": true, "outDir": "./dist/out-tsc", "baseUrl": "src", "sourceMap": true, From 96ec2c62a754125cf28ed0a5820913bdd02d587f Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 24 Jan 2019 10:53:19 +0800 Subject: [PATCH 027/112] frontend: update augular rxjs --- src/frontend/package-lock.json | 401 ++++++++++++++++++++++++++------- src/frontend/package.json | 28 +-- 2 files changed, 334 insertions(+), 95 deletions(-) diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index b45401457..7c516c086 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -572,9 +572,9 @@ } }, "@angular/animations": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/animations/download/@angular/animations-6.1.9.tgz", - "integrity": "sha1-HYdGnm9riahxNXDfvpdwDqhb0Ac=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/animations/download/@angular/animations-7.2.2.tgz", + "integrity": "sha1-qB5Ppg3i4z7EYrQ68SKmaSbfcvs=", "requires": { "tslib": "1.9.3" } @@ -676,33 +676,46 @@ } }, "@angular/common": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/common/download/@angular/common-6.1.9.tgz", - "integrity": "sha1-Y4+o6OMGJhFuqeo25vLwD+2XH3c=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/common/download/@angular/common-7.2.2.tgz", + "integrity": "sha1-8inrUuN6zz205GTJNQIXE6HXGVs=", "requires": { "tslib": "1.9.3" } }, "@angular/compiler": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/compiler/download/@angular/compiler-6.1.9.tgz", - "integrity": "sha1-NpZln3UrXiOfUYbOpyzxeWW1nLg=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/compiler/download/@angular/compiler-7.2.2.tgz", + "integrity": "sha1-fgJR8Sg6WMDJkfeXXrOOLKsCprU=", "requires": { "tslib": "1.9.3" } }, "@angular/compiler-cli": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/compiler-cli/download/@angular/compiler-cli-6.1.9.tgz", - "integrity": "sha1-msVvw+onTIl8y7PD/gqqEAwBE30=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/compiler-cli/download/@angular/compiler-cli-7.2.2.tgz", + "integrity": "sha1-dMtc56HcF/LWhklYTQTnpye3AgM=", "dev": true, "requires": { + "canonical-path": "1.0.0", "chokidar": "1.7.0", + "convert-source-map": "1.6.0", + "dependency-graph": "0.7.2", + "magic-string": "0.25.1", "minimist": "1.2.0", - "reflect-metadata": "0.1.12", - "tsickle": "0.32.1" + "reflect-metadata": "0.1.13", + "shelljs": "0.8.3", + "source-map": "0.6.1", + "tslib": "1.9.3", + "yargs": "9.0.1" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "http://registry.npm.taobao.org/anymatch/download/anymatch-1.3.2.tgz", @@ -739,6 +752,12 @@ "repeat-element": "1.1.2" } }, + "camelcase": { + "version": "4.1.0", + "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, "chokidar": { "version": "1.7.0", "resolved": "http://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz", @@ -755,6 +774,56 @@ "readdirp": "2.1.0" } }, + "cliui": { + "version": "3.2.0", + "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "http://registry.npm.taobao.org/execa/download/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, "expand-brackets": { "version": "0.1.5", "resolved": "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-0.1.5.tgz", @@ -806,6 +875,27 @@ "is-buffer": "1.1.6" } }, + "load-json-file": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "mem": { + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/mem/download/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.2.0" + } + }, "micromatch": { "version": "2.3.11", "resolved": "http://registry.npm.taobao.org/micromatch/download/micromatch-2.3.11.tgz", @@ -826,59 +916,187 @@ "parse-glob": "3.0.4", "regex-cache": "0.4.4" } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz", + "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "which-module": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, + "yargs": { + "version": "9.0.1", + "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-9.0.1.tgz", + "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", + "dev": true, + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + } + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } } } }, "@angular/core": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/core/download/@angular/core-6.1.9.tgz", - "integrity": "sha1-oho13lUclfJ27LsfMUlJzGkyaVA=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/core/download/@angular/core-7.2.2.tgz", + "integrity": "sha1-oAgdlD9Dm3xPxL/Yd3V5Me1+32M=", "requires": { "tslib": "1.9.3" } }, "@angular/forms": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/forms/download/@angular/forms-6.1.9.tgz", - "integrity": "sha1-2dhZH0x0Jw5T4xhOtF4ZukkP3zI=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/forms/download/@angular/forms-7.2.2.tgz", + "integrity": "sha1-1DkhbbUwcvP+g9uHfojbWlbjfEE=", "requires": { "tslib": "1.9.3" } }, "@angular/http": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/http/download/@angular/http-6.1.9.tgz", - "integrity": "sha1-JB81IH1i+GvBVf6xJKHnNRXWb7Y=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/http/download/@angular/http-7.2.2.tgz", + "integrity": "sha1-sk3lH94xkpucbZSldAVlEq66bew=", "requires": { "tslib": "1.9.3" } }, "@angular/language-service": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/language-service/download/@angular/language-service-6.1.9.tgz", - "integrity": "sha1-yoL1F3W8+cz1ZCEimskBa7Y7mIU=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/language-service/download/@angular/language-service-7.2.2.tgz", + "integrity": "sha1-FkArd3OkDRv0KkTGlXsWBxE1I50=", "dev": true }, "@angular/platform-browser": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/platform-browser/download/@angular/platform-browser-6.1.9.tgz", - "integrity": "sha1-bIMuUoxmCtiAoWUxdU5lubl9T58=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/platform-browser/download/@angular/platform-browser-7.2.2.tgz", + "integrity": "sha1-V1UhJeP/jhXKy5y37SPkvQYvQNA=", "requires": { "tslib": "1.9.3" } }, "@angular/platform-browser-dynamic": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/platform-browser-dynamic/download/@angular/platform-browser-dynamic-6.1.9.tgz", - "integrity": "sha1-4A8aSUi0wpmxfJVh2D9+pYgReBg=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/platform-browser-dynamic/download/@angular/platform-browser-dynamic-7.2.2.tgz", + "integrity": "sha1-sefmnDp8c+1+SRllWyyaraeZBW8=", "requires": { "tslib": "1.9.3" } }, "@angular/router": { - "version": "6.1.9", - "resolved": "http://registry.npm.taobao.org/@angular/router/download/@angular/router-6.1.9.tgz", - "integrity": "sha1-KYaeU0QnA8U6lDzjdcuwoPNpJ/s=", + "version": "7.2.2", + "resolved": "http://registry.npm.taobao.org/@angular/router/download/@angular/router-7.2.2.tgz", + "integrity": "sha1-fH0qKaHrYGvZEikZOU0UJ9/6pAw=", "requires": { "tslib": "1.9.3" } @@ -2661,6 +2879,12 @@ "integrity": "sha1-wji6uCvttGK8vcYdAzSTLcwITYo=", "dev": true }, + "canonical-path": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/canonical-path/download/canonical-path-1.0.0.tgz", + "integrity": "sha1-/LRwwjlY3vhQgYVr56hukE8YDR0=", + "dev": true + }, "capture-stack-trace": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/capture-stack-trace/download/capture-stack-trace-1.0.0.tgz", @@ -3626,6 +3850,12 @@ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, + "dependency-graph": { + "version": "0.7.2", + "resolved": "http://registry.npm.taobao.org/dependency-graph/download/dependency-graph-0.7.2.tgz", + "integrity": "sha1-kdud5utyaZIJ2IrqTB/VIhysHEk=", + "dev": true + }, "des.js": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/des.js/download/des.js-1.0.0.tgz", @@ -5713,7 +5943,7 @@ "lodash": "4.17.10", "mute-stream": "0.0.7", "run-async": "2.3.0", - "rxjs": "6.2.1", + "rxjs": "6.3.3", "string-width": "2.1.1", "strip-ansi": "5.0.0", "through": "2.3.8" @@ -5781,6 +6011,12 @@ "ipaddr.js": "1.8.0" } }, + "interpret": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/interpret/download/interpret-1.2.0.tgz", + "integrity": "sha1-1QYaYiS+WOgIOYX1AU2EQ1lXYpY=", + "dev": true + }, "invariant": { "version": "2.2.4", "resolved": "http://r.cnpmjs.org/invariant/download/invariant-2.2.4.tgz", @@ -5794,8 +6030,7 @@ "version": "1.0.0", "resolved": "http://r.cnpmjs.org/invert-kv/download/invert-kv-1.0.0.tgz", "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true, - "optional": true + "dev": true }, "ip": { "version": "1.1.5", @@ -6358,15 +6593,6 @@ "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, - "jasmine-diff": { - "version": "0.1.3", - "resolved": "http://registry.npm.taobao.org/jasmine-diff/download/jasmine-diff-0.1.3.tgz", - "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=", - "dev": true, - "requires": { - "diff": "3.5.0" - } - }, "jasmine-spec-reporter": { "version": "4.2.1", "resolved": "http://r.cnpmjs.org/jasmine-spec-reporter/download/jasmine-spec-reporter-4.2.1.tgz", @@ -6782,7 +7008,6 @@ "resolved": "http://r.cnpmjs.org/lcid/download/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, - "optional": true, "requires": { "invert-kv": "1.0.0" } @@ -7058,6 +7283,15 @@ "yallist": "2.1.2" } }, + "magic-string": { + "version": "0.25.1", + "resolved": "http://registry.npm.taobao.org/magic-string/download/magic-string-0.25.1.tgz", + "integrity": "sha1-scJIs5nNdIXaD+c4XC/HARhDJm4=", + "dev": true, + "requires": { + "sourcemap-codec": "1.4.4" + } + }, "make-dir": { "version": "1.3.0", "resolved": "http://r.cnpmjs.org/make-dir/download/make-dir-1.3.0.tgz", @@ -9712,6 +9946,15 @@ "set-immediate-shim": "1.0.1" } }, + "rechoir": { + "version": "0.6.2", + "resolved": "http://registry.npm.taobao.org/rechoir/download/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.8.1" + } + }, "redent": { "version": "1.0.0", "resolved": "http://r.cnpmjs.org/redent/download/redent-1.0.0.tgz", @@ -9724,9 +9967,9 @@ } }, "reflect-metadata": { - "version": "0.1.12", - "resolved": "http://r.cnpmjs.org/reflect-metadata/download/reflect-metadata-0.1.12.tgz", - "integrity": "sha1-MRvwxrY814LyKKgavhRqK/qcVvI=", + "version": "0.1.13", + "resolved": "http://registry.npm.taobao.org/reflect-metadata/download/reflect-metadata-0.1.13.tgz", + "integrity": "sha1-Z648pXyXKiqhZCsQ/jY/4y1J3Ag=", "dev": true }, "regenerate": { @@ -9978,9 +10221,9 @@ } }, "rxjs": { - "version": "6.2.1", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.2.1.tgz", - "integrity": "sha1-JGzr7BiabLwUOj759i1vTJGBPKE=", + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", + "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", "requires": { "tslib": "1.9.3" } @@ -10489,6 +10732,17 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shelljs": { + "version": "0.8.3", + "resolved": "http://registry.npm.taobao.org/shelljs/download/shelljs-0.8.3.tgz", + "integrity": "sha1-p/MxlSDr8J7oEnWyNorbKGZZsJc=", + "dev": true, + "requires": { + "glob": "7.1.2", + "interpret": "1.2.0", + "rechoir": "0.6.2" + } + }, "signal-exit": { "version": "3.0.2", "resolved": "http://r.cnpmjs.org/signal-exit/download/signal-exit-3.0.2.tgz", @@ -10911,6 +11165,12 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sourcemap-codec": { + "version": "1.4.4", + "resolved": "http://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.4.tgz", + "integrity": "sha1-xj6pJ8Ap3WvZorf6A7P+wCrVbp8=", + "dev": true + }, "spdx-correct": { "version": "3.0.0", "resolved": "http://r.cnpmjs.org/spdx-correct/download/spdx-correct-3.0.0.tgz", @@ -11834,27 +12094,6 @@ } } }, - "tsickle": { - "version": "0.32.1", - "resolved": "http://registry.npm.taobao.org/tsickle/download/tsickle-0.32.1.tgz", - "integrity": "sha1-8W6UuoCzL8nr4yDclPvCyn81IaU=", - "dev": true, - "requires": { - "jasmine-diff": "0.1.3", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map": "0.6.1", - "source-map-support": "0.5.6" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true - } - } - }, "tslib": { "version": "1.9.3", "resolved": "http://r.cnpmjs.org/tslib/download/tslib-1.9.3.tgz", @@ -11956,9 +12195,9 @@ "dev": true }, "typescript": { - "version": "2.7.2", - "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-2.7.2.tgz", - "integrity": "sha1-LWFaHvSu5PV0Qlzf9wJu34GRmDY=", + "version": "3.2.4", + "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-3.2.4.tgz", + "integrity": "sha1-xYXLlSkSJj2RW0YnJs4kS6UQ7z0=", "dev": true }, "uglify-to-browserify": { @@ -13064,9 +13303,9 @@ "dev": true }, "zone.js": { - "version": "0.8.26", - "resolved": "http://r.cnpmjs.org/zone.js/download/zone.js-0.8.26.tgz", - "integrity": "sha1-e91y92aMWnrWsRgUi06jnFnQjS0=" + "version": "0.8.29", + "resolved": "http://registry.npm.taobao.org/zone.js/download/zone.js-0.8.29.tgz", + "integrity": "sha1-jc6Sqg3VU7ULxb+7kK+Zhq2EWhI=" }, "zrender": { "version": "4.0.4", diff --git a/src/frontend/package.json b/src/frontend/package.json index 7db5cf7a9..5c3f48de5 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@angular/animations": "^6.1.1", - "@angular/common": "^6.1.1", - "@angular/compiler": "^6.1.1", - "@angular/core": "^6.1.1", - "@angular/forms": "^6.1.1", - "@angular/http": "^6.1.1", - "@angular/platform-browser": "^6.1.1", - "@angular/platform-browser-dynamic": "^6.1.1", - "@angular/router": "^6.1.1", + "@angular/animations": "^7.2.2", + "@angular/common": "^7.2.2", + "@angular/compiler": "^7.2.2", + "@angular/core": "^7.2.2", + "@angular/forms": "^7.2.2", + "@angular/http": "^7.2.2", + "@angular/platform-browser": "^7.2.2", + "@angular/platform-browser-dynamic": "^7.2.2", + "@angular/router": "^7.2.2", "@clr/angular": "^0.12.14", "@clr/icons": "^0.12.14", "@clr/ui": "^0.12.14", @@ -45,18 +45,18 @@ "ngx-markdown": "^6.3.0", "particlesjs": "^2.2.3", "raven-js": "^3.21.0", - "rxjs": "^6.0.0", + "rxjs": "^6.3.3", "rxjs-compat": "^6.2.1", "sockjs-client": "^1.1.4", "tslib": "^1.9.0", "xterm": "^3.2.0", - "zone.js": "^0.8.26" + "zone.js": "^0.8.29" }, "devDependencies": { "@angular-devkit/build-angular": "~0.12.0", "@angular/cli": "~7.2.3", - "@angular/compiler-cli": "^6.1.1", - "@angular/language-service": "^6.1.1", + "@angular/compiler-cli": "^7.2.2", + "@angular/language-service": "^7.2.2", "@angularclass/hmr": "^2.1.3", "@types/ace": "^0.0.40", "@types/d3-scale": "^2.0.1", @@ -81,7 +81,7 @@ "protractor": "~5.3.0", "ts-node": "~5.0.1", "tslint": "^5.9.1", - "typescript": "~2.7.2", + "typescript": "~3.2.4", "webpack": "4.8.3" } } From df9fa98258dd29fc17a48d7f73e96cc65c29805a Mon Sep 17 00:00:00 2001 From: silenceshell Date: Thu, 24 Jan 2019 13:48:14 +0800 Subject: [PATCH 028/112] =?UTF-8?q?i18n:=20=E4=BF=A9=E4=B8=AA=20=E5=BA=94?= =?UTF-8?q?=E4=B8=BA=20=E4=B8=A4=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 俩个 应为 两个 --- src/frontend/src/assets/i18n/zh-Hans.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 40ff62490..e01bf624e 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -377,8 +377,8 @@ "SHARED": { "DIFF": { "CHECK_DATA": "请检查数据", - "TMP_LESS": "请选择俩个模板", - "TMP_MORE": "选择多个模板仅对比俩个", + "TMP_LESS": "请选择两个模板", + "TMP_MORE": "选择多个模板仅对比两个", "TRANS_ERROR": "模板切换失败，请检查数据" }, "COMPONENT": { From b75e2a0cbb73dd81cdbea370485f1cfcb11ceeb4 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Thu, 24 Jan 2019 15:07:31 +0800 Subject: [PATCH 029/112] frontend: update @cli/angular --- src/frontend/package-lock.json | 24 +++++++++---------- src/frontend/package.json | 8 +++---- .../src/app/admin/apikey/apikey.component.ts | 4 ++-- .../list-apikey/list-apikey.component.ts | 8 +++---- .../src/app/admin/app/app.component.ts | 4 ++-- .../admin/app/list-app/list-app.component.ts | 8 +++---- .../app/trash-app/trash-app.component.ts | 6 ++--- .../app/admin/auditlog/auditlog.component.ts | 6 ++--- .../app/admin/cluster/cluster.component.ts | 4 ++-- .../list-cluster/list-cluster.component.ts | 8 +++---- .../trash-cluster/trash-cluster.component.ts | 6 ++--- .../src/app/admin/config/config.component.ts | 4 ++-- .../list-config/list-config.component.ts | 8 +++---- .../admin/configmap/configmap.component.ts | 4 ++-- .../list-configmap.component.ts | 8 +++---- .../trash-configmap.component.ts | 6 ++--- .../configmaptpl/configmaptpl.component.ts | 4 ++-- .../list-configmaptpl.component.ts | 8 +++---- .../trash-configmaptpl.component.ts | 6 ++--- .../app/admin/cronjob/cronjob.component.ts | 4 ++-- .../list-cronjob/list-cronjob.component.ts | 8 +++---- .../trash-cronjob/trash-cronjob.component.ts | 6 ++--- .../admin/cronjobtpl/cronjobtpl.component.ts | 4 ++-- .../list-cronjobtpl.component.ts | 8 +++---- .../trash-cronjobtpl.component.ts | 6 ++--- .../admin/daemonset/daemonset.component.ts | 4 ++-- .../list-daemonset.component.ts | 8 +++---- .../trash-daemonset.component.ts | 6 ++--- .../daemonsettpl/daemonsettpl.component.ts | 4 ++-- .../list-daemonsettpl.component.ts | 8 +++---- .../trash-daemonsettpl.component.ts | 6 ++--- .../admin/deployment/deployment.component.ts | 4 ++-- .../list-deployment.component.ts | 8 +++---- .../trash-deployment.component.ts | 6 ++--- .../deploymenttpl/deploymenttpl.component.ts | 4 ++-- .../list-deploymenttpl.component.ts | 8 +++---- .../trash-deploymenttpl.component.ts | 6 ++--- .../src/app/admin/group/group.component.ts | 4 ++-- .../group/list-group/list-group.component.ts | 8 +++---- .../app/admin/ingress/ingress.component.ts | 4 ++-- .../list-ingress/list-ingress.component.ts | 8 +++---- .../trash-ingress/trash-ingress.component.ts | 6 ++--- .../admin/ingresstpl/ingresstpl.component.ts | 4 ++-- .../list-ingresstpl.component.ts | 8 +++---- .../trash-ingresstpl.component.ts | 6 ++--- .../deployment/kube-deployment.component.ts | 4 ++-- .../list/kube-list-deployment.component.ts | 8 +++---- .../kubernetes/node/list-nodes/inventory.ts | 18 +++++++------- .../node/list-nodes/list-nodes.component.ts | 4 ++-- .../list-persistentvolume/inventory.ts | 12 +++++----- .../list-persistentvolume.component.ts | 4 ++-- .../list-namespace.component.ts | 8 +++---- .../admin/namespace/namespace.component.ts | 4 ++-- .../trash-namespace.component.ts | 6 ++--- .../list-permission.component.ts | 8 +++---- .../admin/permission/permission.component.ts | 4 ++-- .../list-persistentvolumeclaim.component.ts | 8 +++---- .../persistentvolumeclaim.component.ts | 4 ++-- .../trash-persistentvolumeclaim.component.ts | 6 ++--- ...list-persistentvolumeclaimtpl.component.ts | 8 +++---- .../persistentvolumeclaimtpl.component.ts | 4 ++-- ...rash-persistentvolumeclaimtpl.component.ts | 6 ++--- .../reportform/deploy/deploy.component.ts | 4 ++-- .../list-secret/list-secret.component.ts | 8 +++---- .../src/app/admin/secret/secret.component.ts | 4 ++-- .../trash-secret/trash-secret.component.ts | 6 ++--- .../list-secrettpl.component.ts | 8 +++---- .../admin/secrettpl/secrettpl.component.ts | 4 ++-- .../trash-secrettpl.component.ts | 6 ++--- .../list-statefulset.component.ts | 8 +++---- .../statefulset/statefulset.component.ts | 4 ++-- .../trash-statefulset.component.ts | 6 ++--- .../list-statefulsettpl.component.ts | 8 +++---- .../statefulsettpl.component.ts | 4 ++-- .../trash-statefulsettpl.component.ts | 6 ++--- .../user/list-user/list-user.component.ts | 8 +++---- .../src/app/admin/user/user.component.ts | 4 ++-- .../app/portal/app-apikey/apikey.component.ts | 4 ++-- .../list-apikey/list-apikey.component.ts | 8 +++---- .../app/portal/app-user/app-user.component.ts | 4 ++-- .../list-app-user/list-app-user.component.ts | 8 +++---- .../src/app/portal/app/app.component.ts | 4 ++-- .../portal/app/list-app/list-app.component.ts | 8 +++---- .../publish-history.component.ts | 6 ++--- .../portal/configmap/configmap.component.ts | 4 ++-- .../list-configmap.component.ts | 8 +++---- .../app/portal/cronjob/cronjob.component.ts | 6 ++--- .../list-cronjob/list-cronjob.component.ts | 8 +++---- .../portal/cronjob/list-event/inventory.ts | 4 ++-- .../list-event/list-event.component.ts | 4 ++-- .../cronjob/list-job/list-job.component.ts | 6 ++--- .../app/portal/cronjob/list-pod/inventory.ts | 6 ++--- .../cronjob/list-pod/list-pod.component.ts | 4 ++-- .../portal/daemonset/daemonset.component.ts | 4 ++-- .../list-daemonset.component.ts | 8 +++---- .../portal/daemonset/list-event/inventory.ts | 4 ++-- .../list-event/list-event.component.ts | 4 ++-- .../portal/daemonset/list-pod/inventory.ts | 6 ++--- .../daemonset/list-pod/list-pod.component.ts | 4 ++-- .../portal/deployment/deployment.component.ts | 4 ++-- .../list-deployment.component.ts | 8 +++---- .../portal/deployment/list-event/inventory.ts | 4 ++-- .../list-event/list-event.component.ts | 4 ++-- .../portal/deployment/list-pod/inventory.ts | 6 ++--- .../deployment/list-pod/list-pod.component.ts | 4 ++-- .../namespace-apikey/apikey.component.ts | 4 ++-- .../list-apikey/list-apikey.component.ts | 8 +++---- .../list-namespace-user.component.ts | 8 +++---- .../namespace-user.component.ts | 4 ++-- .../list-persistentvolumeclaim.component.ts | 6 ++--- .../list-secret/list-secret.component.ts | 8 +++---- .../src/app/portal/secret/secret.component.ts | 4 ++-- .../statefulset/list-event/inventory.ts | 4 ++-- .../list-event/list-event.component.ts | 4 ++-- .../portal/statefulset/list-pod/inventory.ts | 6 ++--- .../list-pod/list-pod.component.ts | 4 ++-- .../list-statefulset.component.ts | 8 +++---- .../statefulset/statefulset.component.ts | 4 ++-- .../kubernetes/kubernetes-list-resource.ts | 8 +++---- .../base/kubernetes/kubernetes-resource.ts | 4 ++-- .../app/shared/base/resource/list-resource.ts | 8 +++---- .../src/app/shared/base/resource/resource.ts | 4 ++-- .../src/app/shared/page/page-state.ts | 4 ++-- src/frontend/src/app/shared/shared.module.ts | 2 +- 124 files changed, 374 insertions(+), 374 deletions(-) diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 7c516c086..62ca702a3 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -1108,22 +1108,22 @@ "dev": true }, "@clr/angular": { - "version": "0.12.14", - "resolved": "http://registry.npm.taobao.org/@clr/angular/download/@clr/angular-0.12.14.tgz", - "integrity": "sha1-q6qszDso3Ib2LZNBbBREPzOIVNw=", + "version": "1.0.4", + "resolved": "http://registry.npm.taobao.org/@clr/angular/download/@clr/angular-1.0.4.tgz", + "integrity": "sha1-vsno4nxz3lZ0CJU1zSvPah32Xg0=", "requires": { "tslib": "1.9.3" } }, "@clr/icons": { - "version": "0.12.14", - "resolved": "http://registry.npm.taobao.org/@clr/icons/download/@clr/icons-0.12.14.tgz", - "integrity": "sha1-d9ZdXaXxtG+UkLtN3s0R9L4IgTY=" + "version": "1.0.4", + "resolved": "http://registry.npm.taobao.org/@clr/icons/download/@clr/icons-1.0.4.tgz", + "integrity": "sha1-QIkOnKvi7Wi6gHNchFWoUUrD9pg=" }, "@clr/ui": { - "version": "0.12.14", - "resolved": "http://registry.npm.taobao.org/@clr/ui/download/@clr/ui-0.12.14.tgz", - "integrity": "sha1-VxbAEy/Iljn9hcOWf9qo41L/KBw=" + "version": "1.0.4", + "resolved": "http://registry.npm.taobao.org/@clr/ui/download/@clr/ui-1.0.4.tgz", + "integrity": "sha1-/IyMil4A82oLkzHLsxKtdqFX0uo=" }, "@ngtools/webpack": { "version": "7.2.3", @@ -1737,9 +1737,9 @@ } }, "@webcomponents/custom-elements": { - "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/@webcomponents/custom-elements/download/@webcomponents/custom-elements-1.1.2.tgz", - "integrity": "sha1-BB5MIN81JF9NFgtQ0ES4z/GSliw=" + "version": "1.2.1", + "resolved": "http://registry.npm.taobao.org/@webcomponents/custom-elements/download/@webcomponents/custom-elements-1.2.1.tgz", + "integrity": "sha1-C5yNBsbY8Fl1L/OJpuRBjzkzOOc=" }, "@xtuc/ieee754": { "version": "1.2.0", diff --git a/src/frontend/package.json b/src/frontend/package.json index 5c3f48de5..b0c3ac31c 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -21,12 +21,12 @@ "@angular/platform-browser": "^7.2.2", "@angular/platform-browser-dynamic": "^7.2.2", "@angular/router": "^7.2.2", - "@clr/angular": "^0.12.14", - "@clr/icons": "^0.12.14", - "@clr/ui": "^0.12.14", + "@clr/angular": "^1.0.4", + "@clr/icons": "^1.0.4", + "@clr/ui": "^1.0.4", "@ngx-translate/core": "^11.0.1", "@ngx-translate/http-loader": "^4.0.0", - "@webcomponents/custom-elements": "^1.1.2", + "@webcomponents/custom-elements": "^1.2.1", "ace": "^1.3.0", "bootstrap": "^4.0.0-alpha.5", "brace": "^0.11.1", diff --git a/src/frontend/src/app/admin/apikey/apikey.component.ts b/src/frontend/src/app/admin/apikey/apikey.component.ts index def0cfac5..0fb06db1f 100644 --- a/src/frontend/src/app/admin/apikey/apikey.component.ts +++ b/src/frontend/src/app/admin/apikey/apikey.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -62,7 +62,7 @@ export class ApiKeyComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { totalPage: this.pageState.page.totalPage, diff --git a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts index 834de0c71..84621a021 100644 --- a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts +++ b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { ApiKey } from '../../../shared/model/v1/apikey'; import { TokenDetailComponent } from '../token-detail/token-detail'; @@ -17,9 +17,9 @@ export class ListApiKeyComponent implements OnInit { @Input() apiKeys: ApiKey[]; @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -47,7 +47,7 @@ export class ListApiKeyComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index bc11c1306..f36656767 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListAppComponent } from './list-app/list-app.component'; import { CreateEditAppComponent } from './create-edit-app/create-edit-app.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -74,7 +74,7 @@ export class AppComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/app/list-app/list-app.component.ts b/src/frontend/src/app/admin/app/list-app/list-app.component.ts index cb7668c4a..ecad2dd17 100644 --- a/src/frontend/src/app/admin/app/list-app/list-app.component.ts +++ b/src/frontend/src/app/admin/app/list-app/list-app.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { App } from '../../../shared/model/v1/app'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -17,9 +17,9 @@ export class ListAppComponent implements OnInit { @Input() idFilterInit: string; @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -45,7 +45,7 @@ export class ListAppComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts b/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts index 744889c5e..d4fb2f062 100644 --- a/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts +++ b/src/frontend/src/app/admin/app/trash-app/trash-app.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashAppComponent implements OnInit, OnDestroy { apps: App[]; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; pageState: PageState = new PageState(); @@ -64,7 +64,7 @@ export class TrashAppComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/auditlog/auditlog.component.ts b/src/frontend/src/app/admin/auditlog/auditlog.component.ts index 1c1bc32eb..0d2996f0e 100644 --- a/src/frontend/src/app/admin/auditlog/auditlog.component.ts +++ b/src/frontend/src/app/admin/auditlog/auditlog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { PageState } from '../../shared/page/page-state'; import { AuditLogService } from '../../shared/client/v1/auditlog.service'; import { AuditLog } from '../../shared/model/v1/auditlog'; @@ -13,7 +13,7 @@ export class AuditLogComponent implements OnInit { pageState: PageState = new PageState(); auditLogs: AuditLog[]; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; constructor(private auditLogService: AuditLogService, private messageHandlerService: MessageHandlerService) { @@ -30,7 +30,7 @@ export class AuditLogComponent implements OnInit { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/cluster/cluster.component.ts b/src/frontend/src/app/admin/cluster/cluster.component.ts index edec11430..296ee58af 100644 --- a/src/frontend/src/app/admin/cluster/cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/cluster.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -60,7 +60,7 @@ export class ClusterComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts index 06a18894a..de6eda590 100644 --- a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Cluster } from '../../../shared/model/v1/cluster'; import { Page } from '../../../shared/page/page-state'; import { clusterStatus } from 'app/shared/shared.const'; @@ -17,9 +17,9 @@ export class ListClusterComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -38,7 +38,7 @@ export class ListClusterComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts index 7445e42e4..d3eaec903 100644 --- a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts +++ b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -18,7 +18,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { clusters: Cluster[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -61,7 +61,7 @@ export class TrashClusterComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/config/config.component.ts b/src/frontend/src/app/admin/config/config.component.ts index 97a8be2f2..cc1611337 100644 --- a/src/frontend/src/app/admin/config/config.component.ts +++ b/src/frontend/src/app/admin/config/config.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -61,7 +61,7 @@ export class ConfigComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/config/list-config/list-config.component.ts b/src/frontend/src/app/admin/config/list-config/list-config.component.ts index c40708be4..43948bdf1 100644 --- a/src/frontend/src/app/admin/config/list-config/list-config.component.ts +++ b/src/frontend/src/app/admin/config/list-config/list-config.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { Config } from '../../../shared/model/v1/config'; @@ -13,9 +13,9 @@ export class ListConfigComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -33,7 +33,7 @@ export class ListConfigComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/configmap/configmap.component.ts b/src/frontend/src/app/admin/configmap/configmap.component.ts index b644f638d..e231f9cfa 100644 --- a/src/frontend/src/app/admin/configmap/configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/configmap.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -61,7 +61,7 @@ export class ConfigMapComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts index 599935b82..e32f1e1d9 100644 --- a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfigMap } from '../../../shared/model/v1/configmap'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -16,10 +16,10 @@ export class ListConfigMapComponent implements OnInit { @Input() configMaps: ConfigMap[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -44,7 +44,7 @@ export class ListConfigMapComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts index a7fab4712..21704f272 100644 --- a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -18,7 +18,7 @@ import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; export class TrashConfigMapComponent implements OnInit, OnDestroy { configMaps: ConfigMap[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashConfigMapComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts index cbba9615e..9ea27749a 100644 --- a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -68,7 +68,7 @@ export class ConfigMapTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts index 4bf4c2478..7197cd4ee 100644 --- a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfigMapTpl } from '../../../shared/model/v1/configmaptpl'; import { Page } from '../../../shared/page/page-state'; @@ -13,10 +13,10 @@ export class ListConfigMapTplComponent implements OnInit { @Input() configMapTpls: ConfigMapTpl[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -35,7 +35,7 @@ export class ListConfigMapTplComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts index 1314600a5..61abe8772 100644 --- a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { configMapTpls: ConfigMapTpl[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashConfigMapTplComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/cronjob/cronjob.component.ts b/src/frontend/src/app/admin/cronjob/cronjob.component.ts index f17366403..5a7d66026 100644 --- a/src/frontend/src/app/admin/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/cronjob.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -71,7 +71,7 @@ export class CronjobComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts index 8d0c0e146..ad8581307 100644 --- a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Cronjob } from '../../../shared/model/v1/cronjob'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -17,9 +17,9 @@ export class ListCronjobComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -44,7 +44,7 @@ export class ListCronjobComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts index 2413d9548..52bef931e 100644 --- a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { cronjobs: Cronjob[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; componentName = '计划任务'; @@ -67,7 +67,7 @@ export class TrashCronjobComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts index b0cbc9a5d..6b9bfdddc 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -69,7 +69,7 @@ export class CronjobTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { pageSize: 10, diff --git a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts index 2ef0930b3..de1d6fac4 100644 --- a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { CronjobTpl } from '../../../shared/model/v1/cronjobtpl'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -16,9 +16,9 @@ export class ListCronjobTplComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -38,7 +38,7 @@ export class ListCronjobTplComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts index 3ce9fbcf4..14b70de56 100644 --- a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { cronjobTpls: CronjobTpl[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; componentName = '计划任务模板'; @@ -65,7 +65,7 @@ export class TrashCronjobTplComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/daemonset/daemonset.component.ts b/src/frontend/src/app/admin/daemonset/daemonset.component.ts index e0b1f2a83..44e595a80 100644 --- a/src/frontend/src/app/admin/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/daemonset.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -70,7 +70,7 @@ export class DaemonsetComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts index da601a61b..895ec0418 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { DaemonSet } from '../../../shared/model/v1/daemonset'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -16,10 +16,10 @@ export class ListDaemonsetComponent implements OnInit { @Input() daemonsets: DaemonSet[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -41,7 +41,7 @@ export class ListDaemonsetComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts index 9752783f8..9f2919321 100644 --- a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { daemonsets: DaemonSet[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashDaemonsetComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts index 45083981c..7cf3021f2 100644 --- a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -68,7 +68,7 @@ export class DaemonsettplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { pageSize: 10, diff --git a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts index 4fbab0c34..709c8a97f 100644 --- a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { DaemonSetTemplate } from '../../../shared/model/v1/daemonsettpl'; @@ -13,10 +13,10 @@ export class ListDaemonsettplComponent implements OnInit { @Input() daemonsetTpls: DaemonSetTemplate[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -34,7 +34,7 @@ export class ListDaemonsettplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts index 30ae43f9b..21c383f1b 100644 --- a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { daemonsetTpls: DaemonSetTemplate[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashDaemonsettplComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/deployment/deployment.component.ts b/src/frontend/src/app/admin/deployment/deployment.component.ts index b75a616c1..f742a01be 100644 --- a/src/frontend/src/app/admin/deployment/deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/deployment.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -70,7 +70,7 @@ export class DeploymentComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts index fc365890b..e87f71138 100644 --- a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Deployment } from '../../../shared/model/v1/deployment'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -17,9 +17,9 @@ export class ListDeploymentComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; testInfo = 0; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -42,7 +42,7 @@ export class ListDeploymentComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts index 8b824fbf0..22f9a877a 100644 --- a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { deployments: Deployment[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashDeploymentComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts index df16e53e2..496048053 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -68,7 +68,7 @@ export class DeploymentTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts index 0898e7e52..d1b94971b 100644 --- a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { DeploymentTpl } from '../../../shared/model/v1/deploymenttpl'; import { Page } from '../../../shared/page/page-state'; @@ -14,9 +14,9 @@ export class ListDeploymentTplComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -34,7 +34,7 @@ export class ListDeploymentTplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts index b8686ffb3..8d323d693 100644 --- a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { deploymentTpls: DeploymentTpl[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashDeploymentTplComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, { diff --git a/src/frontend/src/app/admin/group/group.component.ts b/src/frontend/src/app/admin/group/group.component.ts index 5ae241aaa..cc578f5ac 100644 --- a/src/frontend/src/app/admin/group/group.component.ts +++ b/src/frontend/src/app/admin/group/group.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListGroupComponent } from './list-group/list-group.component'; import { CreateEditGroupComponent } from './create-edit-group/create-edit-group.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -60,7 +60,7 @@ export class GroupComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/group/list-group/list-group.component.ts b/src/frontend/src/app/admin/group/list-group/list-group.component.ts index a17f60639..6e0a97a1d 100644 --- a/src/frontend/src/app/admin/group/list-group/list-group.component.ts +++ b/src/frontend/src/app/admin/group/list-group/list-group.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Group } from '../../../shared/model/v1/group'; import { GroupService } from '../../../shared/client/v1/group.service'; @@ -17,9 +17,9 @@ export class ListGroupComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -43,7 +43,7 @@ export class ListGroupComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/ingress/ingress.component.ts b/src/frontend/src/app/admin/ingress/ingress.component.ts index af4ed0fec..f525a38fa 100644 --- a/src/frontend/src/app/admin/ingress/ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/ingress.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -73,7 +73,7 @@ export class IngressComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts index 7eb33799b..b08d7339a 100644 --- a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Ingress } from '../../../shared/model/v1/ingress'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -17,9 +17,9 @@ export class ListIngressComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -43,7 +43,7 @@ export class ListIngressComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts index 30eecb02b..17d86684a 100644 --- a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashIngressComponent implements OnInit, OnDestroy { ingresses: Ingress[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashIngressComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index 0524a640a..437abeba6 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -73,7 +73,7 @@ export class IngressTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.ts index 4e96983e1..8213ab55c 100644 --- a/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { IngressTpl } from '../../../shared/model/v1/ingresstpl'; import { Page } from '../../../shared/page/page-state'; @@ -14,9 +14,9 @@ export class ListIngressTplComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -34,7 +34,7 @@ export class ListIngressTplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts index fe14d1e3b..e51bb7b0b 100644 --- a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashIngressTplComponent implements OnInit, OnDestroy { ingressTpls: IngressTpl[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashIngressTplComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.ts b/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.ts index 22e9549bf..aea7088a4 100644 --- a/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.ts +++ b/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Subscription } from 'rxjs/Subscription'; import { DeploymentClient } from '../../../shared/client/v1/kubernetes/deployment'; import { PageState } from '../../../shared/page/page-state'; @@ -148,7 +148,7 @@ export class KubeDeploymentComponent implements OnInit { } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.ts b/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.ts index c1823c407..5cf27d1d1 100644 --- a/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.ts +++ b/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../../shared/page/page-state'; import { BreadcrumbService } from '../../../../shared/client/v1/breadcrumb.service'; import { DeploymentList } from '../../../../shared/model/v1/deployment-list'; @@ -16,9 +16,9 @@ export class KubeListDeploymentComponent implements OnInit { @Input() page: Page; @Input() showState: object; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() detail = new EventEmitter(); @Output() migration = new EventEmitter(); @@ -38,7 +38,7 @@ export class KubeListDeploymentComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts index af51621fc..bf408b4b5 100644 --- a/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts +++ b/src/frontend/src/app/admin/kubernetes/node/list-nodes/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator, StringFilter } from '@clr/angular'; +import { ClrDatagridComparatorInterface, ClrDatagridStringFilterInterface } from '@clr/angular'; import { Node } from '../../../../shared/model/v1/kubernetes/node-list'; export class Inventory { @@ -14,49 +14,49 @@ export class Inventory { } } -export class SchedulerComparator implements Comparator { +export class SchedulerComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.spec.unschedulable.toString().localeCompare(b.spec.unschedulable.toString()); } } -export class ReadyComparator implements Comparator { +export class ReadyComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.spec.ready.localeCompare(b.spec.ready); } } -export class OsImageComparator implements Comparator { +export class OsImageComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.status.nodeInfo.osImage.localeCompare(b.status.nodeInfo.osImage); } } -export class KernelComparator implements Comparator { +export class KernelComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.status.nodeInfo.kernelVersion.localeCompare(b.status.nodeInfo.kernelVersion); } } -export class CriComparator implements Comparator { +export class CriComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.status.nodeInfo.containerRuntimeVersion.localeCompare(b.status.nodeInfo.containerRuntimeVersion); } } -export class NameComparator implements Comparator { +export class NameComparator implements ClrDatagridComparatorInterface { compare(a: Node, b: Node) { return a.name.localeCompare(b.name); } } -export class NameFilter implements StringFilter { +export class NameFilter implements ClrDatagridStringFilterInterface { accepts(node: Node, search: string): boolean { return node.name.indexOf(search) >= 0; } } -export class LabelFilter implements StringFilter { +export class LabelFilter implements ClrDatagridStringFilterInterface { accepts(node: Node, search: string): boolean { const keys = Object.keys(node.labels); for (const key of keys) { diff --git a/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts b/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts index eb450bd45..4a02b7956 100644 --- a/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts +++ b/src/frontend/src/app/admin/kubernetes/node/list-nodes/list-nodes.component.ts @@ -12,7 +12,7 @@ import { ReadyComparator, SchedulerComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { Node } from '../../../../shared/model/v1/kubernetes/node-list'; import { StorageService } from '../../../../shared/client/v1/storage.service'; @@ -25,7 +25,7 @@ export class ListNodesComponent implements OnInit { @Input() nodes: Node[]; @Input() cluster: string; @Input() showState: object; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; currentPage = 1; _pageSize = 10; diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/inventory.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/inventory.ts index 4c8f77b3a..33e9d4f45 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/inventory.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator, StringFilter } from '@clr/angular'; +import { ClrDatagridComparatorInterface, ClrDatagridStringFilterInterface } from '@clr/angular'; import { PersistentVolume } from '../../../../shared/model/v1/kubernetes/persistentvolume'; export class Inventory { @@ -14,25 +14,25 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: PersistentVolume, b: PersistentVolume) { return new Date(a.metadata.creationTimestamp).getTime() - new Date(b.metadata.creationTimestamp).getTime(); } } -export class NameComparator implements Comparator { +export class NameComparator implements ClrDatagridComparatorInterface { compare(a: PersistentVolume, b: PersistentVolume) { return a.metadata.name.localeCompare(b.metadata.name); } } -export class NameFilter implements StringFilter { +export class NameFilter implements ClrDatagridStringFilterInterface { accepts(pv: PersistentVolume, search: string): boolean { return pv.metadata.name.indexOf(search) >= 0; } } -export class RbdImageNameFilter implements StringFilter { +export class RbdImageNameFilter implements ClrDatagridStringFilterInterface { accepts(pv: PersistentVolume, search: string): boolean { let rbdImage = ''; if (pv.spec.rbd) { @@ -42,7 +42,7 @@ export class RbdImageNameFilter implements StringFilter { } } -export class PvcFilter implements StringFilter { +export class PvcFilter implements ClrDatagridStringFilterInterface { accepts(pv: PersistentVolume, search: string): boolean { if (pv.spec.claimRef) { return pv.spec.claimRef.name.indexOf(search) >= 0; diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts index 9255877c4..f08bb6d9f 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { NameComparator, NameFilter, PvcFilter, RbdImageNameFilter, TimeComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { PersistentVolume } from '../../../../shared/model/v1/kubernetes/persistentvolume'; import { isEmpty } from '../../../../shared/utils'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../../shared/shared.const'; @@ -25,7 +25,7 @@ export class ListPersistentVolumeComponent implements OnInit, OnDestroy { @Input() persistentVolumes: PersistentVolume[]; @Input() cluster: string; @Input() showState: object; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.Unsorted; sorted = false; currentPage = 1; _pageSize = 10; diff --git a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts index f0fe763d0..56db4e79d 100644 --- a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Namespace } from '../../../shared/model/v1/namespace'; import { Page } from '../../../shared/page/page-state'; @@ -15,9 +15,9 @@ export class ListNamespaceComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -39,7 +39,7 @@ export class ListNamespaceComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/namespace/namespace.component.ts b/src/frontend/src/app/admin/namespace/namespace.component.ts index 61e5e4f09..6b8279bb6 100644 --- a/src/frontend/src/app/admin/namespace/namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/namespace.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListNamespaceComponent } from './list-namespace/list-namespace.component'; import { CreateEditNamespaceComponent } from './create-edit-namespace/create-edit-namespace.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -72,7 +72,7 @@ export class NamespaceComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { totalPage: this.pageState.page.totalPage, diff --git a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts index a5e3ce438..c538ec3a6 100644 --- a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts +++ b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -17,7 +17,7 @@ export class TrashNamespaceComponent implements OnInit, OnDestroy { namespaces: Namespace[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -59,7 +59,7 @@ export class TrashNamespaceComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts index c472545b2..f9d0759d1 100644 --- a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts +++ b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Permission } from '../../../shared/model/v1/permission'; import { PermissionService } from '../../../shared/client/v1/permission.service'; @@ -16,9 +16,9 @@ export class ListPermissionComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -39,7 +39,7 @@ export class ListPermissionComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/permission/permission.component.ts b/src/frontend/src/app/admin/permission/permission.component.ts index 5f99897e5..cc900f8c5 100644 --- a/src/frontend/src/app/admin/permission/permission.component.ts +++ b/src/frontend/src/app/admin/permission/permission.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListPermissionComponent } from './list-permission/list-permission.component'; import { CreateEditPermissionComponent } from './create-edit-permission/create-edit-permission.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -62,7 +62,7 @@ export class PermissionComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index 8da7a8feb..a10b8e5fd 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { PersistentVolumeClaim } from '../../../shared/model/v1/persistentvolumeclaim'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -15,9 +15,9 @@ export class ListPersistentVolumeClaimComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -35,7 +35,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts index 3f1b27815..3e45eeb2c 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -71,7 +71,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts index 8a10f2156..4ee7f1c45 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; import { Subscription } from 'rxjs/Subscription'; @@ -20,7 +20,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { pvcs: PersistentVolumeClaim[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts index 24a6358d0..a4440a0dc 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { PersistentVolumeClaimTpl } from '../../../shared/model/v1/persistentvolumeclaimtpl'; import { Page } from '../../../shared/page/page-state'; @@ -15,9 +15,9 @@ export class ListPersistentVolumeClaimTplComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -35,7 +35,7 @@ export class ListPersistentVolumeClaimTplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts index 47dabfbaa..b9e666988 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -71,7 +71,7 @@ export class PersistentVolumeClaimTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts index d024e2b32..20443a88e 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -20,7 +20,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy pvcTpls: PersistentVolumeClaimTpl[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashPersistentVolumeClaimTplComponent implements OnInit, OnDestroy this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts b/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts index 65192ad9e..29b42501a 100644 --- a/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts +++ b/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { PublishService } from '../../../shared/client/v1/publish.service'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import * as moment from 'moment'; @Component({ @@ -30,7 +30,7 @@ export class DeployComponent implements OnInit { this.refresh(); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.publishService.getDeployStatistics( moment(this.startTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z', moment(this.endTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z'). subscribe( diff --git a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts index 4022e7e3f..8694cfb6f 100644 --- a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts +++ b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Secret } from '../../../shared/model/v1/secret'; import { SecretService } from '../../../shared/client/v1/secret.service'; @@ -19,9 +19,9 @@ export class ListSecretComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -46,7 +46,7 @@ export class ListSecretComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/secret/secret.component.ts b/src/frontend/src/app/admin/secret/secret.component.ts index 9eaae4ed7..83ee725a1 100644 --- a/src/frontend/src/app/admin/secret/secret.component.ts +++ b/src/frontend/src/app/admin/secret/secret.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListSecretComponent } from './list-secret/list-secret.component'; import { CreateEditSecretComponent } from './create-edit-secret/create-edit-secret.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -69,7 +69,7 @@ export class SecretComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts index a5a313139..51dbb706b 100644 --- a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts +++ b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashSecretComponent implements OnInit, OnDestroy { secrets: Secret[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -63,7 +63,7 @@ export class TrashSecretComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts index fe395bf7f..596030129 100644 --- a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { SecretTpl } from '../../../shared/model/v1/secrettpl'; import { SecretTplService } from '../../../shared/client/v1/secrettpl.service'; @@ -16,9 +16,9 @@ export class ListSecretTplComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -39,7 +39,7 @@ export class ListSecretTplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts index 8deeb6b8e..a88e2ff32 100644 --- a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListSecretTplComponent } from './list-secrettpl/list-secrettpl.component'; import { CreateEditSecretTplComponent } from './create-edit-secrettpl/create-edit-secrettpl.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -69,7 +69,7 @@ export class SecretTplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts index 105722baa..fd51b6a1c 100644 --- a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashSecretTplComponent implements OnInit, OnDestroy { secrettpls: SecretTpl[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -62,7 +62,7 @@ export class TrashSecretTplComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts index b23befb4a..7831f68cd 100644 --- a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Statefulset } from '../../../shared/model/v1/statefulset'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -16,10 +16,10 @@ export class ListStatefulsetComponent implements OnInit { @Input() statefulsets: Statefulset[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -43,7 +43,7 @@ export class ListStatefulsetComponent implements OnInit { } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/statefulset/statefulset.component.ts b/src/frontend/src/app/admin/statefulset/statefulset.component.ts index dfe956de5..b087be2e9 100644 --- a/src/frontend/src/app/admin/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/statefulset.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -70,7 +70,7 @@ export class StatefulsetComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts index 384991740..fdb19ec94 100644 --- a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { statefulsets: Statefulset[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashStatefulsetComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts index 68e962e1b..df5690935 100644 --- a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { StatefulsetTemplate } from '../../../shared/model/v1/statefulsettpl'; @@ -13,10 +13,10 @@ export class ListStatefulsettplComponent implements OnInit { @Input() statefulsetTpls: StatefulsetTemplate[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -34,7 +34,7 @@ export class ListStatefulsettplComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts index 000c74c26..02499cea2 100644 --- a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -68,7 +68,7 @@ export class StatefulsettplComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { pageSize: 10, diff --git a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts index 9c98d5324..aadda7742 100644 --- a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; @@ -19,7 +19,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { statefulsetTpls: StatefulsetTemplate[]; pageState: PageState = new PageState(); - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -64,7 +64,7 @@ export class TrashStatefulsettplComponent implements OnInit, OnDestroy { } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/admin/user/list-user/list-user.component.ts b/src/frontend/src/app/admin/user/list-user/list-user.component.ts index d25bd4f32..94303bf7d 100644 --- a/src/frontend/src/app/admin/user/list-user/list-user.component.ts +++ b/src/frontend/src/app/admin/user/list-user/list-user.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { User } from '../../../shared/model/v1/user'; import { UserService } from '../../../shared/client/v1/user.service'; @@ -19,9 +19,9 @@ export class ListUserComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -68,7 +68,7 @@ export class ListUserComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/admin/user/user.component.ts b/src/frontend/src/app/admin/user/user.component.ts index 8a4ae7d5c..15460a69c 100644 --- a/src/frontend/src/app/admin/user/user.component.ts +++ b/src/frontend/src/app/admin/user/user.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListUserComponent } from './list-user/list-user.component'; import { CreateEditUserComponent } from './create-edit-user/create-edit-user.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -64,7 +64,7 @@ export class UserComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/portal/app-apikey/apikey.component.ts b/src/frontend/src/app/portal/app-apikey/apikey.component.ts index 64d6d7721..cda1428bf 100644 --- a/src/frontend/src/app/portal/app-apikey/apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/apikey.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { apiKeyTypeApp, ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -101,7 +101,7 @@ export class AppApiKeyComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { totalPage: this.pageState.page.totalPage, diff --git a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts index 637355dac..e9fda9eb5 100644 --- a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts +++ b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { ApiKey } from '../../../shared/model/v1/apikey'; import { TokenDetailComponent } from '../token-detail/token-detail'; @@ -18,9 +18,9 @@ export class ListApiKeyComponent implements OnInit { @Input() apiKeys: ApiKey[]; @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -40,7 +40,7 @@ export class ListApiKeyComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/app-user/app-user.component.ts b/src/frontend/src/app/portal/app-user/app-user.component.ts index 8cb1a87a1..51f1238e7 100644 --- a/src/frontend/src/app/portal/app-user/app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/app-user.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListAppUserComponent } from './list-app-user/list-app-user.component'; import { CreateEditAppUserComponent } from './create-edit-app-user/create-edit-app-user.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -113,7 +113,7 @@ export class AppUserComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts index 101848bee..d6535ec90 100644 --- a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts +++ b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { AppUser } from '../../../shared/model/v1/app-user'; import { AuthService } from '../../../shared/auth/auth.service'; import { Page } from '../../../shared/page/page-state'; @@ -16,9 +16,9 @@ export class ListAppUserComponent implements OnInit { @Input() appUsers: AppUser[]; @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -38,7 +38,7 @@ export class ListAppUserComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/app/app.component.ts b/src/frontend/src/app/portal/app/app.component.ts index b01c85927..640422330 100644 --- a/src/frontend/src/app/portal/app/app.component.ts +++ b/src/frontend/src/app/portal/app/app.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild, HostBinding } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListAppComponent } from './list-app/list-app.component'; import { CreateEditAppComponent } from './create-edit-app/create-edit-app.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -239,7 +239,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { }); } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.cacheService.currentNamespace) { return; } diff --git a/src/frontend/src/app/portal/app/list-app/list-app.component.ts b/src/frontend/src/app/portal/app/list-app/list-app.component.ts index 983982bdf..63229a513 100644 --- a/src/frontend/src/app/portal/app/list-app/list-app.component.ts +++ b/src/frontend/src/app/portal/app/list-app/list-app.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { App } from '../../../shared/model/v1/app'; import { AuthService } from '../../../shared/auth/auth.service'; import { Page } from '../../../shared/page/page-state'; @@ -19,10 +19,10 @@ export class ListAppComponent implements OnInit { @Input() starredFilter: boolean; @Input() apps: App[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; @Input() showState: object; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -53,7 +53,7 @@ export class ListAppComponent implements OnInit { return this.authService.config['system.monitor-uri']; } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/common/publish-history/publish-history.component.ts b/src/frontend/src/app/portal/common/publish-history/publish-history.component.ts index 679879aaa..6aff1f9fc 100644 --- a/src/frontend/src/app/portal/common/publish-history/publish-history.component.ts +++ b/src/frontend/src/app/portal/common/publish-history/publish-history.component.ts @@ -6,7 +6,7 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h import { PublishHistory } from '../../../shared/model/v1/publish-history'; import { PublishType } from '../../../shared/shared.const'; import { PublishService } from '../../../shared/client/v1/publish.service'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { PublishHistoryService } from './publish-history.service'; import { Subscription } from 'rxjs/Subscription'; import { PageState } from '../../../shared/page/page-state'; @@ -26,7 +26,7 @@ export class PublishHistoryComponent implements OnInit, OnDestroy { publishHistories: PublishHistory[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; constructor(private publishService: PublishService, private publishHistoryService: PublishHistoryService, @@ -72,7 +72,7 @@ export class PublishHistoryComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State): void { + refresh(state?: ClrDatagridStateInterface): void { if (this.type == null || this.resourceId == null) { return; } diff --git a/src/frontend/src/app/portal/configmap/configmap.component.ts b/src/frontend/src/app/portal/configmap/configmap.component.ts index 68b74ccb4..e69590839 100644 --- a/src/frontend/src/app/portal/configmap/configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/configmap.component.ts @@ -1,6 +1,6 @@ import { AfterContentInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationButtons, ConfirmationState, @@ -302,7 +302,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { this.tabScription.unsubscribe(); } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.configMapId) { return; } diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts index 02bb85da6..c50cb3118 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, ResourcesActionType } from '../../../shared/shared.const'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -32,10 +32,10 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { @Input() configMaps: ConfigMap[]; @Input() configMapTpls: ConfigMapTpl[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() configmapTab = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); subscription: Subscription; @@ -119,7 +119,7 @@ export class ListConfigMapComponent implements OnInit, OnDestroy { this.deletionDialogService.openComfirmDialog(deletionMessage); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/cronjob/cronjob.component.ts b/src/frontend/src/app/portal/cronjob/cronjob.component.ts index 34ad54fcd..6db3beb8f 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.component.ts @@ -5,7 +5,7 @@ import { ListCronjobComponent } from './list-cronjob/list-cronjob.component'; import { ListJobComponent } from './list-job/list-job.component'; import { CreateEditCronjobComponent } from './create-edit-cronjob/create-edit-cronjob.component'; import { Observable } from 'rxjs/Observable'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { CronjobClient } from '../../shared/client/v1/kubernetes/cronjob'; import { CronjobStatus, CronjobTpl } from '../../shared/model/v1/cronjobtpl'; import { App } from '../../shared/model/v1/app'; @@ -400,7 +400,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.cronjobId) { return; } @@ -433,7 +433,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } // 刷新job列表 - retrieveJob(state?: State): void { + retrieveJob(state?: ClrDatagridStateInterface): void { if (!this.cronjobName) { return; } diff --git a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts index 95930a07b..f36563392 100644 --- a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, ResourcesActionType, } from '../../../shared/shared.const'; @@ -29,7 +29,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { @Input() cronjobTpls: CronjobTpl[]; @Input() page: Page; @Input() appId: number; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() edit = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); @Output() createTpl = new EventEmitter(); @@ -37,7 +37,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { @ViewChild(PublishCronjobTplComponent) publishCronjobTpl: PublishCronjobTplComponent; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -86,7 +86,7 @@ export class ListCronjobComponent implements OnInit, OnDestroy { this.diffService.diff(this.selected); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/cronjob/list-event/inventory.ts b/src/frontend/src/app/portal/cronjob/list-event/inventory.ts index 09719a430..28583a4e6 100644 --- a/src/frontend/src/app/portal/cronjob/list-event/inventory.ts +++ b/src/frontend/src/app/portal/cronjob/list-event/inventory.ts @@ -1,5 +1,5 @@ import { Event } from '../../../shared/model/v1/deploymenttpl'; -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; export class Inventory { public size = 10; @@ -14,7 +14,7 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Event, b: Event) { return new Date(a.firstSeen).getTime() - new Date(b.firstSeen).getTime(); } diff --git a/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts b/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts index 44de0a2c7..27b45e9f1 100644 --- a/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-event/list-event.component.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, TimeComparator } from './inventory'; import { Event } from '../../../shared/model/v1/deploymenttpl'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; @Component({ selector: 'list-event', @@ -18,7 +18,7 @@ export class ListEventComponent implements OnInit { isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts index a7eaf40d9..a0ff9917b 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Job } from '../../../shared/model/v1/job'; import { JobClient } from '../../../shared/client/v1/kubernetes/job'; @@ -23,7 +23,7 @@ export class ListJobComponent implements OnInit, OnDestroy { @Input() jobs: Job[]; @Input() page: Page; @Input() currentCronjobName: string; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); _pageSize = 10; @ViewChild(ListPodComponent) listPodComponent: ListPodComponent; @@ -78,7 +78,7 @@ export class ListJobComponent implements OnInit, OnDestroy { this.listPodComponent.openModal(job.cluster, job.kubeJob); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts b/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts index 242857975..01b4944c4 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts +++ b/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; export class Inventory { @@ -14,13 +14,13 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); } } -export class StateComparator implements Comparator { +export class StateComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return a.state.localeCompare(b.state); } diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts index 3954c542a..3b65bac5f 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; @@ -29,7 +29,7 @@ export class ListPodComponent implements OnInit, OnDestroy { isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); diff --git a/src/frontend/src/app/portal/daemonset/daemonset.component.ts b/src/frontend/src/app/portal/daemonset/daemonset.component.ts index 47997703a..b2533fbac 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.component.ts @@ -1,6 +1,6 @@ import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; import { AuthService } from '../../shared/auth/auth.service'; @@ -373,7 +373,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.daemonSetId) { return; } diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts index 2748f2a25..42620f494 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { @@ -38,7 +38,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { @Input() daemonSetTpls: DaemonSetTemplate[]; @Input() page: Page; @Input() appId: number; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() edit = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); @Output() createTpl = new EventEmitter(); @@ -49,7 +49,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { listEventComponent: ListEventComponent; @ViewChild(PublishDaemonSetTplComponent) publishDaemonSetTpl: PublishDaemonSetTplComponent; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -104,7 +104,7 @@ export class ListDaemonSetComponent implements OnInit, OnDestroy { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/daemonset/list-event/inventory.ts b/src/frontend/src/app/portal/daemonset/list-event/inventory.ts index 68d883cb8..2747c0311 100644 --- a/src/frontend/src/app/portal/daemonset/list-event/inventory.ts +++ b/src/frontend/src/app/portal/daemonset/list-event/inventory.ts @@ -1,5 +1,5 @@ import { Event } from '../../../shared/model/v1/event'; -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; export class Inventory { public size = 10; @@ -14,7 +14,7 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Event, b: Event) { return new Date(a.firstSeen).getTime() - new Date(b.firstSeen).getTime(); } diff --git a/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts b/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts index 2db9d8cc3..a50ceec2b 100644 --- a/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-event/list-event.component.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, TimeComparator } from './inventory'; import { Event } from '../../../shared/model/v1/event'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; @Component({ selector: 'list-event', @@ -18,7 +18,7 @@ export class ListEventComponent implements OnInit { isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts b/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts index 242857975..01b4944c4 100644 --- a/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts +++ b/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; export class Inventory { @@ -14,13 +14,13 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); } } -export class StateComparator implements Comparator { +export class StateComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return a.state.localeCompare(b.state); } diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts index 3d75253e1..ea8fb4f00 100644 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; @@ -30,7 +30,7 @@ export class ListPodComponent implements OnInit, OnDestroy { isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); diff --git a/src/frontend/src/app/portal/deployment/deployment.component.ts b/src/frontend/src/app/portal/deployment/deployment.component.ts index 889a9a74d..d8033e5af 100644 --- a/src/frontend/src/app/portal/deployment/deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/deployment.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ListDeploymentComponent } from './list-deployment/list-deployment.component'; import { CreateEditDeploymentComponent } from './create-edit-deployment/create-edit-deployment.component'; import { Observable } from 'rxjs/Observable'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { DeploymentClient } from '../../shared/client/v1/kubernetes/deployment'; import { DeploymentStatus, DeploymentTpl } from '../../shared/model/v1/deploymenttpl'; import { App } from '../../shared/model/v1/app'; @@ -393,7 +393,7 @@ export class DeploymentComponent implements OnInit, OnDestroy, AfterContentInit } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.deploymentId) { return; } diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts index 5c02ccbf3..dbb50f65f 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { @@ -37,7 +37,7 @@ export class ListDeploymentComponent implements OnInit, OnDestroy { @Input() deploymentTpls: DeploymentTpl[]; @Input() page: Page; @Input() appId: number; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() edit = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); @Output() createTpl = new EventEmitter(); @@ -48,7 +48,7 @@ export class ListDeploymentComponent implements OnInit, OnDestroy { listEventComponent: ListEventComponent; @ViewChild(PublishDeploymentTplComponent) publishDeploymentTpl: PublishDeploymentTplComponent; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -107,7 +107,7 @@ export class ListDeploymentComponent implements OnInit, OnDestroy { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(this.state); } diff --git a/src/frontend/src/app/portal/deployment/list-event/inventory.ts b/src/frontend/src/app/portal/deployment/list-event/inventory.ts index 09719a430..28583a4e6 100644 --- a/src/frontend/src/app/portal/deployment/list-event/inventory.ts +++ b/src/frontend/src/app/portal/deployment/list-event/inventory.ts @@ -1,5 +1,5 @@ import { Event } from '../../../shared/model/v1/deploymenttpl'; -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; export class Inventory { public size = 10; @@ -14,7 +14,7 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Event, b: Event) { return new Date(a.firstSeen).getTime() - new Date(b.firstSeen).getTime(); } diff --git a/src/frontend/src/app/portal/deployment/list-event/list-event.component.ts b/src/frontend/src/app/portal/deployment/list-event/list-event.component.ts index 70c3f882f..f974c8f48 100644 --- a/src/frontend/src/app/portal/deployment/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/deployment/list-event/list-event.component.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, TimeComparator } from './inventory'; import { Event } from '../../../shared/model/v1/deploymenttpl'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; @Component({ selector: 'list-event', @@ -18,7 +18,7 @@ export class ListEventComponent implements OnInit { isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/deployment/list-pod/inventory.ts b/src/frontend/src/app/portal/deployment/list-pod/inventory.ts index 242857975..01b4944c4 100644 --- a/src/frontend/src/app/portal/deployment/list-pod/inventory.ts +++ b/src/frontend/src/app/portal/deployment/list-pod/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; export class Inventory { @@ -14,13 +14,13 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); } } -export class StateComparator implements Comparator { +export class StateComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return a.state.localeCompare(b.state); } diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts index 3a6c45340..e3fc67026 100644 --- a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; @@ -32,7 +32,7 @@ export class ListPodComponent implements OnInit, OnDestroy { isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); diff --git a/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts b/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts index 0829fb53f..b60e46950 100644 --- a/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts +++ b/src/frontend/src/app/portal/namespace-apikey/apikey.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { apiKeyTypeNamespace, ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; @@ -95,7 +95,7 @@ export class NamespaceApiKeyComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, { totalPage: this.pageState.page.totalPage, diff --git a/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.ts b/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.ts index 8575ba20f..a5187be44 100644 --- a/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.ts +++ b/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../../shared/page/page-state'; import { ApiKey } from '../../../shared/model/v1/apikey'; import { TokenDetailComponent } from '../token-detail/token-detail'; @@ -18,10 +18,10 @@ export class ListApiKeyComponent implements OnInit { @Input() apiKeys: ApiKey[]; @Input() page: Page; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -42,7 +42,7 @@ export class ListApiKeyComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.ts b/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.ts index ad5b864d7..62b8991df 100644 --- a/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.ts +++ b/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { NamespaceUser } from '../../../shared/model/v1/namespace-user'; import { AuthService } from '../../../shared/auth/auth.service'; import { Page } from '../../../shared/page/page-state'; @@ -17,9 +17,9 @@ export class ListNamespaceUserComponent implements OnInit { @Input() namespaceUsers: NamespaceUser[]; @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -40,7 +40,7 @@ export class ListNamespaceUserComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts b/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts index ed23208aa..a87716827 100644 --- a/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts +++ b/src/frontend/src/app/portal/namespace-user/namespace-user.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ListNamespaceUserComponent } from './list-namespace-user/list-namespace-user.component'; import { CreateEditNamespaceUserComponent } from './create-edit-namespace-user/create-edit-namespace-user.component'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -107,7 +107,7 @@ export class NamespaceUserComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index 5f12c50cb..76650819a 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, @@ -49,7 +49,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { userInfoComponent: UserInfoComponent; appId: number; pvcId: number; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; pageState: PageState = new PageState(); isOnline = false; @@ -363,7 +363,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.deletionDialogService.openComfirmDialog(deletionMessage); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.ts b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.ts index b6e34c5ba..430a443ed 100644 --- a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.ts +++ b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, ResourcesActionType } from '../../../shared/shared.const'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -32,10 +32,10 @@ export class ListSecretComponent implements OnInit, OnDestroy { @Input() secretTpls: SecretTpl[]; @Input() page: Page; @Input() appId: number; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() secretTab = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); subscription: Subscription; @@ -121,7 +121,7 @@ export class ListSecretComponent implements OnInit, OnDestroy { this.deletionDialogService.openComfirmDialog(deletionMessage); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/secret/secret.component.ts b/src/frontend/src/app/portal/secret/secret.component.ts index 76e384f03..6ce792ab6 100644 --- a/src/frontend/src/app/portal/secret/secret.component.ts +++ b/src/frontend/src/app/portal/secret/secret.component.ts @@ -1,6 +1,6 @@ import { AfterContentInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationButtons, ConfirmationState, @@ -301,7 +301,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { this.tabScription.unsubscribe(); } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.secretId) { return; } diff --git a/src/frontend/src/app/portal/statefulset/list-event/inventory.ts b/src/frontend/src/app/portal/statefulset/list-event/inventory.ts index 68d883cb8..2747c0311 100644 --- a/src/frontend/src/app/portal/statefulset/list-event/inventory.ts +++ b/src/frontend/src/app/portal/statefulset/list-event/inventory.ts @@ -1,5 +1,5 @@ import { Event } from '../../../shared/model/v1/event'; -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; export class Inventory { public size = 10; @@ -14,7 +14,7 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Event, b: Event) { return new Date(a.firstSeen).getTime() - new Date(b.firstSeen).getTime(); } diff --git a/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts b/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts index 2db9d8cc3..a50ceec2b 100644 --- a/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-event/list-event.component.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, TimeComparator } from './inventory'; import { Event } from '../../../shared/model/v1/event'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; @Component({ selector: 'list-event', @@ -18,7 +18,7 @@ export class ListEventComponent implements OnInit { isSubmitOnGoing = false; modalOpened: boolean; warnings: Event[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); diff --git a/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts b/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts index 242857975..01b4944c4 100644 --- a/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts +++ b/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts @@ -1,4 +1,4 @@ -import { Comparator } from '@clr/angular'; +import { ClrDatagridComparatorInterface } from '@clr/angular'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; export class Inventory { @@ -14,13 +14,13 @@ export class Inventory { } } -export class TimeComparator implements Comparator { +export class TimeComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); } } -export class StateComparator implements Comparator { +export class StateComparator implements ClrDatagridComparatorInterface { compare(a: Pod, b: Pod) { return a.state.localeCompare(b.state); } diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts index f1715daeb..4fa47ef43 100644 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { SortOrder } from '@clr/angular'; +import { ClrDatagridSortOrder } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Pod } from '../../../shared/model/v1/kubernetes/pod'; import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; @@ -31,7 +31,7 @@ export class ListPodComponent implements OnInit, OnDestroy { isSubmitOnGoing = false; modalOpened: boolean; pods: Pod[]; - sortOrder: SortOrder = SortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; timeComparator = new TimeComparator(); stateComparator = new StateComparator(); diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts index 7eb0e5587..702d78bd4 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; import { @@ -39,7 +39,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { @Input() statefulsetTpls: StatefulsetTemplate[]; @Input() page: Page; @Input() appId: number; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() edit = new EventEmitter(); @Output() cloneTpl = new EventEmitter(); @Output() createTpl = new EventEmitter(); @@ -50,7 +50,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { listEventComponent: ListEventComponent; @ViewChild(PublishStatefulsetTplComponent) publishStatefulsetTpl: PublishStatefulsetTplComponent; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; subscription: Subscription; @@ -105,7 +105,7 @@ export class ListStatefulsetComponent implements OnInit, OnDestroy { this.paginate.emit(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/portal/statefulset/statefulset.component.ts b/src/frontend/src/app/portal/statefulset/statefulset.component.ts index 9a0c576af..586e4ade6 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/statefulset.component.ts @@ -2,7 +2,7 @@ import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { App } from '../../shared/model/v1/app'; import { Cluster } from '../../shared/model/v1/cluster'; import { AppService } from '../../shared/client/v1/app.service'; @@ -380,7 +380,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (!this.statefulsetId) { return; } diff --git a/src/frontend/src/app/shared/base/kubernetes/kubernetes-list-resource.ts b/src/frontend/src/app/shared/base/kubernetes/kubernetes-list-resource.ts index 824bf3c89..baee015d5 100644 --- a/src/frontend/src/app/shared/base/kubernetes/kubernetes-list-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes/kubernetes-list-resource.ts @@ -1,22 +1,22 @@ import { EventEmitter, Input, Output } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { NamespaceList } from '../../model/v1/namespace-list'; import { Page } from '../../page/page-state'; export class KubernetesListResource { - state: State; + state: ClrDatagridStateInterface; currentPage = 1; @Input() page: Page; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() detail = new EventEmitter(); onDetailEvent(obj: any) { this.detail.emit(obj); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts index 8c09dfe0e..d4c64cd63 100644 --- a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts @@ -6,7 +6,7 @@ import { AuthService } from '../../auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; import { ClusterService } from '../../client/v1/cluster.service'; import { PageState } from '../../page/page-state'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; export class KubernetesResource { listResourceComponent: any; @@ -70,7 +70,7 @@ export class KubernetesResource { } } - retrieveResource(state?: State): void { + retrieveResource(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/shared/base/resource/list-resource.ts b/src/frontend/src/app/shared/base/resource/list-resource.ts index 2ab5a7763..7f0d16f8d 100644 --- a/src/frontend/src/app/shared/base/resource/list-resource.ts +++ b/src/frontend/src/app/shared/base/resource/list-resource.ts @@ -7,7 +7,7 @@ import { MessageHandlerService } from '../../message-handler/message-handler.ser import { Page } from '../../page/page-state'; import { EventEmitter, Input, Output } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationButtons, ConfirmationState, @@ -31,12 +31,12 @@ export class ListResource { @Input() appId: number; @Input() resourceId: number; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() serviceTab = new EventEmitter(); @Output() cloneTemplate = new EventEmitter(); subscription: Subscription; - state: State; + state: ClrDatagridStateInterface; currentPage = 1; confirmationTarget: ConfirmationTargets; @@ -158,7 +158,7 @@ export class ListResource { this.diffService.diff(this.selectedTemplate); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/shared/base/resource/resource.ts b/src/frontend/src/app/shared/base/resource/resource.ts index 158f343ce..f3247f9a6 100644 --- a/src/frontend/src/app/shared/base/resource/resource.ts +++ b/src/frontend/src/app/shared/base/resource/resource.ts @@ -25,7 +25,7 @@ import { TemplateState } from '../../shared.const'; import { Observable } from 'rxjs/Observable'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { CreateEditResource } from './create-edit-resource'; import { ListResource } from './list-resource'; @@ -178,7 +178,7 @@ export class Resource { } // 获取模板列表 - retrieveTemplates(state?: State): void { + retrieveTemplates(state?: ClrDatagridStateInterface): void { if (!this.resourceId) { return; } diff --git a/src/frontend/src/app/shared/page/page-state.ts b/src/frontend/src/app/shared/page/page-state.ts index fa368a1d5..1257955c5 100644 --- a/src/frontend/src/app/shared/page/page-state.ts +++ b/src/frontend/src/app/shared/page/page-state.ts @@ -1,4 +1,4 @@ -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; export class Page { pageNo ? = 1; @@ -27,7 +27,7 @@ export class PageState { } - static fromState(state: State, page?: Page): PageState { + static fromState(state: ClrDatagridStateInterface, page?: Page): PageState { if (!state) { return new PageState(); } diff --git a/src/frontend/src/app/shared/shared.module.ts b/src/frontend/src/app/shared/shared.module.ts index 31c6553fe..a7bd80efd 100644 --- a/src/frontend/src/app/shared/shared.module.ts +++ b/src/frontend/src/app/shared/shared.module.ts @@ -61,7 +61,7 @@ import { EchartsModule } from './echarts/echars.module'; ResourceLimitModule, HttpClientModule, EchartsModule, - ClarityModule.forRoot(), + ClarityModule, ], declarations: [ PageNotFoundComponent, From 101830b8009b00c97c59334a96a6969aac2ae4fc Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Fri, 25 Jan 2019 10:47:23 +0800 Subject: [PATCH 030/112] frontend: update webpack && adapter clr/checkbox --- src/frontend/lib | 2 +- src/frontend/package-lock.json | 5047 ++++++----------- src/frontend/package.json | 2 +- ...reate-edit-persistentvolume.component.html | 23 +- .../list-persistentvolume.component.ts | 2 +- ...it-persistentvolumeclaimtpl.component.html | 20 +- 6 files changed, 1817 insertions(+), 3279 deletions(-) diff --git a/src/frontend/lib b/src/frontend/lib index 33779a137..e18125f2c 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 33779a137e2be48d202f627fcd9898bb1f544a41 +Subproject commit e18125f2c6a4b87deb1107dde75d46c3d8898ff7 diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 62ca702a3..541788a56 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -12,17 +12,6 @@ "requires": { "@angular-devkit/core": "7.2.3", "rxjs": "6.3.3" - }, - "dependencies": { - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - } } }, "@angular-devkit/build-angular": { @@ -80,230 +69,14 @@ "webpack-subresource-integrity": "1.1.0-rc.6" }, "dependencies": { - "@webassemblyjs/ast": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.7.11.tgz", - "integrity": "sha1-uYhYLK+7Kwlei1VlJvMMkNBXys4=", - "dev": true, - "requires": { - "@webassemblyjs/helper-module-context": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/wast-parser": "1.7.11" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.7.11.tgz", - "integrity": "sha1-pp8K9lAuuaPARVVbGmEp09Py4xM=", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.7.11.tgz", - "integrity": "sha1-MSLUjcxslFbtmC3r4WyPNxAd85s=", - "dev": true - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.7.11.tgz", - "integrity": "sha1-z48QbnRmYqDaKb3vY1/NPRJINks=", - "dev": true, - "requires": { - "@webassemblyjs/wast-printer": "1.7.11" - } - }, - "@webassemblyjs/helper-fsm": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.7.11.tgz", - "integrity": "sha1-3ziIKmJAgNA/dQP5Pj8XrFrAEYE=", - "dev": true - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.7.11.tgz", - "integrity": "sha1-3ZoegX8cLrEFtM8QEwk8ufPJywY=", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.7.11.tgz", - "integrity": "sha1-nJrEHs+fvP/8lvbSZ14t4zgR5oo=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11" - } - }, - "@webassemblyjs/leb128": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.7.11.tgz", - "integrity": "sha1-1yZ6HunEWU/T9+NymIGOxlaH22M=", - "dev": true, - "requires": { - "@xtuc/long": "4.2.1" - } - }, - "@webassemblyjs/wasm-edit": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.7.11.tgz", - "integrity": "sha1-jHTKR01PlR0B266b1wgU7iKoIAU=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/helper-wasm-section": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11", - "@webassemblyjs/wasm-opt": "1.7.11", - "@webassemblyjs/wasm-parser": "1.7.11", - "@webassemblyjs/wast-printer": "1.7.11" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.7.11.tgz", - "integrity": "sha1-m7upQvIjdWhqb7dZr816ycRdoag=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/ieee754": "1.7.11", - "@webassemblyjs/leb128": "1.7.11", - "@webassemblyjs/utf8": "1.7.11" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.7.11.tgz", - "integrity": "sha1-szHo5874+OLwB9QsOjagWAp9bKc=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11", - "@webassemblyjs/wasm-parser": "1.7.11" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.7.11.tgz", - "integrity": "sha1-bj0g+mo1GfawhO+Tka1YIR77Cho=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-api-error": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/ieee754": "1.7.11", - "@webassemblyjs/leb128": "1.7.11", - "@webassemblyjs/utf8": "1.7.11" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.7.11.tgz", - "integrity": "sha1-Jb0RdWLKjAAnIP+BFu+QctnKhpw=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/floating-point-hex-parser": "1.7.11", - "@webassemblyjs/helper-api-error": "1.7.11", - "@webassemblyjs/helper-code-frame": "1.7.11", - "@webassemblyjs/helper-fsm": "1.7.11", - "@xtuc/long": "4.2.1" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.7.11", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.7.11.tgz", - "integrity": "sha1-xCRbbeJCy1CizJUBdP2/ZceNeBM=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/wast-parser": "1.7.11", - "@xtuc/long": "4.2.1" - } - }, - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "chrome-trace-event": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.0.tgz", - "integrity": "sha1-Rakb0sIMlBHwljtarrmhuV4JzEg=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, - "eslint-scope": { - "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.0.tgz", - "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=", - "dev": true, - "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "http://registry.npm.taobao.org/estraverse/download/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "glob": { - "version": "7.1.3", - "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "opn": { - "version": "5.4.0", - "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.4.0.tgz", - "integrity": "sha1-y1Reeqt4VivrEao7+rxwQuF2EDU=", - "dev": true, - "requires": { - "is-wsl": "1.1.0" - } - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "schema-utils": { + "version": "0.4.7", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz", + "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", "dev": true, "requires": { - "tslib": "1.9.3" + "ajv": "6.6.2", + "ajv-keywords": "3.2.0" } }, "semver": { @@ -312,28 +85,6 @@ "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true - }, - "source-map-support": { - "version": "0.5.9", - "resolved": "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.9.tgz", - "integrity": "sha1-QbyVOyU0Jn6i1gW8z6e/oxEc7V8=", - "dev": true, - "requires": { - "buffer-from": "1.1.0", - "source-map": "0.6.1" - } - }, - "tapable": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz", - "integrity": "sha1-TSl5I8WnKkI2DeKrUtrfquwAAY4=", - "dev": true - }, "webpack": { "version": "4.28.4", "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.28.4.tgz", @@ -344,7 +95,7 @@ "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/wasm-edit": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", - "acorn": "5.7.1", + "acorn": "5.7.3", "acorn-dynamic-import": "3.0.0", "ajv": "6.6.2", "ajv-keywords": "3.2.0", @@ -352,29 +103,19 @@ "enhanced-resolve": "4.1.0", "eslint-scope": "4.0.0", "json-parse-better-errors": "1.0.2", - "loader-runner": "2.3.0", + "loader-runner": "2.4.0", "loader-utils": "1.1.0", "memory-fs": "0.4.1", "micromatch": "3.1.10", "mkdirp": "0.5.1", - "neo-async": "2.5.1", - "node-libs-browser": "2.1.0", - "schema-utils": "0.4.5", + "neo-async": "2.6.0", + "node-libs-browser": "2.2.0", + "schema-utils": "0.4.7", "tapable": "1.1.1", "terser-webpack-plugin": "1.2.1", "watchpack": "1.6.0", "webpack-sources": "1.3.0" } - }, - "webpack-sources": { - "version": "1.3.0", - "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz", - "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", - "dev": true, - "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" - } } } }, @@ -396,19 +137,13 @@ "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", "dev": true }, - "typescript": { - "version": "3.2.4", - "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-3.2.4.tgz", - "integrity": "sha1-xYXLlSkSJj2RW0YnJs4kS6UQ7z0=", - "dev": true - }, "webpack-sources": { "version": "1.2.0", "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.2.0.tgz", "integrity": "sha1-GBgeDQE/zglvr2+ObUHu///c6sI=", "dev": true, "requires": { - "source-list-map": "2.0.0", + "source-list-map": "2.0.1", "source-map": "0.6.1" }, "dependencies": { @@ -431,17 +166,6 @@ "@angular-devkit/architect": "0.12.3", "@angular-devkit/core": "7.2.3", "rxjs": "6.3.3" - }, - "dependencies": { - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - } } }, "@angular-devkit/core": { @@ -455,47 +179,6 @@ "fast-json-stable-stringify": "2.0.0", "rxjs": "6.3.3", "source-map": "0.7.3" - }, - "dependencies": { - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", - "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", - "dev": true - } } }, "@angular-devkit/schematics": { @@ -506,69 +189,6 @@ "requires": { "@angular-devkit/core": "7.2.3", "rxjs": "6.3.3" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "7.2.3", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", - "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", - "dev": true, - "requires": { - "ajv": "6.6.2", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", - "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } - } } }, "@angular/animations": { @@ -596,60 +216,13 @@ "symbol-observable": "1.2.0" }, "dependencies": { - "@angular-devkit/architect": { - "version": "0.12.3", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.12.3.tgz", - "integrity": "sha1-k2cdbPR6PXUQR1Ok5OrEzIGk050=", - "dev": true, - "requires": { - "@angular-devkit/core": "7.2.3", - "rxjs": "6.3.3" - } - }, - "@angular-devkit/core": { - "version": "7.2.3", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", - "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", - "dev": true, - "requires": { - "ajv": "6.6.2", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "opn": { + "version": "5.3.0", + "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.3.0.tgz", + "integrity": "sha1-ZIcVZchjh18FLP31PT48ta21Oxw=", "dev": true, "requires": { - "tslib": "1.9.3" + "is-wsl": "1.1.0" } }, "semver": { @@ -657,21 +230,6 @@ "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.1.tgz", "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", - "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } } } }, @@ -749,7 +307,7 @@ "requires": { "expand-range": "1.8.2", "preserve": "0.2.0", - "repeat-element": "1.1.2" + "repeat-element": "1.1.3" } }, "camelcase": { @@ -771,31 +329,7 @@ "is-binary-path": "1.0.1", "is-glob": "2.0.1", "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" - } - }, - "cliui": { - "version": "3.2.0", - "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } + "readdirp": "2.2.1" } }, "cross-spawn": { @@ -804,7 +338,7 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", + "lru-cache": "4.1.5", "shebang-command": "1.2.0", "which": "1.3.1" } @@ -857,6 +391,12 @@ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "is-glob": { "version": "2.0.1", "resolved": "http://registry.npm.taobao.org/is-glob/download/is-glob-2.0.1.tgz", @@ -881,7 +421,7 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "parse-json": "2.2.0", "pify": "2.3.0", "strip-bom": "3.0.0" @@ -978,23 +518,15 @@ "requires": { "is-fullwidth-code-point": "2.0.0", "strip-ansi": "4.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" } }, "strip-bom": { @@ -1138,15 +670,6 @@ "webpack-sources": "1.2.0" }, "dependencies": { - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, "source-map": { "version": "0.6.1", "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", @@ -1159,7 +682,7 @@ "integrity": "sha1-GBgeDQE/zglvr2+ObUHu///c6sI=", "dev": true, "requires": { - "source-list-map": "2.0.0", + "source-list-map": "2.0.1", "source-map": "0.6.1" } } @@ -1192,72 +715,11 @@ "typescript": "3.2.2" }, "dependencies": { - "@angular-devkit/core": { - "version": "7.2.3", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", - "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", - "dev": true, - "requires": { - "ajv": "6.6.2", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", - "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", - "dev": true - }, "typescript": { "version": "3.2.2", "resolved": "http://registry.npm.taobao.org/typescript/download/typescript-3.2.2.tgz", "integrity": "sha1-/oEBxGqhI/g1NSPr3PVzDCrkk+U=", "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } } } }, @@ -1277,100 +739,39 @@ "semver-intersect": "1.4.0" }, "dependencies": { - "@angular-devkit/core": { - "version": "7.2.3", - "resolved": "http://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.2.3.tgz", - "integrity": "sha1-A/rU7cv79bLw01oSHspFsSc7I4o=", - "dev": true, - "requires": { - "ajv": "6.6.2", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.6.2", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", - "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "rxjs": { - "version": "6.3.3", - "resolved": "http://registry.npm.taobao.org/rxjs/download/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", - "dev": true, - "requires": { - "tslib": "1.9.3" - } - }, "semver": { "version": "5.5.1", "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.1.tgz", "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", - "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } } } }, "@types/ace": { "version": "0.0.40", - "resolved": "http://r.cnpmjs.org/@types/ace/download/@types/ace-0.0.40.tgz", + "resolved": "http://registry.npm.taobao.org/@types/ace/download/@types/ace-0.0.40.tgz", "integrity": "sha1-9u+I4AaVCiIHd2+JGWskIXflHTU=", "dev": true }, "@types/d3-scale": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/@types/d3-scale/download/@types/d3-scale-2.0.1.tgz", - "integrity": "sha1-+UzZkcUEIrLmjY9Dvj+f/9sa574=", + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/@types/d3-scale/download/@types/d3-scale-2.1.0.tgz", + "integrity": "sha1-2ghcVRqkxK5IRaARFEfepuBPPSM=", "dev": true, "requires": { - "@types/d3-time": "1.0.8" + "@types/d3-time": "1.0.9" } }, "@types/d3-scale-chromatic": { - "version": "1.2.0", - "resolved": "http://registry.npm.taobao.org/@types/d3-scale-chromatic/download/@types/d3-scale-chromatic-1.2.0.tgz", - "integrity": "sha1-xBV0RiL9gDP5jrzJz5YtyDM97Jc=", + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/@types/d3-scale-chromatic/download/@types/d3-scale-chromatic-1.3.0.tgz", + "integrity": "sha1-uLWKeiYqWD/ByVzoUdWnWBGHUDQ=", "dev": true }, "@types/d3-time": { - "version": "1.0.8", - "resolved": "http://registry.npm.taobao.org/@types/d3-time/download/@types/d3-time-1.0.8.tgz", - "integrity": "sha1-bAgxJ7Mws8L8Zc0POm6cvZYHsow=", + "version": "1.0.9", + "resolved": "http://registry.npm.taobao.org/@types/d3-time/download/@types/d3-time-1.0.9.tgz", + "integrity": "sha1-ws8Fo81R+BC42Km7ygx0Aw1OU14=", "dev": true }, "@types/diff": { @@ -1387,23 +788,23 @@ }, "@types/echarts": { "version": "0.0.12", - "resolved": "http://r.cnpmjs.org/@types/echarts/download/@types/echarts-0.0.12.tgz", + "resolved": "http://registry.npm.taobao.org/@types/echarts/download/@types/echarts-0.0.12.tgz", "integrity": "sha1-aPG/knABcDa4gQbaF0uCZiCwUig=", "dev": true }, "@types/jasmine": { - "version": "2.8.8", - "resolved": "http://r.cnpmjs.org/@types/jasmine/download/@types/jasmine-2.8.8.tgz", - "integrity": "sha1-v1On0ZPqiwOGeji/20+7DgvwZsk=", + "version": "2.8.15", + "resolved": "http://registry.npm.taobao.org/@types/jasmine/download/@types/jasmine-2.8.15.tgz", + "integrity": "sha1-9Lc9jZMoulrUu5GR7BF9ELf9cSw=", "dev": true }, "@types/jasminewd2": { - "version": "2.0.3", - "resolved": "http://registry.npm.taobao.org/@types/jasminewd2/download/@types/jasminewd2-2.0.3.tgz", - "integrity": "sha1-DSiGsMva5MDuulXjB5L1hL8ECpU=", + "version": "2.0.6", + "resolved": "http://registry.npm.taobao.org/@types/jasminewd2/download/@types/jasminewd2-2.0.6.tgz", + "integrity": "sha1-L1eo2YdabJ7zKKFL0HC6FKBVrDk=", "dev": true, "requires": { - "@types/jasmine": "2.8.8" + "@types/jasmine": "2.8.15" } }, "@types/js-base64": { @@ -1413,14 +814,14 @@ "dev": true }, "@types/js-yaml": { - "version": "3.11.2", - "resolved": "http://registry.npm.taobao.org/@types/js-yaml/download/@types/js-yaml-3.11.2.tgz", - "integrity": "sha1-aZrYYFTMIAQ8MNZqb83jC79dPV4=", + "version": "3.12.0", + "resolved": "http://registry.npm.taobao.org/@types/js-yaml/download/@types/js-yaml-3.12.0.tgz", + "integrity": "sha1-NJTOlzWOJnXiTpenR+wjR47q+LY=", "dev": true }, "@types/marked": { "version": "0.4.2", - "resolved": "http://r.cnpmjs.org/@types/marked/download/@types/marked-0.4.2.tgz", + "resolved": "http://registry.npm.taobao.org/@types/marked/download/@types/marked-0.4.2.tgz", "integrity": "sha1-ZKieU+o39hzA8+4XMsVVwtv2RS8=" }, "@types/node": { @@ -1431,13 +832,13 @@ }, "@types/q": { "version": "0.0.32", - "resolved": "http://r.cnpmjs.org/@types/q/download/@types/q-0.0.32.tgz", + "resolved": "http://registry.npm.taobao.org/@types/q/download/@types/q-0.0.32.tgz", "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, "@types/selenium-webdriver": { "version": "2.53.43", - "resolved": "http://r.cnpmjs.org/@types/selenium-webdriver/download/@types/selenium-webdriver-2.53.43.tgz", + "resolved": "http://registry.npm.taobao.org/@types/selenium-webdriver/download/@types/selenium-webdriver-2.53.43.tgz", "integrity": "sha1-LePXGIGbwgFldUxKWa+36YM/Zwc=", "dev": true }, @@ -1467,38 +868,20 @@ } }, "@webassemblyjs/ast": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.4.3.tgz", - "integrity": "sha1-Oz9vztlE2GYCczR1M+bU0xW1k0o=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.7.11.tgz", + "integrity": "sha1-uYhYLK+7Kwlei1VlJvMMkNBXys4=", "dev": true, "requires": { - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "debug": "3.1.0", - "webassemblyjs": "1.4.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.4.3.tgz", - "integrity": "sha1-9a7kw3anF8dCZNe6ytqYHn5E+q0=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.7.11.tgz", + "integrity": "sha1-pp8K9lAuuaPARVVbGmEp09Py4xM=", "dev": true }, "@webassemblyjs/helper-api-error": { @@ -1508,44 +891,24 @@ "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.4.3.tgz", - "integrity": "sha1-BDS1WVhRm/UDaX04JIV7HeqAtyk=", - "dev": true, - "requires": { - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.7.11.tgz", + "integrity": "sha1-MSLUjcxslFbtmC3r4WyPNxAd85s=", + "dev": true }, "@webassemblyjs/helper-code-frame": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.4.3.tgz", - "integrity": "sha1-8TSco+AajinuIJjHcHc++Xr0NkE=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.7.11.tgz", + "integrity": "sha1-z48QbnRmYqDaKb3vY1/NPRJINks=", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.4.3" + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/helper-fsm": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.4.3.tgz", - "integrity": "sha1-Zakh20j7Q+ho8XsnSXhwvcriK3k=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.7.11.tgz", + "integrity": "sha1-3ziIKmJAgNA/dQP5Pj8XrFrAEYE=", "dev": true }, "@webassemblyjs/helper-module-context": { @@ -1555,39 +918,21 @@ "dev": true }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.4.3.tgz", - "integrity": "sha1-DltLVBjjP4om6UC3gJhigow3IaU=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.7.11.tgz", + "integrity": "sha1-3ZoegX8cLrEFtM8QEwk8ufPJywY=", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.4.3.tgz", - "integrity": "sha1-nO7dU6PxUsNBLgcoh63maNCxrL8=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.7.11.tgz", + "integrity": "sha1-nJrEHs+fvP/8lvbSZ14t4zgR5oo=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11" } }, "@webassemblyjs/ieee754": { @@ -1600,12 +945,12 @@ } }, "@webassemblyjs/leb128": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.4.3.tgz", - "integrity": "sha1-Wl5ZSdu1rf466VZk0EOZJ6xVf7g=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.7.11.tgz", + "integrity": "sha1-1yZ6HunEWU/T9+NymIGOxlaH22M=", "dev": true, "requires": { - "leb": "0.3.0" + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/utf8": { @@ -1614,126 +959,84 @@ "integrity": "sha1-Btchjqn9yUpnk6qSIIFg2z0m7oI=", "dev": true }, - "@webassemblyjs/validation": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/validation/download/@webassemblyjs/validation-1.4.3.tgz", - "integrity": "sha1-nmbJswede7zyBwwb9SpUryoJqsk=", + "@webassemblyjs/wasm-edit": { + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.7.11.tgz", + "integrity": "sha1-jHTKR01PlR0B266b1wgU7iKoIAU=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3" - } - }, - "@webassemblyjs/wasm-edit": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.4.3.tgz", - "integrity": "sha1-h/69Vl4P+1riX2SVuzlY0Xqgp3k=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/helper-wasm-section": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "@webassemblyjs/wasm-opt": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "@webassemblyjs/wast-printer": "1.4.3", - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/helper-wasm-section": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-opt": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/wasm-gen": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.4.3.tgz", - "integrity": "sha1-hVMWTQFUpr6PdNZT16s1X3MkCqQ=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.7.11.tgz", + "integrity": "sha1-m7upQvIjdWhqb7dZr816ycRdoag=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/leb128": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wasm-opt": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.4.3.tgz", - "integrity": "sha1-JseiO/sTaqQFsdNBDmNAjsYIlLg=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.7.11.tgz", + "integrity": "sha1-szHo5874+OLwB9QsOjagWAp9bKc=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11" } }, "@webassemblyjs/wasm-parser": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.4.3.tgz", - "integrity": "sha1-fd0+QI+FQmR+1hIBnPt4CDCZNpg=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.7.11.tgz", + "integrity": "sha1-bj0g+mo1GfawhO+Tka1YIR77Cho=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/leb128": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "webassemblyjs": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wast-parser": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.4.3.tgz", - "integrity": "sha1-MlBALixe1T2+IjPJ3h/h+fDVF0U=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.7.11.tgz", + "integrity": "sha1-Jb0RdWLKjAAnIP+BFu+QctnKhpw=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/floating-point-hex-parser": "1.4.3", - "@webassemblyjs/helper-code-frame": "1.4.3", - "@webassemblyjs/helper-fsm": "1.4.3", - "long": "3.2.0", - "webassemblyjs": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/floating-point-hex-parser": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-code-frame": "1.7.11", + "@webassemblyjs/helper-fsm": "1.7.11", + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.4.3.tgz", - "integrity": "sha1-PVmqjQJS1oFKPvTm0qNMne05BOA=", + "version": "1.7.11", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.7.11.tgz", + "integrity": "sha1-xCRbbeJCy1CizJUBdP2/ZceNeBM=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11", + "@xtuc/long": "4.2.1" } }, "@webcomponents/custom-elements": { @@ -1770,23 +1073,23 @@ } }, "abbrev": { - "version": "1.0.9", - "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz", + "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=" }, "accepts": { "version": "1.3.5", - "resolved": "http://r.cnpmjs.org/accepts/download/accepts-1.3.5.tgz", + "resolved": "http://registry.npm.taobao.org/accepts/download/accepts-1.3.5.tgz", "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "2.1.21", "negotiator": "0.6.1" } }, "ace": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/ace/download/ace-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/ace/download/ace-1.3.0.tgz", "integrity": "sha1-WDW3mcyhx5ZHCQ+8VIf5tUNMoGY=", "requires": { "archy": "1.0.0", @@ -1810,9 +1113,9 @@ } }, "acorn": { - "version": "5.7.1", - "resolved": "http://r.cnpmjs.org/acorn/download/acorn-5.7.1.tgz", - "integrity": "sha1-8JWCkpdwanyXdpWMCvyJMKm52dg=", + "version": "5.7.3", + "resolved": "http://registry.npm.taobao.org/acorn/download/acorn-5.7.3.tgz", + "integrity": "sha1-Z6ojG/iBKXS4UjWpZ3Hra9B+onk=", "dev": true }, "acorn-dynamic-import": { @@ -1821,7 +1124,7 @@ "integrity": "sha1-kBzu5Mf6rvfgetKkfokGddpQong=", "dev": true, "requires": { - "acorn": "5.7.1" + "acorn": "5.7.3" } }, "adm-zip": { @@ -1832,16 +1135,16 @@ }, "after": { "version": "0.8.2", - "resolved": "http://r.cnpmjs.org/after/download/after-0.8.2.tgz", + "resolved": "http://registry.npm.taobao.org/after/download/after-0.8.2.tgz", "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", "dev": true }, "agent-base": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/agent-base/download/agent-base-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-2.1.1.tgz", "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", "requires": { - "extend": "3.0.1", + "extend": "3.0.2", "semver": "5.0.1" } }, @@ -1855,15 +1158,15 @@ } }, "ajv": { - "version": "5.5.2", - "resolved": "http://r.cnpmjs.org/ajv/download/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "version": "6.6.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz", + "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", + "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ajv-errors": { @@ -1874,35 +1177,13 @@ }, "ajv-keywords": { "version": "3.2.0", - "resolved": "http://r.cnpmjs.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz", "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true }, - "align-text": { - "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/align-text/download/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "amdefine": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/amdefine/download/amdefine-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, @@ -1920,28 +1201,28 @@ }, "ansi-html": { "version": "0.0.7", - "resolved": "http://r.cnpmjs.org/ansi-html/download/ansi-html-0.0.7.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-html/download/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", "dev": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/ansi-regex/download/ansi-regex-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "ansi-styles": { "version": "3.2.1", - "resolved": "http://r.cnpmjs.org/ansi-styles/download/ansi-styles-3.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz", "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.2" + "color-convert": "1.9.3" } }, "any-promise": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/any-promise/download/any-promise-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/any-promise/download/any-promise-1.3.0.tgz", "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, "anymatch": { @@ -1956,33 +1237,33 @@ }, "app-root-path": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/app-root-path/download/app-root-path-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/app-root-path/download/app-root-path-2.1.0.tgz", "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=", "dev": true }, "append-transform": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/append-transform/download/append-transform-1.0.0.tgz", - "integrity": "sha1-BGpSrlgqIovXL1is++KWfGeHWas=", + "version": "0.4.0", + "resolved": "http://registry.npm.taobao.org/append-transform/download/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", "dev": true, "requires": { - "default-require-extensions": "2.0.0" + "default-require-extensions": "1.0.0" } }, "aproba": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/aproba/download/aproba-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz", "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", "dev": true }, "archy": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/archy/download/archy-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/archy/download/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "http://r.cnpmjs.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz", "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", "dev": true, "requires": { @@ -1992,7 +1273,7 @@ }, "argparse": { "version": "1.0.10", - "resolved": "http://r.cnpmjs.org/argparse/download/argparse-1.0.10.tgz", + "resolved": "http://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz", "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "requires": { "sprintf-js": "1.0.3" @@ -2006,19 +1287,19 @@ }, "arr-flatten": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/arr-flatten/download/arr-flatten-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/arr-flatten/download/arr-flatten-1.1.0.tgz", "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "arr-union": { "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/arr-union/download/arr-union-3.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/arr-union/download/arr-union-3.1.0.tgz", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, "array-find-index": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/array-find-index/download/array-find-index-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz", "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true, "optional": true @@ -2031,13 +1312,13 @@ }, "array-slice": { "version": "0.2.3", - "resolved": "http://r.cnpmjs.org/array-slice/download/array-slice-0.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/array-slice/download/array-slice-0.2.3.tgz", "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", "dev": true }, "array-union": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/array-union/download/array-union-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { @@ -2046,7 +1327,7 @@ }, "array-uniq": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/array-uniq/download/array-uniq-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/array-uniq/download/array-uniq-1.0.3.tgz", "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, @@ -2058,30 +1339,33 @@ }, "arraybuffer.slice": { "version": "0.0.6", - "resolved": "http://r.cnpmjs.org/arraybuffer.slice/download/arraybuffer.slice-0.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.6.tgz", "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", "dev": true }, "arrify": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/arrify/download/arrify-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/arrify/download/arrify-1.0.1.tgz", "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, "asap": { "version": "2.0.6", - "resolved": "http://r.cnpmjs.org/asap/download/asap-2.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/asap/download/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asn1": { - "version": "0.2.3", - "resolved": "http://r.cnpmjs.org/asn1/download/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true + "version": "0.2.4", + "resolved": "http://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz", + "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } }, "asn1.js": { "version": "4.10.1", - "resolved": "http://r.cnpmjs.org/asn1.js/download/asn1.js-4.10.1.tgz", + "resolved": "http://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz", "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=", "dev": true, "requires": { @@ -2092,7 +1376,7 @@ }, "assert": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/assert/download/assert-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz", "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", "dev": true, "requires": { @@ -2101,13 +1385,13 @@ "dependencies": { "inherits": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/inherits/download/inherits-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz", "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", "dev": true }, "util": { "version": "0.10.3", - "resolved": "http://r.cnpmjs.org/util/download/util-0.10.3.tgz", + "resolved": "http://registry.npm.taobao.org/util/download/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -2124,7 +1408,7 @@ }, "assign-symbols": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/assign-symbols/download/assign-symbols-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/assign-symbols/download/assign-symbols-1.0.0.tgz", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, @@ -2136,20 +1420,20 @@ }, "async-each": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/async-each/download/async-each-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/async-each/download/async-each-1.0.1.tgz", "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, "async-foreach": { "version": "0.1.3", - "resolved": "http://r.cnpmjs.org/async-foreach/download/async-foreach-0.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true, "optional": true }, "async-retry": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/async-retry/download/async-retry-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/async-retry/download/async-retry-0.1.1.tgz", "integrity": "sha1-ZBo8xuQOpuR+j/SLrZr68TdV+2A=", "requires": { "babel-runtime": "6.5.0", @@ -2158,7 +1442,7 @@ "dependencies": { "babel-runtime": { "version": "6.5.0", - "resolved": "http://r.cnpmjs.org/babel-runtime/download/babel-runtime-6.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.5.0.tgz", "integrity": "sha1-+3wYiQab2fggAjipvGrVteirW/s=", "requires": { "core-js": "1.2.7" @@ -2166,21 +1450,21 @@ }, "core-js": { "version": "1.2.7", - "resolved": "http://r.cnpmjs.org/core-js/download/core-js-1.2.7.tgz", + "resolved": "http://registry.npm.taobao.org/core-js/download/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" } } }, "asynckit": { "version": "0.4.0", - "resolved": "http://r.cnpmjs.org/asynckit/download/asynckit-0.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, "atob": { - "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/atob/download/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", + "version": "2.1.2", + "resolved": "http://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz", + "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=", "dev": true }, "autoprefixer": { @@ -2204,14 +1488,14 @@ "dev": true }, "aws4": { - "version": "1.7.0", - "resolved": "http://r.cnpmjs.org/aws4/download/aws4-1.7.0.tgz", - "integrity": "sha1-1NDpudv8p3vwjusKikcVUP454ok=", + "version": "1.8.0", + "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz", + "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=", "dev": true }, "babel-code-frame": { "version": "6.26.0", - "resolved": "http://r.cnpmjs.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { @@ -2222,13 +1506,13 @@ "dependencies": { "ansi-styles": { "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/ansi-styles/download/ansi-styles-2.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, "chalk": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -2241,7 +1525,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/supports-color/download/supports-color-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } @@ -2249,7 +1533,7 @@ }, "babel-generator": { "version": "6.26.1", - "resolved": "http://r.cnpmjs.org/babel-generator/download/babel-generator-6.26.1.tgz", + "resolved": "http://registry.npm.taobao.org/babel-generator/download/babel-generator-6.26.1.tgz", "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=", "dev": true, "requires": { @@ -2258,7 +1542,7 @@ "babel-types": "6.26.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", - "lodash": "4.17.10", + "lodash": "4.17.11", "source-map": "0.5.7", "trim-right": "1.0.1" }, @@ -2269,15 +1553,21 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", + "core-js": "2.6.3", "regenerator-runtime": "0.11.1" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, "babel-messages": { "version": "6.23.0", - "resolved": "http://r.cnpmjs.org/babel-messages/download/babel-messages-6.23.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-messages/download/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { @@ -2290,7 +1580,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", + "core-js": "2.6.3", "regenerator-runtime": "0.11.1" } } @@ -2301,12 +1591,12 @@ "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.6.1.tgz", "integrity": "sha1-eIuUtvY04luRvWxd9y1GdFevsAA=", "requires": { - "core-js": "2.5.7" + "core-js": "2.6.3" } }, "babel-template": { "version": "6.26.0", - "resolved": "http://r.cnpmjs.org/babel-template/download/babel-template-6.26.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-template/download/babel-template-6.26.0.tgz", "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { @@ -2314,7 +1604,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "lodash": "4.17.10" + "lodash": "4.17.11" }, "dependencies": { "babel-runtime": { @@ -2323,7 +1613,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", + "core-js": "2.6.3", "regenerator-runtime": "0.11.1" } } @@ -2331,7 +1621,7 @@ }, "babel-traverse": { "version": "6.26.0", - "resolved": "http://r.cnpmjs.org/babel-traverse/download/babel-traverse-6.26.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-traverse/download/babel-traverse-6.26.0.tgz", "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { @@ -2343,7 +1633,7 @@ "debug": "2.6.9", "globals": "9.18.0", "invariant": "2.2.4", - "lodash": "4.17.10" + "lodash": "4.17.11" }, "dependencies": { "babel-runtime": { @@ -2352,7 +1642,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", + "core-js": "2.6.3", "regenerator-runtime": "0.11.1" } }, @@ -2375,13 +1665,13 @@ }, "babel-types": { "version": "6.26.0", - "resolved": "http://r.cnpmjs.org/babel-types/download/babel-types-6.26.0.tgz", + "resolved": "http://registry.npm.taobao.org/babel-types/download/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { "babel-runtime": "6.26.0", "esutils": "2.0.2", - "lodash": "4.17.10", + "lodash": "4.17.11", "to-fast-properties": "1.0.3" }, "dependencies": { @@ -2391,7 +1681,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", + "core-js": "2.6.3", "regenerator-runtime": "0.11.1" } } @@ -2399,24 +1689,24 @@ }, "babylon": { "version": "6.18.0", - "resolved": "http://r.cnpmjs.org/babylon/download/babylon-6.18.0.tgz", + "resolved": "http://registry.npm.taobao.org/babylon/download/babylon-6.18.0.tgz", "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=", "dev": true }, "backo2": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/backo2/download/backo2-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/backo2/download/backo2-1.0.2.tgz", "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", "dev": true }, "balanced-match": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/balanced-match/download/balanced-match-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", - "resolved": "http://r.cnpmjs.org/base/download/base-0.11.2.tgz", + "resolved": "http://registry.npm.taobao.org/base/download/base-0.11.2.tgz", "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "dev": true, "requires": { @@ -2431,7 +1721,7 @@ "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { @@ -2440,7 +1730,7 @@ }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { @@ -2449,7 +1739,7 @@ }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { @@ -2458,7 +1748,7 @@ }, "is-descriptor": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/is-descriptor/download/is-descriptor-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { @@ -2471,41 +1761,40 @@ }, "base64-arraybuffer": { "version": "0.1.5", - "resolved": "http://r.cnpmjs.org/base64-arraybuffer/download/base64-arraybuffer-0.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.5.tgz", "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", "dev": true }, "base64-js": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/base64-js/download/base64-js-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz", "integrity": "sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM=", "dev": true }, "base64id": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/base64id/download/base64id-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/base64id/download/base64id-1.0.0.tgz", "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", "dev": true }, "batch": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/batch/download/batch-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz", "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, "bcrypt-pbkdf": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, - "optional": true, "requires": { "tweetnacl": "0.14.5" } }, "better-assert": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/better-assert/download/better-assert-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/better-assert/download/better-assert-1.0.2.tgz", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", "dev": true, "requires": { @@ -2514,25 +1803,25 @@ }, "big.js": { "version": "3.2.0", - "resolved": "http://r.cnpmjs.org/big.js/download/big.js-3.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz", "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=", "dev": true }, "binary-extensions": { - "version": "1.11.0", - "resolved": "http://r.cnpmjs.org/binary-extensions/download/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "version": "1.12.0", + "resolved": "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.12.0.tgz", + "integrity": "sha1-wteA9T1Fu6gxeokC1M7q86Y4WxQ=", "dev": true }, "blob": { "version": "0.0.4", - "resolved": "http://r.cnpmjs.org/blob/download/blob-0.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/blob/download/blob-0.0.4.tgz", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", "dev": true }, "block-stream": { "version": "0.0.9", - "resolved": "http://r.cnpmjs.org/block-stream/download/block-stream-0.0.9.tgz", + "resolved": "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "requires": { "inherits": "2.0.3" @@ -2548,21 +1837,21 @@ } }, "bluebird": { - "version": "3.5.1", - "resolved": "http://r.cnpmjs.org/bluebird/download/bluebird-3.5.1.tgz", - "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=", + "version": "3.5.3", + "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", + "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", "dev": true }, "bn.js": { "version": "4.11.8", - "resolved": "http://r.cnpmjs.org/bn.js/download/bn.js-4.11.8.tgz", + "resolved": "http://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz", "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { - "version": "1.18.2", - "resolved": "http://r.cnpmjs.org/body-parser/download/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "version": "1.18.3", + "resolved": "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.3.tgz", + "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", "dev": true, "requires": { "bytes": "3.0.0", @@ -2570,10 +1859,10 @@ "debug": "2.6.9", "depd": "1.1.2", "http-errors": "1.6.3", - "iconv-lite": "0.4.19", + "iconv-lite": "0.4.23", "on-finished": "2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", + "qs": "6.5.2", + "raw-body": "2.3.3", "type-is": "1.6.16" }, "dependencies": { @@ -2591,18 +1880,12 @@ "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "qs": { - "version": "6.5.1", - "resolved": "http://r.cnpmjs.org/qs/download/qs-6.5.1.tgz", - "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg=", - "dev": true } } }, "bonjour": { "version": "3.5.0", - "resolved": "http://r.cnpmjs.org/bonjour/download/bonjour-3.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz", "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { @@ -2615,13 +1898,9 @@ } }, "bootstrap": { - "version": "4.0.0-alpha.5", - "resolved": "http://registry.npm.taobao.org/bootstrap/download/bootstrap-4.0.0-alpha.5.tgz", - "integrity": "sha1-oSa2SMO9L1K4+tS7xeLQrSq/cGQ=", - "requires": { - "jquery": "3.3.1", - "tether": "1.4.4" - } + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/bootstrap/download/bootstrap-4.2.1.tgz", + "integrity": "sha1-j4vcoCTb8OhkTaMukYyKA6kKV1c=" }, "brace": { "version": "0.11.1", @@ -2630,7 +1909,7 @@ }, "brace-expansion": { "version": "1.1.11", - "resolved": "http://r.cnpmjs.org/brace-expansion/download/brace-expansion-1.1.11.tgz", + "resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "requires": { "balanced-match": "1.0.0", @@ -2648,7 +1927,7 @@ "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", - "repeat-element": "1.1.2", + "repeat-element": "1.1.3", "snapdragon": "0.8.2", "snapdragon-node": "2.1.1", "split-string": "3.1.0", @@ -2668,13 +1947,13 @@ }, "brorand": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/brorand/download/brorand-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz", "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "dev": true }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/browserify-aes/download/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz", "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=", "dev": true, "requires": { @@ -2688,29 +1967,30 @@ }, "browserify-cipher": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz", "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=", "dev": true, "requires": { "browserify-aes": "1.2.0", - "browserify-des": "1.0.1", + "browserify-des": "1.0.2", "evp_bytestokey": "1.0.3" } }, "browserify-des": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/browserify-des/download/browserify-des-1.0.1.tgz", - "integrity": "sha1-M0MSTbbXrVPiaogmMYcSvchFD5w=", + "version": "1.0.2", + "resolved": "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.2.tgz", + "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=", "dev": true, "requires": { "cipher-base": "1.0.4", "des.js": "1.0.0", - "inherits": "2.0.3" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://r.cnpmjs.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -2720,7 +2000,7 @@ }, "browserify-sign": { "version": "4.0.4", - "resolved": "http://r.cnpmjs.org/browserify-sign/download/browserify-sign-4.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { @@ -2728,9 +2008,9 @@ "browserify-rsa": "4.0.1", "create-hash": "1.2.0", "create-hmac": "1.1.7", - "elliptic": "6.4.0", + "elliptic": "6.4.1", "inherits": "2.0.3", - "parse-asn1": "5.1.1" + "parse-asn1": "5.1.3" } }, "browserify-zlib": { @@ -2754,7 +2034,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "http://r.cnpmjs.org/buffer/download/buffer-4.9.1.tgz", + "resolved": "http://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -2763,69 +2043,91 @@ "isarray": "1.0.0" } }, - "buffer-from": { + "buffer-alloc": { + "version": "1.2.0", + "resolved": "http://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz", + "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" + } + }, + "buffer-alloc-unsafe": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/buffer-from/download/buffer-from-1.1.0.tgz", - "integrity": "sha1-h/yqOimDWOCt5uRCz86EB0DRrQQ=" + "resolved": "http://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=", + "dev": true + }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "dev": true + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz", + "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=" }, "buffer-indexof": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/buffer-indexof/download/buffer-indexof-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/buffer-indexof/download/buffer-indexof-1.1.1.tgz", "integrity": "sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow=", "dev": true }, "buffer-xor": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/buffer-xor/download/buffer-xor-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz", "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, "builtin-modules": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/builtin-modules/download/builtin-modules-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" }, "builtin-status-codes": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz", "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, "builtins": { "version": "0.0.7", - "resolved": "http://r.cnpmjs.org/builtins/download/builtins-0.0.7.tgz", + "resolved": "http://registry.npm.taobao.org/builtins/download/builtins-0.0.7.tgz", "integrity": "sha1-NVIZzWzxjb58Acx/0tznZc/cVJo=" }, "bytes": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/bytes/download/bytes-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, "cacache": { "version": "10.0.4", - "resolved": "http://r.cnpmjs.org/cacache/download/cacache-10.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-10.0.4.tgz", "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=", "dev": true, "requires": { - "bluebird": "3.5.1", - "chownr": "1.0.1", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "lru-cache": "4.1.3", + "bluebird": "3.5.3", + "chownr": "1.1.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "4.1.5", "mississippi": "2.0.0", "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "ssri": "5.3.0", - "unique-filename": "1.1.0", + "unique-filename": "1.1.1", "y18n": "4.0.0" } }, "cache-base": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/cache-base/download/cache-base-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/cache-base/download/cache-base-1.0.1.tgz", "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "dev": true, "requires": { @@ -2842,35 +2144,26 @@ }, "callsite": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/callsite/download/callsite-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/callsite/download/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", "dev": true }, "camelcase": { - "version": "1.2.1", - "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", "dev": true, "optional": true }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "optional": true, "requires": { "camelcase": "2.1.1", "map-obj": "1.0.1" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true, - "optional": true - } } }, "caniuse-lite": { @@ -2886,51 +2179,34 @@ "dev": true }, "capture-stack-trace": { - "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/capture-stack-trace/download/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + "version": "1.0.1", + "resolved": "http://registry.npm.taobao.org/capture-stack-trace/download/capture-stack-trace-1.0.1.tgz", + "integrity": "sha1-psC74fOPOqC5Ijjstv9Cw0TUE10=" }, "caseless": { "version": "0.12.0", - "resolved": "http://r.cnpmjs.org/caseless/download/caseless-0.12.0.tgz", + "resolved": "http://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, - "center-align": { - "version": "0.1.3", - "resolved": "http://r.cnpmjs.org/center-align/download/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, "chalk": { - "version": "2.2.2", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-2.2.2.tgz", - "integrity": "sha1-RAP1zxjzXAX1H73xUr9Yj5Vs98s=", + "version": "2.4.2", + "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "supports-color": "5.5.0" }, "dependencies": { - "has-flag": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, "supports-color": { - "version": "4.5.0", - "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "5.5.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" } } } @@ -2957,25 +2233,28 @@ "lodash.debounce": "4.0.8", "normalize-path": "2.1.1", "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", + "readdirp": "2.2.1", "upath": "1.1.0" } }, "chownr": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/chownr/download/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", + "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", "dev": true }, "chrome-trace-event": { - "version": "0.1.3", - "resolved": "http://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-0.1.3.tgz", - "integrity": "sha1-05WvLTHIe5CnFsgx/jJvaXaOwIQ=", - "dev": true + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.0.tgz", + "integrity": "sha1-Rakb0sIMlBHwljtarrmhuV4JzEg=", + "dev": true, + "requires": { + "tslib": "1.9.3" + } }, "cipher-base": { "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/cipher-base/download/cipher-base-1.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz", "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { @@ -2991,7 +2270,7 @@ }, "class-utils": { "version": "0.3.6", - "resolved": "http://r.cnpmjs.org/class-utils/download/class-utils-0.3.6.tgz", + "resolved": "http://registry.npm.taobao.org/class-utils/download/class-utils-0.3.6.tgz", "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "dev": true, "requires": { @@ -3003,7 +2282,7 @@ "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-0.2.5.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { @@ -3045,9 +2324,9 @@ "dev": true }, "clipboard": { - "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/clipboard/download/clipboard-2.0.1.tgz", - "integrity": "sha1-oSSB4cE9ilD18DawVg/l0W105Go=", + "version": "2.0.4", + "resolved": "http://registry.npm.taobao.org/clipboard/download/clipboard-2.0.4.tgz", + "integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=", "optional": true, "requires": { "good-listener": "1.2.2", @@ -3056,24 +2335,14 @@ } }, "cliui": { - "version": "2.1.0", - "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "version": "3.2.0", + "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, - "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - } + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone": { @@ -3084,7 +2353,7 @@ }, "clone-deep": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/clone-deep/download/clone-deep-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/clone-deep/download/clone-deep-2.0.2.tgz", "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=", "dev": true, "requires": { @@ -3096,13 +2365,13 @@ }, "co": { "version": "4.6.0", - "resolved": "http://r.cnpmjs.org/co/download/co-4.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, "code-point-at": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/code-point-at/download/code-point-at-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, @@ -3113,16 +2382,24 @@ "dev": true, "requires": { "app-root-path": "2.1.0", - "css-selector-tokenizer": "0.7.0", + "css-selector-tokenizer": "0.7.1", "cssauron": "1.4.0", "semver-dsl": "1.0.1", "source-map": "0.5.7", "sprintf-js": "1.0.3" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "collection-visit": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/collection-visit/download/collection-visit-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { @@ -3131,77 +2408,71 @@ } }, "color-convert": { - "version": "1.9.2", - "resolved": "http://r.cnpmjs.org/color-convert/download/color-convert-1.9.2.tgz", - "integrity": "sha1-SYgbj7pn3xKpa98/VsCqueeRMUc=", + "version": "1.9.3", + "resolved": "http://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz", + "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=", "dev": true, "requires": { - "color-name": "1.1.1" + "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/color-name/download/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", + "version": "1.1.3", + "resolved": "http://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "colors": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/colors/download/colors-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/colors/download/colors-1.1.2.tgz", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "dev": true }, "combine-lists": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/combine-lists/download/combine-lists-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/combine-lists/download/combine-lists-1.0.1.tgz", "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "4.17.11" } }, "combined-stream": { - "version": "1.0.6", - "resolved": "http://r.cnpmjs.org/combined-stream/download/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "version": "1.0.7", + "resolved": "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.7.tgz", + "integrity": "sha1-LR0kMXr7ir6V1tLAsHtXgTU52Cg=", "dev": true, "requires": { "delayed-stream": "1.0.0" } }, "commander": { - "version": "2.16.0", - "resolved": "http://r.cnpmjs.org/commander/download/commander-2.16.0.tgz", - "integrity": "sha1-8WOQWTmWzrTz7rAgsx14Uo9/ilA=", + "version": "2.17.1", + "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz", + "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", "dev": true }, "commondir": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/commondir/download/commondir-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz", "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "compare-versions": { - "version": "3.3.0", - "resolved": "http://r.cnpmjs.org/compare-versions/download/compare-versions-3.3.0.tgz", - "integrity": "sha1-r5PqcFqWlD9iKrMJV4ubkFhvOcM=", - "dev": true - }, "component-bind": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/component-bind/download/component-bind-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz", "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", "dev": true }, "component-emitter": { "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/component-emitter/download/component-emitter-1.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true }, "component-inherit": { "version": "0.0.3", - "resolved": "http://r.cnpmjs.org/component-inherit/download/component-inherit-0.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/component-inherit/download/component-inherit-0.0.3.tgz", "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", "dev": true }, @@ -3212,14 +2483,6 @@ "dev": true, "requires": { "mime-db": "1.37.0" - }, - "dependencies": { - "mime-db": { - "version": "1.37.0", - "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz", - "integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=", - "dev": true - } } }, "compression": { @@ -3256,16 +2519,16 @@ }, "concat-map": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/concat-map/download/concat-map-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", - "resolved": "http://r.cnpmjs.org/concat-stream/download/concat-stream-1.6.2.tgz", + "resolved": "http://registry.npm.taobao.org/concat-stream/download/concat-stream-1.6.2.tgz", "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "dev": true, "requires": { - "buffer-from": "1.1.0", + "buffer-from": "1.1.1", "inherits": "2.0.3", "readable-stream": "2.3.6", "typedarray": "0.0.6" @@ -3273,7 +2536,7 @@ }, "connect": { "version": "3.6.6", - "resolved": "http://r.cnpmjs.org/connect/download/connect-3.6.6.tgz", + "resolved": "http://registry.npm.taobao.org/connect/download/connect-3.6.6.tgz", "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=", "dev": true, "requires": { @@ -3294,7 +2557,7 @@ }, "finalhandler": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/finalhandler/download/finalhandler-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.0.tgz", "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", "dev": true, "requires": { @@ -3315,7 +2578,7 @@ }, "statuses": { "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/statuses/download/statuses-1.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/statuses/download/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "dev": true } @@ -3329,7 +2592,7 @@ }, "console-browserify": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/console-browserify/download/console-browserify-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/console-browserify/download/console-browserify-1.1.0.tgz", "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { @@ -3338,25 +2601,25 @@ }, "console-control-strings": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/console-control-strings/download/console-control-strings-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "constants-browserify": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/constants-browserify/download/constants-browserify-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz", "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", "dev": true }, "content-disposition": { "version": "0.5.2", - "resolved": "http://r.cnpmjs.org/content-disposition/download/content-disposition-0.5.2.tgz", + "resolved": "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz", "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", "dev": true }, "content-type": { "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/content-type/download/content-type-1.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz", "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, @@ -3371,19 +2634,19 @@ }, "cookie": { "version": "0.3.1", - "resolved": "http://r.cnpmjs.org/cookie/download/cookie-0.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/cookie/download/cookie-0.3.1.tgz", "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, "cookie-signature": { "version": "1.0.6", - "resolved": "http://r.cnpmjs.org/cookie-signature/download/cookie-signature-1.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, "copy-concurrently": { "version": "1.0.5", - "resolved": "http://r.cnpmjs.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz", "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=", "dev": true, "requires": { @@ -3391,13 +2654,13 @@ "fs-write-stream-atomic": "1.0.10", "iferr": "0.1.5", "mkdirp": "0.5.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "run-queue": "1.0.3" } }, "copy-descriptor": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, @@ -3414,17 +2677,17 @@ "loader-utils": "1.1.0", "minimatch": "3.0.4", "p-limit": "1.3.0", - "serialize-javascript": "1.5.0" + "serialize-javascript": "1.6.1" } }, "core-js": { - "version": "2.5.7", - "resolved": "http://r.cnpmjs.org/core-js/download/core-js-2.5.7.tgz", - "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=" + "version": "2.6.3", + "resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.6.3.tgz", + "integrity": "sha1-S3CTi9/9r2STHmbi2xWPCJIonEk=" }, "core-util-is": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/core-util-is/download/core-util-is-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { @@ -3434,7 +2697,7 @@ "dev": true, "requires": { "is-directory": "0.3.1", - "js-yaml": "3.12.0", + "js-yaml": "3.12.1", "parse-json": "4.0.0", "require-from-string": "2.0.2" }, @@ -3453,39 +2716,39 @@ }, "create-ecdh": { "version": "4.0.3", - "resolved": "http://r.cnpmjs.org/create-ecdh/download/create-ecdh-4.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.3.tgz", "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=", "dev": true, "requires": { "bn.js": "4.11.8", - "elliptic": "6.4.0" + "elliptic": "6.4.1" } }, "create-error-class": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/create-error-class/download/create-error-class-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/create-error-class/download/create-error-class-2.0.1.tgz", "integrity": "sha1-qHWe1cjSFKRh6B0Y5wqssz3WPJw=", "requires": { - "capture-stack-trace": "1.0.0", + "capture-stack-trace": "1.0.1", "inherits": "2.0.3" } }, "create-hash": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/create-hash/download/create-hash-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz", "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=", "dev": true, "requires": { "cipher-base": "1.0.4", "inherits": "2.0.3", - "md5.js": "1.3.4", + "md5.js": "1.3.5", "ripemd160": "2.0.2", "sha.js": "2.4.11" } }, "create-hmac": { "version": "1.1.7", - "resolved": "http://r.cnpmjs.org/create-hmac/download/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz", "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=", "dev": true, "requires": { @@ -3498,28 +2761,28 @@ } }, "cron-parser": { - "version": "2.6.0", - "resolved": "http://registry.npm.taobao.org/cron-parser/download/cron-parser-2.6.0.tgz", - "integrity": "sha1-riUUztqcy1QCVuIBvdI66BTgNnQ=", + "version": "2.7.3", + "resolved": "http://registry.npm.taobao.org/cron-parser/download/cron-parser-2.7.3.tgz", + "integrity": "sha1-EmA/ifU3WvNTqTV74lQ9MXLqxlE=", "requires": { "is-nan": "1.2.1", - "moment-timezone": "0.5.21" + "moment-timezone": "0.5.23" } }, "cross-spawn": { "version": "3.0.1", - "resolved": "http://r.cnpmjs.org/cross-spawn/download/cross-spawn-3.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "optional": true, "requires": { - "lru-cache": "4.1.3", + "lru-cache": "4.1.5", "which": "1.3.1" } }, "crypto-browserify": { "version": "3.12.0", - "resolved": "http://r.cnpmjs.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz", + "resolved": "http://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz", "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=", "dev": true, "requires": { @@ -3530,32 +2793,32 @@ "create-hmac": "1.1.7", "diffie-hellman": "5.0.3", "inherits": "2.0.3", - "pbkdf2": "3.0.16", - "public-encrypt": "4.0.2", + "pbkdf2": "3.0.17", + "public-encrypt": "4.0.3", "randombytes": "2.0.6", "randomfill": "1.0.4" } }, "css-parse": { "version": "1.7.0", - "resolved": "http://r.cnpmjs.org/css-parse/download/css-parse-1.7.0.tgz", + "resolved": "http://registry.npm.taobao.org/css-parse/download/css-parse-1.7.0.tgz", "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", "dev": true }, "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "http://r.cnpmjs.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "version": "0.7.1", + "resolved": "http://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.1.tgz", + "integrity": "sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=", "dev": true, "requires": { "cssesc": "0.1.0", - "fastparse": "1.1.1", + "fastparse": "1.1.2", "regexpu-core": "1.0.0" } }, "cssauron": { "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/cssauron/download/cssauron-1.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/cssauron/download/cssauron-1.4.0.tgz", "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { @@ -3564,13 +2827,13 @@ }, "cssesc": { "version": "0.1.0", - "resolved": "http://r.cnpmjs.org/cssesc/download/cssesc-0.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/cssesc/download/cssesc-0.1.0.tgz", "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", "dev": true }, "currently-unhandled": { "version": "0.4.1", - "resolved": "http://r.cnpmjs.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "optional": true, @@ -3580,82 +2843,82 @@ }, "custom-event": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/custom-event/download/custom-event-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/custom-event/download/custom-event-1.0.1.tgz", "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", "dev": true }, "cyclist": { "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/cyclist/download/cyclist-0.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/cyclist/download/cyclist-0.2.2.tgz", "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, "d3-array": { - "version": "1.2.1", - "resolved": "http://registry.npm.taobao.org/d3-array/download/d3-array-1.2.1.tgz", - "integrity": "sha1-0coz3i9qwx76244FCgIdfiOW1dw=" + "version": "1.2.4", + "resolved": "http://registry.npm.taobao.org/d3-array/download/d3-array-1.2.4.tgz", + "integrity": "sha1-Y1zk1e6nWfb2BYY9vPww7cc39x8=" }, "d3-collection": { - "version": "1.0.4", - "resolved": "http://registry.npm.taobao.org/d3-collection/download/d3-collection-1.0.4.tgz", - "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=" + "version": "1.0.7", + "resolved": "http://registry.npm.taobao.org/d3-collection/download/d3-collection-1.0.7.tgz", + "integrity": "sha1-NJvSqpl32wcQkcExRNXk8WtbMQ4=" }, "d3-color": { - "version": "1.2.0", - "resolved": "http://registry.npm.taobao.org/d3-color/download/d3-color-1.2.0.tgz", - "integrity": "sha1-0eoZ21hZyGhUWGJ27Iks+TFIRZo=" + "version": "1.2.3", + "resolved": "http://registry.npm.taobao.org/d3-color/download/d3-color-1.2.3.tgz", + "integrity": "sha1-bGe7KvbfPMjXnvzE06PoPijIBI8=" }, "d3-format": { - "version": "1.3.0", - "resolved": "http://registry.npm.taobao.org/d3-format/download/d3-format-1.3.0.tgz", - "integrity": "sha1-o6xEJpogEc24fHtWkwQMGM3f/xE=" + "version": "1.3.2", + "resolved": "http://registry.npm.taobao.org/d3-format/download/d3-format-1.3.2.tgz", + "integrity": "sha1-apa14xvLmBIqMIY/fZI2XABgNWI=" }, "d3-interpolate": { - "version": "1.2.0", - "resolved": "http://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.2.0.tgz", - "integrity": "sha1-QNgb2OlZ/wIcXqdUW8ebjSIzHEE=", + "version": "1.3.2", + "resolved": "http://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.3.2.tgz", + "integrity": "sha1-QX0+vetLxO/Mj9Q2HFXkBAIR/Wg=", "requires": { - "d3-color": "1.2.0" + "d3-color": "1.2.3" } }, "d3-scale": { - "version": "2.1.0", - "resolved": "http://registry.npm.taobao.org/d3-scale/download/d3-scale-2.1.0.tgz", - "integrity": "sha1-jT/T4qfJCAeCpSPAhQfFJIKJ7vg=", + "version": "2.1.2", + "resolved": "http://registry.npm.taobao.org/d3-scale/download/d3-scale-2.1.2.tgz", + "integrity": "sha1-TpMre2AYKu6Qc+3odkyYQj5fmpQ=", "requires": { - "d3-array": "1.2.1", - "d3-collection": "1.0.4", - "d3-format": "1.3.0", - "d3-interpolate": "1.2.0", - "d3-time": "1.0.8", - "d3-time-format": "2.1.1" + "d3-array": "1.2.4", + "d3-collection": "1.0.7", + "d3-format": "1.3.2", + "d3-interpolate": "1.3.2", + "d3-time": "1.0.10", + "d3-time-format": "2.1.3" } }, "d3-scale-chromatic": { - "version": "1.3.0", - "resolved": "http://registry.npm.taobao.org/d3-scale-chromatic/download/d3-scale-chromatic-1.3.0.tgz", - "integrity": "sha1-fuOP/Kp61Vz+2DpqZoqsVXDGU8Q=", + "version": "1.3.3", + "resolved": "http://registry.npm.taobao.org/d3-scale-chromatic/download/d3-scale-chromatic-1.3.3.tgz", + "integrity": "sha1-2tQ2bw7csoj0kBKJecPHk1g+08A=", "requires": { - "d3-color": "1.2.0", - "d3-interpolate": "1.2.0" + "d3-color": "1.2.3", + "d3-interpolate": "1.3.2" } }, "d3-time": { - "version": "1.0.8", - "resolved": "http://registry.npm.taobao.org/d3-time/download/d3-time-1.0.8.tgz", - "integrity": "sha1-29LWAHv0Fv5np20XlHt4S//qHoQ=" + "version": "1.0.10", + "resolved": "http://registry.npm.taobao.org/d3-time/download/d3-time-1.0.10.tgz", + "integrity": "sha1-glndcSiNcu6s/Y3igcS/XHOTBTw=" }, "d3-time-format": { - "version": "2.1.1", - "resolved": "http://registry.npm.taobao.org/d3-time-format/download/d3-time-format-2.1.1.tgz", - "integrity": "sha1-hbfN+8n/yhh/FNPEVv/aJoCBuzE=", + "version": "2.1.3", + "resolved": "http://registry.npm.taobao.org/d3-time-format/download/d3-time-format-2.1.3.tgz", + "integrity": "sha1-rgb44BJqnWDWNk6sWxUzrhusgms=", "requires": { - "d3-time": "1.0.8" + "d3-time": "1.0.10" } }, "dashdash": { "version": "1.14.1", - "resolved": "http://r.cnpmjs.org/dashdash/download/dashdash-1.14.1.tgz", + "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { @@ -3664,7 +2927,7 @@ }, "date-now": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/date-now/download/date-now-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/date-now/download/date-now-0.1.4.tgz", "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "dev": true }, @@ -3678,24 +2941,24 @@ }, "debuglog": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/debuglog/download/debuglog-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/debuglog/download/debuglog-1.0.1.tgz", "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=" }, "decamelize": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/decamelize/download/decamelize-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, "decode-uri-component": { "version": "0.2.0", - "resolved": "http://r.cnpmjs.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, "deep-equal": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/deep-equal/download/deep-equal-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz", "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, @@ -3716,28 +2979,19 @@ } }, "default-require-extensions": { - "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/default-require-extensions/download/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/default-require-extensions/download/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", "dev": true, "requires": { - "strip-bom": "3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/strip-bom/download/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } + "strip-bom": "2.0.0" } }, "define-properties": { - "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/define-properties/download/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "version": "1.1.3", + "resolved": "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz", + "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", "requires": { - "foreach": "2.0.5", "object-keys": "1.0.12" }, "dependencies": { @@ -3750,7 +3004,7 @@ }, "define-property": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz", "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", "dev": true, "requires": { @@ -3760,7 +3014,7 @@ "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { @@ -3769,7 +3023,7 @@ }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { @@ -3778,7 +3032,7 @@ }, "is-descriptor": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/is-descriptor/download/is-descriptor-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { @@ -3791,7 +3045,7 @@ }, "del": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/del/download/del-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/del/download/del-3.0.0.tgz", "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { @@ -3800,17 +3054,17 @@ "is-path-in-cwd": "1.0.1", "p-map": "1.2.0", "pify": "3.0.0", - "rimraf": "2.6.2" + "rimraf": "2.6.3" }, "dependencies": { "globby": { "version": "6.1.0", - "resolved": "http://r.cnpmjs.org/globby/download/globby-6.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { "array-union": "1.0.2", - "glob": "7.1.2", + "glob": "7.1.3", "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1" @@ -3818,7 +3072,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -3828,25 +3082,25 @@ }, "delayed-stream": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/delayed-stream/download/delayed-stream-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, "delegate": { "version": "3.2.0", - "resolved": "http://r.cnpmjs.org/delegate/download/delegate-3.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz", "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY=", "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/delegates/download/delegates-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true }, "depd": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/depd/download/depd-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, @@ -3858,7 +3112,7 @@ }, "des.js": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/des.js/download/des.js-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/des.js/download/des.js-1.0.0.tgz", "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { @@ -3868,13 +3122,13 @@ }, "destroy": { "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/destroy/download/destroy-1.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, "detect-indent": { "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/detect-indent/download/detect-indent-4.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/detect-indent/download/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { @@ -3889,7 +3143,7 @@ }, "dezalgo": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/dezalgo/download/dezalgo-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/dezalgo/download/dezalgo-1.0.3.tgz", "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", "requires": { "asap": "2.0.6", @@ -3898,7 +3152,7 @@ }, "di": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/di/download/di-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/di/download/di-0.0.1.tgz", "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", "dev": true }, @@ -3908,26 +3162,19 @@ "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=" }, "diff2html": { - "version": "2.5.0", - "resolved": "http://registry.npm.taobao.org/diff2html/download/diff2html-2.5.0.tgz", - "integrity": "sha1-LRbxqPEVNUczsWsCZKWU+n25iqI=", + "version": "2.7.0", + "resolved": "http://registry.npm.taobao.org/diff2html/download/diff2html-2.7.0.tgz", + "integrity": "sha1-5FxYBWo2I17IcSJc56HsYZZtzGY=", "requires": { "diff": "3.5.0", "hogan.js": "3.0.2", - "lodash": "4.17.11", + "lodash.merge": "4.6.1", "whatwg-fetch": "3.0.0" - }, - "dependencies": { - "lodash": { - "version": "4.17.11", - "resolved": "http://registry.npm.taobao.org/lodash/download/lodash-4.17.11.tgz", - "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=" - } } }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://r.cnpmjs.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz", "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=", "dev": true, "requires": { @@ -3947,13 +3194,13 @@ }, "dns-equal": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/dns-equal/download/dns-equal-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz", "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", "dev": true }, "dns-packet": { "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/dns-packet/download/dns-packet-1.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/dns-packet/download/dns-packet-1.3.1.tgz", "integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=", "dev": true, "requires": { @@ -3963,7 +3210,7 @@ }, "dns-txt": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/dns-txt/download/dns-txt-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz", "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { @@ -3972,34 +3219,34 @@ }, "dom-serialize": { "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/dom-serialize/download/dom-serialize-2.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/dom-serialize/download/dom-serialize-2.2.1.tgz", "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { "custom-event": "1.0.1", "ent": "2.2.0", - "extend": "3.0.1", + "extend": "3.0.2", "void-elements": "2.0.1" } }, "domain-browser": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/domain-browser/download/domain-browser-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz", "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=", "dev": true }, "duplexer2": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/duplexer2/download/duplexer2-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/duplexer2/download/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "requires": { "readable-stream": "2.3.6" } }, "duplexify": { - "version": "3.6.0", - "resolved": "http://r.cnpmjs.org/duplexify/download/duplexify-3.6.0.tgz", - "integrity": "sha1-WSkD9dgLONA3IgVBJk1poZj7NBA=", + "version": "3.6.1", + "resolved": "http://registry.npm.taobao.org/duplexify/download/duplexify-3.6.1.tgz", + "integrity": "sha1-saeinEq/1jlYXvrszoDWZrHjQSU=", "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", @@ -4009,22 +3256,22 @@ }, "easy-table": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/easy-table/download/easy-table-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/easy-table/download/easy-table-1.0.0.tgz", "integrity": "sha1-KdstCFXTYxbkOC5aPYXZy1/JMhY=" }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "version": "0.1.2", + "resolved": "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, - "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" } }, "echarts": { "version": "4.1.0", - "resolved": "http://r.cnpmjs.org/echarts/download/echarts-4.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/echarts/download/echarts-4.1.0.tgz", "integrity": "sha1-1YjJX3PBqZKLnHPVt2l1HDGFvNw=", "requires": { "zrender": "4.0.4" @@ -4032,7 +3279,7 @@ }, "ee-first": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/ee-first/download/ee-first-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, @@ -4043,14 +3290,14 @@ "dev": true }, "elliptic": { - "version": "6.4.0", - "resolved": "http://r.cnpmjs.org/elliptic/download/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "version": "6.4.1", + "resolved": "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.1.tgz", + "integrity": "sha1-wtC3d2kRuGcixjLDwGxg8vgZk5o=", "dev": true, "requires": { "bn.js": "4.11.8", "brorand": "1.1.0", - "hash.js": "1.1.4", + "hash.js": "1.1.7", "hmac-drbg": "1.0.1", "inherits": "2.0.3", "minimalistic-assert": "1.0.1", @@ -4059,13 +3306,13 @@ }, "emojis-list": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/emojis-list/download/emojis-list-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, "encodeurl": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/encodeurl/download/encodeurl-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, @@ -4075,12 +3322,12 @@ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "0.4.19" + "iconv-lite": "0.4.23" } }, "end-of-stream": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/end-of-stream/download/end-of-stream-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.1.tgz", "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", "requires": { "once": "1.4.0" @@ -4088,7 +3335,7 @@ }, "engine.io": { "version": "1.8.3", - "resolved": "http://r.cnpmjs.org/engine.io/download/engine.io-1.8.3.tgz", + "resolved": "http://registry.npm.taobao.org/engine.io/download/engine.io-1.8.3.tgz", "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=", "dev": true, "requires": { @@ -4102,17 +3349,17 @@ "dependencies": { "accepts": { "version": "1.3.3", - "resolved": "http://r.cnpmjs.org/accepts/download/accepts-1.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/accepts/download/accepts-1.3.3.tgz", "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "2.1.21", "negotiator": "0.6.1" } }, "debug": { "version": "2.3.3", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -4121,7 +3368,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://r.cnpmjs.org/ms/download/ms-0.7.2.tgz", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -4129,7 +3376,7 @@ }, "engine.io-client": { "version": "1.8.3", - "resolved": "http://r.cnpmjs.org/engine.io-client/download/engine.io-client-1.8.3.tgz", + "resolved": "http://registry.npm.taobao.org/engine.io-client/download/engine.io-client-1.8.3.tgz", "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=", "dev": true, "requires": { @@ -4149,7 +3396,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -4158,7 +3405,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://r.cnpmjs.org/ms/download/ms-0.7.2.tgz", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -4166,7 +3413,7 @@ }, "engine.io-parser": { "version": "1.3.2", - "resolved": "http://r.cnpmjs.org/engine.io-parser/download/engine.io-parser-1.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-1.3.2.tgz", "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", "dev": true, "requires": { @@ -4184,14 +3431,14 @@ "integrity": "sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "memory-fs": "0.4.1", - "tapable": "1.0.0" + "tapable": "1.1.1" } }, "ent": { "version": "2.2.0", - "resolved": "http://r.cnpmjs.org/ent/download/ent-2.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/ent/download/ent-2.2.0.tgz", "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true }, @@ -4203,7 +3450,7 @@ }, "errno": { "version": "0.1.7", - "resolved": "http://r.cnpmjs.org/errno/download/errno-0.1.7.tgz", + "resolved": "http://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz", "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=", "dev": true, "requires": { @@ -4212,7 +3459,7 @@ }, "error-ex": { "version": "1.3.2", - "resolved": "http://r.cnpmjs.org/error-ex/download/error-ex-1.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz", "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "requires": { "is-arrayish": "0.2.1" @@ -4220,12 +3467,12 @@ }, "es6-promise": { "version": "3.3.1", - "resolved": "http://r.cnpmjs.org/es6-promise/download/es6-promise-3.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-3.3.1.tgz", "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" }, "es6-promisify": { "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/es6-promisify/download/es6-promisify-4.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/es6-promisify/download/es6-promisify-4.0.0.tgz", "integrity": "sha1-eMH/zYSM4jP9lin+qlNxym3N9Lg=", "requires": { "es6-promise": "3.3.1" @@ -4233,13 +3480,13 @@ }, "escape-html": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/escape-html/download/escape-html-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "dev": true }, "escape-string-regexp": { "version": "1.0.5", - "resolved": "http://r.cnpmjs.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, @@ -4275,9 +3522,9 @@ } }, "eslint-scope": { - "version": "3.7.1", - "resolved": "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.0.tgz", + "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=", "dev": true, "requires": { "esrecurse": "4.2.1", @@ -4293,13 +3540,13 @@ } }, "esprima": { - "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/esprima/download/esprima-4.0.0.tgz", - "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=" + "version": "4.0.1", + "resolved": "http://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=" }, "esrecurse": { "version": "4.2.1", - "resolved": "http://r.cnpmjs.org/esrecurse/download/esrecurse-4.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/esrecurse/download/esrecurse-4.2.1.tgz", "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=", "dev": true, "requires": { @@ -4322,43 +3569,43 @@ }, "esutils": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/esutils/download/esutils-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/esutils/download/esutils-2.0.2.tgz", "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, "etag": { "version": "1.8.1", - "resolved": "http://r.cnpmjs.org/etag/download/etag-1.8.1.tgz", + "resolved": "http://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, "eventemitter3": { "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/eventemitter3/download/eventemitter3-3.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/eventemitter3/download/eventemitter3-3.1.0.tgz", "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=", "dev": true }, "events": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/events/download/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/events/download/events-3.0.0.tgz", + "integrity": "sha1-mgoN+vYok9krh1uPJpjKQRSXPog=", "dev": true }, "eventsource": { - "version": "0.1.6", - "resolved": "http://r.cnpmjs.org/eventsource/download/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", + "version": "1.0.7", + "resolved": "http://registry.npm.taobao.org/eventsource/download/eventsource-1.0.7.tgz", + "integrity": "sha1-j7xyyT/NNAiAkLwKTmT0tc7m2NA=", "requires": { - "original": "1.0.1" + "original": "1.0.2" } }, "evp_bytestokey": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz", "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { - "md5.js": "1.3.4", + "md5.js": "1.3.5", "safe-buffer": "5.1.2" } }, @@ -4400,13 +3647,13 @@ }, "exit": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/exit/download/exit-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/exit/download/exit-0.1.2.tgz", "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, "expand-braces": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/expand-braces/download/expand-braces-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/expand-braces/download/expand-braces-0.1.2.tgz", "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { @@ -4423,7 +3670,7 @@ }, "braces": { "version": "0.1.5", - "resolved": "http://r.cnpmjs.org/braces/download/braces-0.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/braces/download/braces-0.1.5.tgz", "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { @@ -4432,7 +3679,7 @@ }, "expand-range": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/expand-range/download/expand-range-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/expand-range/download/expand-range-0.1.1.tgz", "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { @@ -4442,13 +3689,13 @@ }, "is-number": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/is-number/download/is-number-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-number/download/is-number-0.1.1.tgz", "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", "dev": true }, "repeat-string": { "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/repeat-string/download/repeat-string-0.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/repeat-string/download/repeat-string-0.2.2.tgz", "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", "dev": true } @@ -4506,7 +3753,7 @@ }, "expand-range": { "version": "1.8.2", - "resolved": "http://r.cnpmjs.org/expand-range/download/expand-range-1.8.2.tgz", + "resolved": "http://registry.npm.taobao.org/expand-range/download/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { @@ -4521,8 +3768,8 @@ "requires": { "is-number": "2.1.0", "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", + "randomatic": "3.1.1", + "repeat-element": "1.1.3", "repeat-string": "1.6.1" } }, @@ -4595,28 +3842,10 @@ "dependencies": { "array-flatten": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/array-flatten/download/array-flatten-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true }, - "body-parser": { - "version": "1.18.3", - "resolved": "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", - "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", - "on-finished": "2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "1.6.16" - } - }, "debug": { "version": "2.6.9", "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", @@ -4626,43 +3855,22 @@ "ms": "2.0.0" } }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz", - "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=", - "dev": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, "ms": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "raw-body": { - "version": "2.3.3", - "resolved": "http://registry.npm.taobao.org/raw-body/download/raw-body-2.3.3.tgz", - "integrity": "sha1-GzJOzmtXBuFThVvBFIxlu39uoMM=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", - "unpipe": "1.0.0" - } } } }, "extend": { - "version": "3.0.1", - "resolved": "http://r.cnpmjs.org/extend/download/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" }, "extend-shallow": { "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/extend-shallow/download/extend-shallow-3.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { @@ -4672,7 +3880,7 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-extendable/download/is-extendable-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz", "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { @@ -4700,15 +3908,6 @@ "requires": { "safer-buffer": "2.1.2" } - }, - "tmp": { - "version": "0.0.33", - "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", - "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2" - } } } }, @@ -4779,19 +3978,19 @@ }, "extsprintf": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/extsprintf/download/extsprintf-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, "fast-deep-equal": { - "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, "fast-json-stable-stringify": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz", "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, @@ -4802,14 +4001,14 @@ "dev": true }, "fastparse": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/fastparse/download/fastparse-1.1.1.tgz", - "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", + "version": "1.1.2", + "resolved": "http://registry.npm.taobao.org/fastparse/download/fastparse-1.1.2.tgz", + "integrity": "sha1-kXKMWllC7O2FMSg8eUQe5BIsNak=", "dev": true }, "faye-websocket": { "version": "0.11.1", - "resolved": "http://r.cnpmjs.org/faye-websocket/download/faye-websocket-0.11.1.tgz", + "resolved": "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.11.1.tgz", "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "requires": { "websocket-driver": "0.7.0" @@ -4838,58 +4037,21 @@ "requires": { "loader-utils": "1.1.0", "schema-utils": "1.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - } } }, "filename-regex": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/filename-regex/download/filename-regex-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.1.tgz", "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, "fileset": { "version": "2.0.3", - "resolved": "http://r.cnpmjs.org/fileset/download/fileset-2.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/fileset/download/fileset-2.0.3.tgz", "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "7.1.2", + "glob": "7.1.3", "minimatch": "3.0.4" } }, @@ -4918,7 +4080,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/finalhandler/download/finalhandler-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.1.tgz", "integrity": "sha1-7r9O2EAHnIP0JJA4ydcDAIMBsQU=", "dev": true, "requires": { @@ -4950,7 +4112,7 @@ }, "find-cache-dir": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz", "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { @@ -4961,7 +4123,7 @@ }, "find-up": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/find-up/download/find-up-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { @@ -4970,7 +4132,7 @@ }, "flush-write-stream": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/flush-write-stream/download/flush-write-stream-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.0.3.tgz", "integrity": "sha1-xdWG7zivYJdlC0m8QbVfq7GfNb0=", "dev": true, "requires": { @@ -4979,9 +4141,9 @@ } }, "follow-redirects": { - "version": "1.5.0", - "resolved": "http://r.cnpmjs.org/follow-redirects/download/follow-redirects-1.5.0.tgz", - "integrity": "sha1-I09Jz3cLfzW0DnkPY2zroMOgq3c=", + "version": "1.6.1", + "resolved": "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.6.1.tgz", + "integrity": "sha1-UUlzxEtXVzaLrYvd/lL4HwFclMs=", "dev": true, "requires": { "debug": "3.1.0" @@ -4989,7 +4151,7 @@ "dependencies": { "debug": { "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/debug/download/debug-3.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { @@ -5006,7 +4168,7 @@ }, "for-in": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/for-in/download/for-in-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz", "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, @@ -5019,37 +4181,32 @@ "for-in": "1.0.2" } }, - "foreach": { - "version": "2.0.5", - "resolved": "http://r.cnpmjs.org/foreach/download/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, "forever-agent": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/forever-agent/download/forever-agent-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, "form-data": { - "version": "2.3.2", - "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "version": "2.3.3", + "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz", + "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", "dev": true, "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "combined-stream": "1.0.7", + "mime-types": "2.1.21" } }, "forwarded": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/forwarded/download/forwarded-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz", "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", "dev": true }, "fragment-cache": { "version": "0.2.1", - "resolved": "http://r.cnpmjs.org/fragment-cache/download/fragment-cache-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { @@ -5058,13 +4215,13 @@ }, "fresh": { "version": "0.5.2", - "resolved": "http://r.cnpmjs.org/fresh/download/fresh-0.5.2.tgz", + "resolved": "http://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, "from2": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/from2/download/from2-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz", "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { @@ -5074,7 +4231,7 @@ }, "fs-access": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/fs-access/download/fs-access-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/fs-access/download/fs-access-1.0.1.tgz", "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { @@ -5086,11 +4243,11 @@ "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-0.26.7.tgz", "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "jsonfile": "2.4.0", "klaw": "1.3.1", "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "rimraf": "2.6.3" } }, "fs-minipass": { @@ -5104,7 +4261,7 @@ }, "fs-promise": { "version": "0.5.0", - "resolved": "http://r.cnpmjs.org/fs-promise/download/fs-promise-0.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/fs-promise/download/fs-promise-0.5.0.tgz", "integrity": "sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=", "requires": { "any-promise": "1.3.0", @@ -5115,11 +4272,11 @@ }, "fs-write-stream-atomic": { "version": "1.0.10", - "resolved": "http://r.cnpmjs.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz", + "resolved": "http://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz", "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "iferr": "0.1.5", "imurmurhash": "0.1.4", "readable-stream": "2.3.6" @@ -5127,23 +4284,23 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/fs.realpath/download/fs.realpath-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fstream": { "version": "1.0.11", - "resolved": "http://r.cnpmjs.org/fstream/download/fstream-1.0.11.tgz", + "resolved": "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz", "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "inherits": "2.0.3", "mkdirp": "0.5.1", - "rimraf": "2.6.2" + "rimraf": "2.6.3" } }, "gauge": { "version": "2.7.4", - "resolved": "http://r.cnpmjs.org/gauge/download/gauge-2.7.4.tgz", + "resolved": "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { @@ -5159,7 +4316,7 @@ }, "gaze": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/gaze/download/gaze-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz", "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=", "dev": true, "optional": true, @@ -5181,25 +4338,25 @@ }, "get-stdin": { "version": "4.0.1", - "resolved": "http://r.cnpmjs.org/get-stdin/download/get-stdin-4.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true }, "get-stream": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/get-stream/download/get-stream-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, "get-value": { "version": "2.0.6", - "resolved": "http://r.cnpmjs.org/get-value/download/get-value-2.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, "getpass": { "version": "0.1.7", - "resolved": "http://r.cnpmjs.org/getpass/download/getpass-0.1.7.tgz", + "resolved": "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { @@ -5207,9 +4364,9 @@ } }, "glob": { - "version": "7.1.2", - "resolved": "http://r.cnpmjs.org/glob/download/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "version": "7.1.3", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -5221,7 +4378,7 @@ }, "glob-base": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/glob-base/download/glob-base-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { @@ -5278,19 +4435,19 @@ }, "globals": { "version": "9.18.0", - "resolved": "http://r.cnpmjs.org/globals/download/globals-9.18.0.tgz", + "resolved": "http://registry.npm.taobao.org/globals/download/globals-9.18.0.tgz", "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { "version": "7.1.1", - "resolved": "http://r.cnpmjs.org/globby/download/globby-7.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/globby/download/globby-7.1.1.tgz", "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { "array-union": "1.0.2", "dir-glob": "2.2.2", - "glob": "7.1.2", + "glob": "7.1.3", "ignore": "3.3.10", "pify": "3.0.0", "slash": "1.0.0" @@ -5298,19 +4455,19 @@ }, "globule": { "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/globule/download/globule-1.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/globule/download/globule-1.2.1.tgz", "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=", "dev": true, "optional": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", + "glob": "7.1.3", + "lodash": "4.17.11", "minimatch": "3.0.4" } }, "good-listener": { "version": "1.2.2", - "resolved": "http://r.cnpmjs.org/good-listener/download/good-listener-1.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz", "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", "optional": true, "requires": { @@ -5319,7 +4476,7 @@ }, "got": { "version": "5.3.1", - "resolved": "http://r.cnpmjs.org/got/download/got-5.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/got/download/got-5.3.1.tgz", "integrity": "sha1-det5autZdyav3aVyE0ywKtlvXYs=", "requires": { "create-error-class": "2.0.1", @@ -5340,13 +4497,13 @@ } }, "graceful-fs": { - "version": "4.1.11", - "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + "version": "4.1.15", + "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", + "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=" }, "gunzip-maybe": { "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/gunzip-maybe/download/gunzip-maybe-1.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/gunzip-maybe/download/gunzip-maybe-1.2.1.tgz", "integrity": "sha1-mqPc5TwnJRbECyphCiVSm/ZO4bw=", "requires": { "browserify-zlib": "0.1.4", @@ -5362,46 +4519,31 @@ "dev": true }, "handlebars": { - "version": "4.0.11", - "resolved": "http://r.cnpmjs.org/handlebars/download/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "version": "4.0.12", + "resolved": "http://registry.npm.taobao.org/handlebars/download/handlebars-4.0.12.tgz", + "integrity": "sha1-LBXIqW1G2l4mZwBRi6jLjZGdW8U=", "dev": true, "requires": { - "async": "1.5.2", + "async": "2.6.1", "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "source-map": "0.6.1", + "uglify-js": "3.4.9" }, "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "async": { + "version": "2.6.1", + "resolved": "http://registry.npm.taobao.org/async/download/async-2.6.1.tgz", + "integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=", "dev": true, "requires": { - "amdefine": "1.0.1" + "lodash": "4.17.11" } }, - "uglify-js": { - "version": "2.8.29", - "resolved": "http://r.cnpmjs.org/uglify-js/download/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true - } - } + "source-map": { + "version": "0.6.1", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true } } }, @@ -5412,18 +4554,18 @@ "dev": true }, "har-validator": { - "version": "5.0.3", - "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "version": "5.1.3", + "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-5.1.3.tgz", + "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", "dev": true, "requires": { - "ajv": "5.5.2", + "ajv": "6.6.2", "har-schema": "2.0.0" } }, "has-ansi": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/has-ansi/download/has-ansi-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { @@ -5432,7 +4574,7 @@ }, "has-binary": { "version": "0.1.7", - "resolved": "http://r.cnpmjs.org/has-binary/download/has-binary-0.1.7.tgz", + "resolved": "http://registry.npm.taobao.org/has-binary/download/has-binary-0.1.7.tgz", "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", "dev": true, "requires": { @@ -5441,7 +4583,7 @@ "dependencies": { "isarray": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/isarray/download/isarray-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true } @@ -5449,7 +4591,7 @@ }, "has-cors": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/has-cors/download/has-cors-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/has-cors/download/has-cors-1.1.0.tgz", "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", "dev": true }, @@ -5461,13 +4603,13 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/has-unicode/download/has-unicode-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true }, "has-value": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/has-value/download/has-value-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { @@ -5478,7 +4620,7 @@ }, "has-values": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/has-values/download/has-values-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/has-values/download/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { @@ -5488,7 +4630,7 @@ "dependencies": { "kind-of": { "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/kind-of/download/kind-of-4.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { @@ -5499,7 +4641,7 @@ }, "hash-base": { "version": "3.0.4", - "resolved": "http://r.cnpmjs.org/hash-base/download/hash-base-3.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/hash-base/download/hash-base-3.0.4.tgz", "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { @@ -5508,9 +4650,9 @@ } }, "hash.js": { - "version": "1.1.4", - "resolved": "http://r.cnpmjs.org/hash.js/download/hash.js-1.1.4.tgz", - "integrity": "sha1-i1Dh811RvQHl7Z7OTb41Scz6Cjw=", + "version": "1.1.7", + "resolved": "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.7.tgz", + "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=", "dev": true, "requires": { "inherits": "2.0.3", @@ -5519,11 +4661,11 @@ }, "hmac-drbg": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.4", + "hash.js": "1.1.7", "minimalistic-assert": "1.0.1", "minimalistic-crypto-utils": "1.0.1" } @@ -5541,25 +4683,17 @@ "version": "0.3.0", "resolved": "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.3.0.tgz", "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" - }, - "nopt": { - "version": "1.0.10", - "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "requires": { - "abbrev": "1.0.9" - } } } }, "hosted-git-info": { - "version": "2.6.1", - "resolved": "http://r.cnpmjs.org/hosted-git-info/download/hosted-git-info-2.6.1.tgz", - "integrity": "sha1-bkzueLAbuEnc+TUncIxp/b7kEN8=" + "version": "2.7.1", + "resolved": "http://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.7.1.tgz", + "integrity": "sha1-l/I2l3vW4SVAiTD/bePuxigewEc=" }, "hpack.js": { "version": "2.1.6", - "resolved": "http://r.cnpmjs.org/hpack.js/download/hpack.js-2.1.6.tgz", + "resolved": "http://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz", "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { @@ -5571,7 +4705,7 @@ }, "html-entities": { "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/html-entities/download/html-entities-1.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/html-entities/download/html-entities-1.2.1.tgz", "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", "dev": true }, @@ -5583,13 +4717,13 @@ }, "http-deceiver": { "version": "1.2.7", - "resolved": "http://r.cnpmjs.org/http-deceiver/download/http-deceiver-1.2.7.tgz", + "resolved": "http://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz", "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", "dev": true }, "http-errors": { "version": "1.6.3", - "resolved": "http://r.cnpmjs.org/http-errors/download/http-errors-1.6.3.tgz", + "resolved": "http://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -5600,18 +4734,18 @@ } }, "http-parser-js": { - "version": "0.4.13", - "resolved": "http://r.cnpmjs.org/http-parser-js/download/http-parser-js-0.4.13.tgz", - "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=" + "version": "0.5.0", + "resolved": "http://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.5.0.tgz", + "integrity": "sha1-1l7b7ehDSdDcMDIIFaFdOcw8u9g=" }, "http-proxy": { "version": "1.17.0", - "resolved": "http://r.cnpmjs.org/http-proxy/download/http-proxy-1.17.0.tgz", + "resolved": "http://registry.npm.taobao.org/http-proxy/download/http-proxy-1.17.0.tgz", "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=", "dev": true, "requires": { "eventemitter3": "3.1.0", - "follow-redirects": "1.5.0", + "follow-redirects": "1.6.1", "requires-port": "1.0.0" } }, @@ -5674,7 +4808,7 @@ "requires": { "http-proxy": "1.17.0", "is-glob": "4.0.0", - "lodash": "4.17.10", + "lodash": "4.17.11", "micromatch": "3.1.10" } }, @@ -5686,23 +4820,23 @@ "requires": { "assert-plus": "1.0.0", "jsprim": "1.4.1", - "sshpk": "1.14.2" + "sshpk": "1.16.1" } }, "https-browserify": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/https-browserify/download/https-browserify-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, "https-proxy-agent": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/https-proxy-agent/download/https-proxy-agent-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-1.0.0.tgz", "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", "requires": { "agent-base": "2.1.1", "debug": "2.2.0", - "extend": "3.0.1" + "extend": "3.0.2" } }, "humanize-ms": { @@ -5723,26 +4857,29 @@ } }, "iconv-lite": { - "version": "0.4.19", - "resolved": "http://r.cnpmjs.org/iconv-lite/download/iconv-lite-0.4.19.tgz", - "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=", - "dev": true + "version": "0.4.23", + "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz", + "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } }, "ieee754": { "version": "1.1.12", - "resolved": "http://r.cnpmjs.org/ieee754/download/ieee754-1.1.12.tgz", + "resolved": "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.12.tgz", "integrity": "sha1-UL8k5bnIu5ivSWTJQc2wkY2ntgs=", "dev": true }, "iferr": { "version": "0.1.5", - "resolved": "http://r.cnpmjs.org/iferr/download/iferr-0.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/iferr/download/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", "dev": true }, "ignore": { "version": "3.3.10", - "resolved": "http://r.cnpmjs.org/ignore/download/ignore-3.3.10.tgz", + "resolved": "http://registry.npm.taobao.org/ignore/download/ignore-3.3.10.tgz", "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=", "dev": true }, @@ -5757,7 +4894,7 @@ }, "image-size": { "version": "0.5.5", - "resolved": "http://r.cnpmjs.org/image-size/download/image-size-0.5.5.tgz", + "resolved": "http://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "dev": true, "optional": true @@ -5852,20 +4989,20 @@ }, "imurmurhash": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/imurmurhash/download/imurmurhash-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, "in-publish": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/in-publish/download/in-publish-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz", "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", "dev": true, "optional": true }, "indent-string": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/indent-string/download/indent-string-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "optional": true, @@ -5875,13 +5012,13 @@ }, "indexof": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/indexof/download/indexof-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz", "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", "dev": true }, "inflight": { "version": "1.0.6", - "resolved": "http://r.cnpmjs.org/inflight/download/inflight-1.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { "once": "1.4.0", @@ -5890,18 +5027,18 @@ }, "inherits": { "version": "2.0.3", - "resolved": "http://r.cnpmjs.org/inherits/download/inherits-2.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.5", - "resolved": "http://r.cnpmjs.org/ini/download/ini-1.3.5.tgz", + "resolved": "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz", "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=", "dev": true }, "init-package-json": { "version": "1.9.1", - "resolved": "http://r.cnpmjs.org/init-package-json/download/init-package-json-1.9.1.tgz", + "resolved": "http://registry.npm.taobao.org/init-package-json/download/init-package-json-1.9.1.tgz", "integrity": "sha1-oo4FtbrrM2PNRz32jTDTqAUjoxw=", "requires": { "glob": "5.0.15", @@ -5910,13 +5047,13 @@ "read": "1.0.7", "read-package-json": "2.0.13", "semver": "5.0.1", - "validate-npm-package-license": "3.0.3", + "validate-npm-package-license": "3.0.4", "validate-npm-package-name": "2.2.2" }, "dependencies": { "glob": { "version": "5.0.15", - "resolved": "http://r.cnpmjs.org/glob/download/glob-5.0.15.tgz", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "requires": { "inflight": "1.0.6", @@ -5935,12 +5072,12 @@ "dev": true, "requires": { "ansi-escapes": "3.1.0", - "chalk": "2.2.2", + "chalk": "2.4.2", "cli-cursor": "2.1.0", "cli-width": "2.2.0", "external-editor": "3.0.3", "figures": "2.0.0", - "lodash": "4.17.10", + "lodash": "4.17.11", "mute-stream": "0.0.7", "run-async": "2.3.0", "rxjs": "6.3.3", @@ -5961,6 +5098,12 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "mute-stream": { + "version": "0.0.7", + "resolved": "http://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz", @@ -6019,22 +5162,22 @@ }, "invariant": { "version": "2.2.4", - "resolved": "http://r.cnpmjs.org/invariant/download/invariant-2.2.4.tgz", + "resolved": "http://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz", "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "1.4.0" } }, "invert-kv": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/invert-kv/download/invert-kv-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz", "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, "ip": { "version": "1.1.5", - "resolved": "http://r.cnpmjs.org/ip/download/ip-1.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz", "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, @@ -6052,7 +5195,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://r.cnpmjs.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz", + "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -6072,27 +5215,27 @@ }, "is-arrayish": { "version": "0.2.1", - "resolved": "http://r.cnpmjs.org/is-arrayish/download/is-arrayish-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-binary-path/download/is-binary-path-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "1.12.0" } }, "is-buffer": { "version": "1.1.6", - "resolved": "http://r.cnpmjs.org/is-buffer/download/is-buffer-1.1.6.tgz", + "resolved": "http://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz", "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", "dev": true }, "is-builtin-module": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-builtin-module/download/is-builtin-module-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-builtin-module/download/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "requires": { "builtin-modules": "1.1.1" @@ -6100,7 +5243,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -6120,7 +5263,7 @@ }, "is-descriptor": { "version": "0.1.6", - "resolved": "http://r.cnpmjs.org/is-descriptor/download/is-descriptor-0.1.6.tgz", + "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz", "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", "dev": true, "requires": { @@ -6131,7 +5274,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "resolved": "http://r.cnpmjs.org/kind-of/download/kind-of-5.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", "dev": true } @@ -6139,19 +5282,19 @@ }, "is-directory": { "version": "0.3.1", - "resolved": "http://r.cnpmjs.org/is-directory/download/is-directory-0.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-directory/download/is-directory-0.3.1.tgz", "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", "dev": true }, "is-dotfile": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/is-dotfile/download/is-dotfile-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz", "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", "dev": true }, "is-equal-shallow": { "version": "0.1.3", - "resolved": "http://r.cnpmjs.org/is-equal-shallow/download/is-equal-shallow-0.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/is-equal-shallow/download/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { @@ -6160,7 +5303,7 @@ }, "is-extendable": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/is-extendable/download/is-extendable-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz", "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, @@ -6172,7 +5315,7 @@ }, "is-finite": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/is-finite/download/is-finite-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/is-finite/download/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { @@ -6181,7 +5324,7 @@ }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { @@ -6202,7 +5345,7 @@ "resolved": "http://registry.npm.taobao.org/is-nan/download/is-nan-1.2.1.tgz", "integrity": "sha1-n69ltvttskt/XAYoR16nH5iEAeI=", "requires": { - "define-properties": "1.1.2" + "define-properties": "1.1.3" } }, "is-number": { @@ -6227,13 +5370,13 @@ }, "is-path-cwd": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz", "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", "dev": true }, "is-path-in-cwd": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-path-in-cwd/download/is-path-in-cwd-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-path-in-cwd/download/is-path-in-cwd-1.0.1.tgz", "integrity": "sha1-WsSLNF72dTOb1sekipEhELJBz1I=", "dev": true, "requires": { @@ -6242,7 +5385,7 @@ }, "is-path-inside": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-path-inside/download/is-path-inside-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-path-inside/download/is-path-inside-1.0.1.tgz", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { @@ -6251,12 +5394,12 @@ }, "is-plain-obj": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz", "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" }, "is-plain-object": { "version": "2.0.4", - "resolved": "http://r.cnpmjs.org/is-plain-object/download/is-plain-object-2.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz", "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { @@ -6265,13 +5408,13 @@ }, "is-posix-bracket": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz", "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", "dev": true }, "is-primitive": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/is-primitive/download/is-primitive-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-primitive/download/is-primitive-2.0.0.tgz", "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", "dev": true }, @@ -6283,52 +5426,55 @@ }, "is-redirect": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-redirect/download/is-redirect-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-redirect/download/is-redirect-1.0.0.tgz", "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" }, "is-stream": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/is-stream/download/is-stream-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-stream/download/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-typedarray": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-typedarray/download/is-typedarray-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, "is-utf8": { "version": "0.2.1", - "resolved": "http://r.cnpmjs.org/is-utf8/download/is-utf8-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, "is-windows": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/is-windows/download/is-windows-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz", "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=", "dev": true }, "is-wsl": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/is-wsl/download/is-wsl-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-wsl/download/is-wsl-1.1.0.tgz", "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", "dev": true }, "isarray": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/isarray/download/isarray-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isbinaryfile": { - "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/isbinaryfile/download/isbinaryfile-3.0.2.tgz", - "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", - "dev": true + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/isbinaryfile/download/isbinaryfile-3.0.3.tgz", + "integrity": "sha1-XW3vPt6/boyoyunDAYOoBLX4voA=", + "dev": true, + "requires": { + "buffer-alloc": "1.2.0" + } }, "isexe": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/isexe/download/isexe-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, @@ -6340,7 +5486,7 @@ }, "isstream": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/isstream/download/isstream-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, @@ -6355,8 +5501,8 @@ "escodegen": "1.8.1", "esprima": "2.7.3", "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.12.0", + "handlebars": "4.0.12", + "js-yaml": "3.12.1", "mkdirp": "0.5.1", "nopt": "3.0.6", "once": "1.4.0", @@ -6366,6 +5512,12 @@ "wordwrap": "1.0.0" }, "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, "esprima": { "version": "2.7.3", "resolved": "http://registry.npm.taobao.org/esprima/download/esprima-2.7.3.tgz", @@ -6391,11 +5543,14 @@ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, - "resolve": { - "version": "1.1.7", - "resolved": "http://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true + "nopt": { + "version": "3.0.6", + "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.0.9" + } }, "supports-color": { "version": "3.2.3", @@ -6409,21 +5564,20 @@ } }, "istanbul-api": { - "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/istanbul-api/download/istanbul-api-1.3.1.tgz", - "integrity": "sha1-TDsF0YwAFtECLgebmNyCxA9IiVQ=", + "version": "1.3.7", + "resolved": "http://registry.npm.taobao.org/istanbul-api/download/istanbul-api-1.3.7.tgz", + "integrity": "sha1-qGx3DSsD4R4/d4zXrt2C0nIgkqo=", "dev": true, "requires": { "async": "2.6.1", - "compare-versions": "3.3.0", "fileset": "2.0.3", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.2.1", - "istanbul-lib-instrument": "1.10.1", - "istanbul-lib-report": "1.1.4", - "istanbul-lib-source-maps": "1.2.5", - "istanbul-reports": "1.3.0", - "js-yaml": "3.12.0", + "istanbul-lib-coverage": "1.2.1", + "istanbul-lib-hook": "1.2.2", + "istanbul-lib-instrument": "1.10.2", + "istanbul-lib-report": "1.1.5", + "istanbul-lib-source-maps": "1.2.6", + "istanbul-reports": "1.5.1", + "js-yaml": "3.12.1", "mkdirp": "0.5.1", "once": "1.4.0" }, @@ -6434,26 +5588,50 @@ "integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "4.17.11" } } } }, "istanbul-instrumenter-loader": { "version": "3.0.1", - "resolved": "http://r.cnpmjs.org/istanbul-instrumenter-loader/download/istanbul-instrumenter-loader-3.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/istanbul-instrumenter-loader/download/istanbul-instrumenter-loader-3.0.1.tgz", "integrity": "sha1-mVe9WSUrNz+uXFK3tRiOb94qCUk=", "dev": true, "requires": { "convert-source-map": "1.6.0", - "istanbul-lib-instrument": "1.10.1", + "istanbul-lib-instrument": "1.10.2", "loader-utils": "1.1.0", "schema-utils": "0.3.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, "schema-utils": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/schema-utils/download/schema-utils-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { @@ -6463,24 +5641,24 @@ } }, "istanbul-lib-coverage": { - "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/istanbul-lib-coverage/download/istanbul-lib-coverage-1.2.0.tgz", - "integrity": "sha1-99jy5CuX43/nlhFMsPnWi146Q0E=", + "version": "1.2.1", + "resolved": "http://registry.npm.taobao.org/istanbul-lib-coverage/download/istanbul-lib-coverage-1.2.1.tgz", + "integrity": "sha1-zPftzQoLubj3Kf7rCTBHD5r2ZPA=", "dev": true }, "istanbul-lib-hook": { - "version": "1.2.1", - "resolved": "http://r.cnpmjs.org/istanbul-lib-hook/download/istanbul-lib-hook-1.2.1.tgz", - "integrity": "sha1-9hTsRSh7Ko/E8H9WYK94dXVgGAU=", + "version": "1.2.2", + "resolved": "http://registry.npm.taobao.org/istanbul-lib-hook/download/istanbul-lib-hook-1.2.2.tgz", + "integrity": "sha1-vGvwfxKmQfvxyFOR0Nqo8K6mv4Y=", "dev": true, "requires": { - "append-transform": "1.0.0" + "append-transform": "0.4.0" } }, "istanbul-lib-instrument": { - "version": "1.10.1", - "resolved": "http://r.cnpmjs.org/istanbul-lib-instrument/download/istanbul-lib-instrument-1.10.1.tgz", - "integrity": "sha1-cktLbKzrqGktPx+dByfiecQBr3s=", + "version": "1.10.2", + "resolved": "http://registry.npm.taobao.org/istanbul-lib-instrument/download/istanbul-lib-instrument-1.10.2.tgz", + "integrity": "sha1-H1XtEKw8R/K93dUweTUSZ1TQqco=", "dev": true, "requires": { "babel-generator": "6.26.1", @@ -6488,39 +5666,39 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.0", - "semver": "5.5.0" + "istanbul-lib-coverage": "1.2.1", + "semver": "5.6.0" }, "dependencies": { "semver": { - "version": "5.5.0", - "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", "dev": true } } }, "istanbul-lib-report": { - "version": "1.1.4", - "resolved": "http://r.cnpmjs.org/istanbul-lib-report/download/istanbul-lib-report-1.1.4.tgz", - "integrity": "sha1-6IbN9QXE672OCZ5DlqkNCijirLU=", + "version": "1.1.5", + "resolved": "http://registry.npm.taobao.org/istanbul-lib-report/download/istanbul-lib-report-1.1.5.tgz", + "integrity": "sha1-8qZX/GKC+WFwqvKB6zCkWPf0Fww=", "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-coverage": "1.2.1", "mkdirp": "0.5.1", - "path-parse": "1.0.5", + "path-parse": "1.0.6", "supports-color": "3.2.3" }, "dependencies": { "has-flag": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/has-flag/download/has-flag-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, "supports-color": { "version": "3.2.3", - "resolved": "http://r.cnpmjs.org/supports-color/download/supports-color-3.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { @@ -6530,42 +5708,48 @@ } }, "istanbul-lib-source-maps": { - "version": "1.2.5", - "resolved": "http://r.cnpmjs.org/istanbul-lib-source-maps/download/istanbul-lib-source-maps-1.2.5.tgz", - "integrity": "sha1-/+a+Tnq4bTYD5CkNVJkLFFBvybE=", + "version": "1.2.6", + "resolved": "http://registry.npm.taobao.org/istanbul-lib-source-maps/download/istanbul-lib-source-maps-1.2.6.tgz", + "integrity": "sha1-N7n/ZhWA+PyhEjJ1LuQuCMZnXY8=", "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", + "debug": "3.2.6", + "istanbul-lib-coverage": "1.2.1", "mkdirp": "0.5.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "source-map": "0.5.7" }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "version": "3.2.6", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } } }, "istanbul-reports": { - "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/istanbul-reports/download/istanbul-reports-1.3.0.tgz", - "integrity": "sha1-LzIugeHZUgdnWX3KPCCgzOiaNVQ=", + "version": "1.5.1", + "resolved": "http://registry.npm.taobao.org/istanbul-reports/download/istanbul-reports-1.5.1.tgz", + "integrity": "sha1-l+Tb87UV6MSEyuoV1lJO69P/Tho=", "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "4.0.12" } }, "jasmine": { @@ -6575,7 +5759,7 @@ "dev": true, "requires": { "exit": "0.1.2", - "glob": "7.1.2", + "glob": "7.1.3", "jasmine-core": "2.8.0" }, "dependencies": { @@ -6589,13 +5773,13 @@ }, "jasmine-core": { "version": "2.99.1", - "resolved": "http://r.cnpmjs.org/jasmine-core/download/jasmine-core-2.99.1.tgz", + "resolved": "http://registry.npm.taobao.org/jasmine-core/download/jasmine-core-2.99.1.tgz", "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, "jasmine-spec-reporter": { "version": "4.2.1", - "resolved": "http://r.cnpmjs.org/jasmine-spec-reporter/download/jasmine-spec-reporter-4.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/jasmine-spec-reporter/download/jasmine-spec-reporter-4.2.1.tgz", "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=", "dev": true, "requires": { @@ -6604,79 +5788,78 @@ }, "jasminewd2": { "version": "2.2.0", - "resolved": "http://r.cnpmjs.org/jasminewd2/download/jasminewd2-2.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/jasminewd2/download/jasminewd2-2.2.0.tgz", "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, "jquery": { "version": "3.3.1", - "resolved": "http://r.cnpmjs.org/jquery/download/jquery-3.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/jquery/download/jquery-3.3.1.tgz", "integrity": "sha1-lYzinoHJeQ8xvneS311NlfxX+8o=" }, "js-base64": { - "version": "2.5.0", - "resolved": "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.0.tgz", - "integrity": "sha1-QiVboYOrZ85ZoN7mQK/cAKta6T4=" + "version": "2.5.1", + "resolved": "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.1.tgz", + "integrity": "sha1-Hvo57yxfeYC7F4St5KivLeMpESE=" }, "js-tokens": { "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/js-tokens/download/js-tokens-3.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz", "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "http://r.cnpmjs.org/js-yaml/download/js-yaml-3.12.0.tgz", - "integrity": "sha1-6u1lbsg0TxD1J8a/obbiJE3hZ9E=", + "version": "3.12.1", + "resolved": "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.12.1.tgz", + "integrity": "sha1-KVyGMqGKI+BUz1ydPOyv5ngWdgA=", "requires": { "argparse": "1.0.10", - "esprima": "4.0.0" + "esprima": "4.0.1" } }, "jsbn": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/jsbn/download/jsbn-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true + "dev": true }, "jsesc": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/jsesc/download/jsesc-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/jsesc/download/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, "json-parse-better-errors": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz", "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=" }, "json-schema": { "version": "0.2.3", - "resolved": "http://r.cnpmjs.org/json-schema/download/json-schema-0.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "dev": true }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "http://r.cnpmjs.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "version": "0.4.1", + "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", "dev": true }, "json-stringify-safe": { "version": "5.0.1", - "resolved": "http://r.cnpmjs.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, "json3": { "version": "3.3.2", - "resolved": "http://r.cnpmjs.org/json3/download/json3-3.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/json3/download/json3-3.3.2.tgz", "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=" }, "json5": { "version": "0.5.1", - "resolved": "http://r.cnpmjs.org/json5/download/json5-0.5.1.tgz", + "resolved": "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, @@ -6685,7 +5868,7 @@ "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "4.1.15" } }, "jsonparse": { @@ -6696,7 +5879,7 @@ }, "jsprim": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/jsprim/download/jsprim-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "dev": true, "requires": { @@ -6715,7 +5898,7 @@ "core-js": "2.3.0", "es6-promise": "3.0.2", "lie": "3.1.1", - "pako": "1.0.6", + "pako": "1.0.8", "readable-stream": "2.0.6" }, "dependencies": { @@ -6732,9 +5915,9 @@ "dev": true }, "pako": { - "version": "1.0.6", - "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.6.tgz", - "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=", + "version": "1.0.8", + "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.8.tgz", + "integrity": "sha1-aESJCqucY1r4aK1f7MYuisu6PqQ=", "dev": true }, "process-nextick-args": { @@ -6767,24 +5950,24 @@ }, "karma": { "version": "1.7.1", - "resolved": "http://r.cnpmjs.org/karma/download/karma-1.7.1.tgz", + "resolved": "http://registry.npm.taobao.org/karma/download/karma-1.7.1.tgz", "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.2", + "bluebird": "3.5.3", + "body-parser": "1.18.3", "chokidar": "1.7.0", "colors": "1.1.2", "combine-lists": "1.0.1", "connect": "3.6.6", - "core-js": "2.5.7", + "core-js": "2.6.3", "di": "0.0.1", "dom-serialize": "2.2.1", "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", + "glob": "7.1.3", + "graceful-fs": "4.1.15", "http-proxy": "1.17.0", - "isbinaryfile": "3.0.2", + "isbinaryfile": "3.0.3", "lodash": "3.10.1", "log4js": "0.6.38", "mime": "1.6.0", @@ -6792,7 +5975,7 @@ "optimist": "0.6.1", "qjobs": "1.2.0", "range-parser": "1.2.0", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "safe-buffer": "5.1.2", "socket.io": "1.7.3", "source-map": "0.5.7", @@ -6833,7 +6016,7 @@ "requires": { "expand-range": "1.8.2", "preserve": "0.2.0", - "repeat-element": "1.1.2" + "repeat-element": "1.1.3" } }, "chokidar": { @@ -6849,7 +6032,7 @@ "is-binary-path": "1.0.1", "is-glob": "2.0.1", "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "readdirp": "2.2.1" } }, "expand-brackets": { @@ -6905,7 +6088,7 @@ }, "lodash": { "version": "3.10.1", - "resolved": "http://r.cnpmjs.org/lodash/download/lodash-3.10.1.tgz", + "resolved": "http://registry.npm.taobao.org/lodash/download/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "dev": true }, @@ -6929,12 +6112,27 @@ "parse-glob": "3.0.4", "regex-cache": "0.4.4" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "tmp": { + "version": "0.0.31", + "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } } } }, "karma-chrome-launcher": { "version": "2.2.0", - "resolved": "http://r.cnpmjs.org/karma-chrome-launcher/download/karma-chrome-launcher-2.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/karma-chrome-launcher/download/karma-chrome-launcher-2.2.0.tgz", "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { @@ -6944,23 +6142,23 @@ }, "karma-coverage-istanbul-reporter": { "version": "1.4.3", - "resolved": "http://r.cnpmjs.org/karma-coverage-istanbul-reporter/download/karma-coverage-istanbul-reporter-1.4.3.tgz", + "resolved": "http://registry.npm.taobao.org/karma-coverage-istanbul-reporter/download/karma-coverage-istanbul-reporter-1.4.3.tgz", "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=", "dev": true, "requires": { - "istanbul-api": "1.3.1", + "istanbul-api": "1.3.7", "minimatch": "3.0.4" } }, "karma-jasmine": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/karma-jasmine/download/karma-jasmine-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/karma-jasmine/download/karma-jasmine-1.1.2.tgz", "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=", "dev": true }, "karma-jasmine-html-reporter": { "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-0.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-0.2.2.tgz", "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { @@ -6969,11 +6167,11 @@ }, "karma-source-map-support": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/karma-source-map-support/download/karma-source-map-support-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/karma-source-map-support/download/karma-source-map-support-1.3.0.tgz", "integrity": "sha1-Nt1NjKFUtirOlWliNvrjfK8Kfd4=", "dev": true, "requires": { - "source-map-support": "0.5.6" + "source-map-support": "0.5.9" } }, "killable": { @@ -6990,34 +6188,21 @@ }, "klaw": { "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/klaw/download/klaw-1.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/klaw/download/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "4.1.15" } }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/lazy-cache/download/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true - }, "lcid": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/lcid/download/lcid-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { "invert-kv": "1.0.0" } }, - "leb": { - "version": "0.3.0", - "resolved": "http://registry.npm.taobao.org/leb/download/leb-0.3.0.tgz", - "integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=", - "dev": true - }, "less": { "version": "3.9.0", "resolved": "http://registry.npm.taobao.org/less/download/less-3.9.0.tgz", @@ -7026,12 +6211,12 @@ "requires": { "clone": "2.1.2", "errno": "0.1.7", - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "image-size": "0.5.5", "mime": "1.6.0", "mkdirp": "0.5.1", "promise": "7.3.1", - "request": "2.87.0", + "request": "2.88.0", "source-map": "0.6.1" }, "dependencies": { @@ -7046,7 +6231,7 @@ }, "less-loader": { "version": "4.1.0", - "resolved": "http://r.cnpmjs.org/less-loader/download/less-loader-4.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/less-loader/download/less-loader-4.1.0.tgz", "integrity": "sha1-LBNSxbCaT4QQFJAnT9UWdN5BNj4=", "dev": true, "requires": { @@ -7073,24 +6258,6 @@ "requires": { "@types/webpack-sources": "0.1.5", "webpack-sources": "1.3.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true - }, - "webpack-sources": { - "version": "1.3.0", - "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz", - "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", - "dev": true, - "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" - } - } } }, "lie": { @@ -7104,11 +6271,11 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/load-json-file/download/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "parse-json": "2.2.0", "pify": "2.3.0", "pinkie-promise": "2.0.1", @@ -7117,21 +6284,21 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } } }, "loader-runner": { - "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/loader-runner/download/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "version": "2.4.0", + "resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz", + "integrity": "sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c=", "dev": true }, "loader-utils": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/loader-utils/download/loader-utils-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz", "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", "dev": true, "requires": { @@ -7142,7 +6309,7 @@ }, "locate-path": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/locate-path/download/locate-path-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { @@ -7151,46 +6318,51 @@ } }, "lodash": { - "version": "4.17.10", - "resolved": "http://r.cnpmjs.org/lodash/download/lodash-4.17.10.tgz", - "integrity": "sha1-G3eTz3JZ6jj7NmHU04syYK+K5Oc=", + "version": "4.17.11", + "resolved": "http://registry.npm.taobao.org/lodash/download/lodash-4.17.11.tgz", + "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=", "dev": true }, "lodash.assign": { "version": "4.2.0", - "resolved": "http://r.cnpmjs.org/lodash.assign/download/lodash.assign-4.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true, "optional": true }, "lodash.clonedeep": { "version": "4.5.0", - "resolved": "http://r.cnpmjs.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz", "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, "lodash.debounce": { "version": "4.0.8", - "resolved": "http://r.cnpmjs.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz", + "resolved": "http://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, + "lodash.merge": { + "version": "4.6.1", + "resolved": "http://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.1.tgz", + "integrity": "sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ=" + }, "lodash.mergewith": { "version": "4.6.1", - "resolved": "http://r.cnpmjs.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz", "integrity": "sha1-Y5BX5ybDr72z59QnQcqo1uQzWSc=", "dev": true, "optional": true }, "lodash.tail": { "version": "4.1.1", - "resolved": "http://r.cnpmjs.org/lodash.tail/download/lodash.tail-4.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", "dev": true }, "log4js": { "version": "0.6.38", - "resolved": "http://r.cnpmjs.org/log4js/download/log4js-0.6.38.tgz", + "resolved": "http://registry.npm.taobao.org/log4js/download/log4js-0.6.38.tgz", "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "dev": true, "requires": { @@ -7200,13 +6372,13 @@ "dependencies": { "isarray": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/isarray/download/isarray-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "readable-stream": { "version": "1.0.34", - "resolved": "http://r.cnpmjs.org/readable-stream/download/readable-stream-1.0.34.tgz", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { @@ -7218,13 +6390,13 @@ }, "semver": { "version": "4.3.6", - "resolved": "http://r.cnpmjs.org/semver/download/semver-4.3.6.tgz", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-4.3.6.tgz", "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true }, "string_decoder": { "version": "0.10.31", - "resolved": "http://r.cnpmjs.org/string_decoder/download/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } @@ -7232,26 +6404,14 @@ }, "loglevel": { "version": "1.6.1", - "resolved": "http://r.cnpmjs.org/loglevel/download/loglevel-1.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/loglevel/download/loglevel-1.6.1.tgz", "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", "dev": true }, - "long": { - "version": "3.2.0", - "resolved": "http://registry.npm.taobao.org/long/download/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=", - "dev": true - }, - "longest": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/longest/download/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, "loose-envify": { - "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/loose-envify/download/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "version": "1.4.0", + "resolved": "http://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz", + "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=", "dev": true, "requires": { "js-tokens": "3.0.2" @@ -7259,7 +6419,7 @@ }, "loud-rejection": { "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/loud-rejection/download/loud-rejection-1.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "optional": true, @@ -7270,13 +6430,13 @@ }, "lowercase-keys": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz", "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=" }, "lru-cache": { - "version": "4.1.3", - "resolved": "http://r.cnpmjs.org/lru-cache/download/lru-cache-4.1.3.tgz", - "integrity": "sha1-oRdc80lt/IQ2wVbDNLSVWZK85pw=", + "version": "4.1.5", + "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz", + "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -7294,7 +6454,7 @@ }, "make-dir": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/make-dir/download/make-dir-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz", "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=", "dev": true, "requires": { @@ -7302,9 +6462,9 @@ } }, "make-error": { - "version": "1.3.4", - "resolved": "http://r.cnpmjs.org/make-error/download/make-error-1.3.4.tgz", - "integrity": "sha1-GZeO1XX56VRdL/jBPjO10Ypn1TU=", + "version": "1.3.5", + "resolved": "http://registry.npm.taobao.org/make-error/download/make-error-1.3.5.tgz", + "integrity": "sha1-7+ToH22yjK3WBccPKcgxtY73dsg=", "dev": true }, "make-fetch-happen": { @@ -7318,7 +6478,7 @@ "http-cache-semantics": "3.8.1", "http-proxy-agent": "2.1.0", "https-proxy-agent": "2.2.1", - "lru-cache": "4.1.3", + "lru-cache": "4.1.5", "mississippi": "3.0.0", "node-fetch-npm": "2.0.2", "promise-retry": "1.1.1", @@ -7335,12 +6495,6 @@ "es6-promisify": "5.0.0" } }, - "bluebird": { - "version": "3.5.3", - "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", - "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", - "dev": true - }, "cacache": { "version": "11.3.2", "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-11.3.2.tgz", @@ -7357,7 +6511,7 @@ "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "ssri": "6.0.1", "unique-filename": "1.1.1", "y18n": "4.0.0" @@ -7374,12 +6528,6 @@ } } }, - "chownr": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", - "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", - "dev": true - }, "debug": { "version": "3.2.6", "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", @@ -7404,26 +6552,6 @@ "es6-promise": "4.2.5" } }, - "glob": { - "version": "7.1.3", - "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", - "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", - "dev": true - }, "https-proxy-agent": { "version": "2.2.1", "resolved": "http://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-2.2.1.tgz", @@ -7441,14 +6569,14 @@ "dev": true, "requires": { "concat-stream": "1.6.2", - "duplexify": "3.6.0", + "duplexify": "3.6.1", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "3.0.0", "pumpify": "1.5.1", - "stream-each": "1.2.2", + "stream-each": "1.2.3", "through2": "2.0.5" } }, @@ -7487,15 +6615,6 @@ "xtend": "4.0.1" } }, - "unique-filename": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", - "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", - "dev": true, - "requires": { - "unique-slug": "2.0.0" - } - }, "yallist": { "version": "3.0.3", "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", @@ -7515,19 +6634,19 @@ }, "map-cache": { "version": "0.2.2", - "resolved": "http://r.cnpmjs.org/map-cache/download/map-cache-0.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, "map-obj": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/map-obj/download/map-obj-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, "map-visit": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/map-visit/download/map-visit-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { @@ -7535,29 +6654,30 @@ } }, "marked": { - "version": "0.5.1", - "resolved": "http://r.cnpmjs.org/marked/download/marked-0.5.1.tgz", - "integrity": "sha1-Bi9DuIsC7oCQHo6NjmpiDds6p1I=" + "version": "0.5.2", + "resolved": "http://registry.npm.taobao.org/marked/download/marked-0.5.2.tgz", + "integrity": "sha1-Pv2yex/Q7OxPWro2K93NGBIOW6k=" }, "math-random": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/math-random/download/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", + "version": "1.0.4", + "resolved": "http://registry.npm.taobao.org/math-random/download/math-random-1.0.4.tgz", + "integrity": "sha1-XdaUPJOFSCZwFtTjTwV1gwgMUUw=", "dev": true }, "md5.js": { - "version": "1.3.4", - "resolved": "http://r.cnpmjs.org/md5.js/download/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", + "version": "1.3.5", + "resolved": "http://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz", + "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=", "dev": true, "requires": { "hash-base": "3.0.4", - "inherits": "2.0.3" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "media-typer": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/media-typer/download/media-typer-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, @@ -7574,7 +6694,7 @@ }, "memory-fs": { "version": "0.4.1", - "resolved": "http://r.cnpmjs.org/memory-fs/download/memory-fs-0.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz", "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { @@ -7584,7 +6704,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://r.cnpmjs.org/meow/download/meow-3.7.0.tgz", + "resolved": "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "optional": true, @@ -7603,13 +6723,13 @@ }, "merge-descriptors": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, "methods": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/methods/download/methods-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "dev": true }, @@ -7636,7 +6756,7 @@ }, "miller-rabin": { "version": "4.0.1", - "resolved": "http://r.cnpmjs.org/miller-rabin/download/miller-rabin-4.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/miller-rabin/download/miller-rabin-4.0.1.tgz", "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=", "dev": true, "requires": { @@ -7646,28 +6766,28 @@ }, "mime": { "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/mime/download/mime-1.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz", "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=", "dev": true }, "mime-db": { - "version": "1.33.0", - "resolved": "http://r.cnpmjs.org/mime-db/download/mime-db-1.33.0.tgz", - "integrity": "sha1-o0kgUKXLm2NFBUHjnZeI0icng9s=", + "version": "1.37.0", + "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz", + "integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=", "dev": true }, "mime-types": { - "version": "2.1.18", - "resolved": "http://r.cnpmjs.org/mime-types/download/mime-types-2.1.18.tgz", - "integrity": "sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g=", + "version": "2.1.21", + "resolved": "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.21.tgz", + "integrity": "sha1-KJlaoey3cHQv5q5+WPkYHHRLP5Y=", "dev": true, "requires": { - "mime-db": "1.33.0" + "mime-db": "1.37.0" } }, "mimic-fn": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/mimic-fn/download/mimic-fn-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz", "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=", "dev": true }, @@ -7679,61 +6799,24 @@ "requires": { "loader-utils": "1.1.0", "schema-utils": "1.0.0", - "webpack-sources": "1.1.0" - }, - "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - } + "webpack-sources": "1.3.0" } }, "minimalistic-assert": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz", "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=", "dev": true }, "minimalistic-crypto-utils": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz", "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", "dev": true }, "minimatch": { "version": "3.0.4", - "resolved": "http://r.cnpmjs.org/minimatch/download/minimatch-3.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { "brace-expansion": "1.1.11" @@ -7773,26 +6856,26 @@ }, "mississippi": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/mississippi/download/mississippi-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz", "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=", "dev": true, "requires": { "concat-stream": "1.6.2", - "duplexify": "3.6.0", + "duplexify": "3.6.1", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "2.0.1", "pumpify": "1.5.1", - "stream-each": "1.2.2", - "through2": "2.0.3" + "stream-each": "1.2.3", + "through2": "2.0.5" }, "dependencies": { "through2": { - "version": "2.0.3", - "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz", + "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", "dev": true, "requires": { "readable-stream": "2.3.6", @@ -7803,7 +6886,7 @@ }, "mixin-deep": { "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/mixin-deep/download/mixin-deep-1.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.1.tgz", "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", "dev": true, "requires": { @@ -7813,7 +6896,7 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/is-extendable/download/is-extendable-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz", "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { @@ -7824,7 +6907,7 @@ }, "mixin-object": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/mixin-object/download/mixin-object-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/mixin-object/download/mixin-object-2.0.1.tgz", "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { @@ -7834,7 +6917,7 @@ "dependencies": { "for-in": { "version": "0.1.8", - "resolved": "http://r.cnpmjs.org/for-in/download/for-in-0.1.8.tgz", + "resolved": "http://registry.npm.taobao.org/for-in/download/for-in-0.1.8.tgz", "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", "dev": true } @@ -7842,7 +6925,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://r.cnpmjs.org/mkdirp/download/mkdirp-0.5.1.tgz", + "resolved": "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -7857,7 +6940,7 @@ }, "mkdirp-then": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/mkdirp-then/download/mkdirp-then-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/mkdirp-then/download/mkdirp-then-1.2.0.tgz", "integrity": "sha1-pJLIecpNhz9e5FAI+PVf0BUN48U=", "requires": { "any-promise": "1.3.0", @@ -7865,21 +6948,21 @@ } }, "moment": { - "version": "2.22.2", - "resolved": "http://registry.npm.taobao.org/moment/download/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + "version": "2.24.0", + "resolved": "http://registry.npm.taobao.org/moment/download/moment-2.24.0.tgz", + "integrity": "sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s=" }, "moment-timezone": { - "version": "0.5.21", - "resolved": "http://registry.npm.taobao.org/moment-timezone/download/moment-timezone-0.5.21.tgz", - "integrity": "sha1-PLokfYRJIXTb9x3iqYSPoTIHuEU=", + "version": "0.5.23", + "resolved": "http://registry.npm.taobao.org/moment-timezone/download/moment-timezone-0.5.23.tgz", + "integrity": "sha1-fLsA2ywUxxsZMDy0ew+wpthlFGM=", "requires": { - "moment": "2.22.2" + "moment": "2.24.0" } }, "move-concurrently": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/move-concurrently/download/move-concurrently-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { @@ -7887,7 +6970,7 @@ "copy-concurrently": "1.0.5", "fs-write-stream-atomic": "1.0.10", "mkdirp": "0.5.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "run-queue": "1.0.3" } }, @@ -7898,7 +6981,7 @@ }, "multicast-dns": { "version": "6.2.3", - "resolved": "http://r.cnpmjs.org/multicast-dns/download/multicast-dns-6.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/multicast-dns/download/multicast-dns-6.2.3.tgz", "integrity": "sha1-oOx72QVcQoL3kMPIL04o2zsxsik=", "dev": true, "requires": { @@ -7908,23 +6991,23 @@ }, "multicast-dns-service-types": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz", "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, "mutationobserver-shim": { - "version": "0.3.2", - "resolved": "http://r.cnpmjs.org/mutationobserver-shim/download/mutationobserver-shim-0.3.2.tgz", - "integrity": "sha1-9NXa56SXGiIHkU+1qQ69UUtlrMo=" + "version": "0.3.3", + "resolved": "http://registry.npm.taobao.org/mutationobserver-shim/download/mutationobserver-shim-0.3.3.tgz", + "integrity": "sha1-ZYaWMLyJ17+MnNnLghiM2VWqzSs=" }, "mute-stream": { - "version": "0.0.7", - "resolved": "http://r.cnpmjs.org/mute-stream/download/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + "version": "0.0.8", + "resolved": "http://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz", + "integrity": "sha1-FjDEKyJR/4HiooPelqVJfqkuXg0=" }, "mz": { "version": "2.7.0", - "resolved": "http://r.cnpmjs.org/mz/download/mz-2.7.0.tgz", + "resolved": "http://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz", "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=", "requires": { "any-promise": "1.3.0", @@ -7941,7 +7024,7 @@ }, "nanomatch": { "version": "1.2.13", - "resolved": "http://r.cnpmjs.org/nanomatch/download/nanomatch-1.2.13.tgz", + "resolved": "http://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz", "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=", "dev": true, "requires": { @@ -7960,23 +7043,23 @@ }, "negotiator": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/negotiator/download/negotiator-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/negotiator/download/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, "neo-async": { - "version": "2.5.1", - "resolved": "http://r.cnpmjs.org/neo-async/download/neo-async-2.5.1.tgz", - "integrity": "sha1-rLkJ4yex6H7J7xX0G4omlRKtQe4=", + "version": "2.6.0", + "resolved": "http://registry.npm.taobao.org/neo-async/download/neo-async-2.6.0.tgz", + "integrity": "sha1-udFeTXHGdikIZUtRg+04t1M0CDU=", "dev": true }, "ngx-markdown": { "version": "6.3.0", - "resolved": "http://r.cnpmjs.org/ngx-markdown/download/ngx-markdown-6.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/ngx-markdown/download/ngx-markdown-6.3.0.tgz", "integrity": "sha1-KGGaGRWd/TDocqJyXvEar0yK7yM=", "requires": { "@types/marked": "0.4.2", - "marked": "0.5.1", + "marked": "0.5.2", "prismjs": "1.15.0", "tslib": "1.9.3" } @@ -8000,7 +7083,7 @@ }, "node-forge": { "version": "0.7.5", - "resolved": "http://r.cnpmjs.org/node-forge/download/node-forge-0.7.5.tgz", + "resolved": "http://registry.npm.taobao.org/node-forge/download/node-forge-0.7.5.tgz", "integrity": "sha1-bBUsNFzhHFL0ZcKr2VfoY5zWdN8=", "dev": true }, @@ -8012,22 +7095,32 @@ "optional": true, "requires": { "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", + "glob": "7.1.3", + "graceful-fs": "4.1.15", "mkdirp": "0.5.1", "nopt": "3.0.6", "npmlog": "4.1.2", "osenv": "0.1.5", - "request": "2.87.0", - "rimraf": "2.6.2", + "request": "2.88.0", + "rimraf": "2.6.3", "semver": "5.3.0", "tar": "2.2.1", "which": "1.3.1" }, "dependencies": { + "nopt": { + "version": "3.0.6", + "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.1" + } + }, "semver": { "version": "5.3.0", - "resolved": "http://r.cnpmjs.org/semver/download/semver-5.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true, "optional": true @@ -8035,9 +7128,9 @@ } }, "node-libs-browser": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/node-libs-browser/download/node-libs-browser-2.1.0.tgz", - "integrity": "sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=", + "version": "2.2.0", + "resolved": "http://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.2.0.tgz", + "integrity": "sha1-xy9g2dRt4IqUDe27JfP/ovm7qnc=", "dev": true, "requires": { "assert": "1.4.1", @@ -8047,7 +7140,7 @@ "constants-browserify": "1.0.0", "crypto-browserify": "3.12.0", "domain-browser": "1.2.0", - "events": "1.1.1", + "events": "3.0.0", "https-browserify": "1.0.0", "os-browserify": "0.3.0", "path-browserify": "0.0.0", @@ -8055,13 +7148,13 @@ "punycode": "1.4.1", "querystring-es3": "0.2.1", "readable-stream": "2.3.6", - "stream-browserify": "2.0.1", + "stream-browserify": "2.0.2", "stream-http": "2.8.3", "string_decoder": "1.1.1", "timers-browserify": "2.0.10", "tty-browserify": "0.0.0", "url": "0.11.0", - "util": "0.10.4", + "util": "0.11.1", "vm-browserify": "0.0.4" }, "dependencies": { @@ -8071,18 +7164,18 @@ "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=", "dev": true, "requires": { - "pako": "1.0.6" + "pako": "1.0.8" } }, "pako": { - "version": "1.0.6", - "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.6.tgz", - "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=", + "version": "1.0.8", + "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.8.tgz", + "integrity": "sha1-aESJCqucY1r4aK1f7MYuisu6PqQ=", "dev": true }, "punycode": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/punycode/download/punycode-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true } @@ -8117,7 +7210,7 @@ "cross-spawn": "3.0.1", "gaze": "1.1.3", "get-stdin": "4.0.1", - "glob": "7.1.2", + "glob": "7.1.3", "in-publish": "2.0.0", "lodash.assign": "4.2.0", "lodash.clonedeep": "4.5.0", @@ -8133,36 +7226,16 @@ "true-case-path": "1.0.3" }, "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "optional": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, "ansi-styles": { "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/ansi-styles/download/ansi-styles-2.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true, "optional": true }, - "aws4": { - "version": "1.8.0", - "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz", - "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=", - "dev": true, - "optional": true - }, "chalk": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "optional": true, @@ -8174,158 +7247,47 @@ "supports-color": "2.0.0" } }, - "extend": { - "version": "3.0.2", - "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true, - "optional": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true, - "optional": true - }, - "har-validator": { - "version": "5.1.3", - "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-5.1.3.tgz", - "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", - "dev": true, - "optional": true, - "requires": { - "ajv": "6.7.0", - "har-schema": "2.0.0" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true, - "optional": true - }, - "mime-db": { - "version": "1.37.0", - "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.37.0.tgz", - "integrity": "sha1-C2oM5v2+lXbiXx8tL96IMNwK0Ng=", - "dev": true, - "optional": true - }, - "mime-types": { - "version": "2.1.21", - "resolved": "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.21.tgz", - "integrity": "sha1-KJlaoey3cHQv5q5+WPkYHHRLP5Y=", - "dev": true, - "optional": true, - "requires": { - "mime-db": "1.37.0" - } - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", - "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", - "dev": true, - "optional": true - }, - "punycode": { - "version": "1.4.1", - "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true, - "optional": true - }, - "request": { - "version": "2.88.0", - "resolved": "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz", - "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.8.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.1.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.21", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" - } - }, "supports-color": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/supports-color/download/supports-color-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true, "optional": true - }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.4.3.tgz", - "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", - "dev": true, - "optional": true, - "requires": { - "psl": "1.1.31", - "punycode": "1.4.1" - } - }, - "uuid": { - "version": "3.3.2", - "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz", - "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=", - "dev": true, - "optional": true } } }, "node-status-codes": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/node-status-codes/download/node-status-codes-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/node-status-codes/download/node-status-codes-1.0.0.tgz", "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=" }, "node-uuid": { "version": "1.4.3", - "resolved": "http://r.cnpmjs.org/node-uuid/download/node-uuid-1.4.3.tgz", + "resolved": "http://registry.npm.taobao.org/node-uuid/download/node-uuid-1.4.3.tgz", "integrity": "sha1-MZu3pW58tj8AtcDNeFHNS03fHfk=" }, "nopt": { - "version": "3.0.6", - "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, + "version": "1.0.10", + "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", "requires": { - "abbrev": "1.0.9" + "abbrev": "1.1.1" } }, "normalize-package-data": { "version": "2.4.0", - "resolved": "http://r.cnpmjs.org/normalize-package-data/download/normalize-package-data-2.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.4.0.tgz", "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { - "hosted-git-info": "2.6.1", + "hosted-git-info": "2.7.1", "is-builtin-module": "1.0.0", "semver": "5.0.1", - "validate-npm-package-license": "3.0.3" + "validate-npm-package-license": "3.0.4" } }, "normalize-path": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/normalize-path/download/normalize-path-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { @@ -8334,7 +7296,7 @@ }, "normalize-range": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/normalize-range/download/normalize-range-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz", "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, @@ -8346,10 +7308,10 @@ }, "npm-package-arg": { "version": "4.1.0", - "resolved": "http://r.cnpmjs.org/npm-package-arg/download/npm-package-arg-4.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/npm-package-arg/download/npm-package-arg-4.1.0.tgz", "integrity": "sha1-LgFfisAHN8uX+ZfJy/BZ9Cp0Un0=", "requires": { - "hosted-git-info": "2.6.1", + "hosted-git-info": "2.7.1", "semver": "5.0.1" } }, @@ -8386,7 +7348,7 @@ "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", "dev": true, "requires": { - "hosted-git-info": "2.6.1", + "hosted-git-info": "2.7.1", "osenv": "0.1.5", "semver": "5.6.0", "validate-npm-package-name": "3.0.0" @@ -8416,9 +7378,9 @@ "dev": true, "requires": { "JSONStream": "1.3.5", - "bluebird": "3.5.1", + "bluebird": "3.5.3", "figgy-pudding": "3.5.1", - "lru-cache": "4.1.3", + "lru-cache": "4.1.5", "make-fetch-happen": "4.0.1", "npm-package-arg": "6.1.0" }, @@ -8435,7 +7397,7 @@ "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", "dev": true, "requires": { - "hosted-git-info": "2.6.1", + "hosted-git-info": "2.7.1", "osenv": "0.1.5", "semver": "5.6.0", "validate-npm-package-name": "3.0.0" @@ -8460,7 +7422,7 @@ }, "npm-run-path": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/npm-run-path/download/npm-run-path-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { @@ -8469,7 +7431,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "http://r.cnpmjs.org/npmlog/download/npmlog-4.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz", "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { @@ -8481,42 +7443,42 @@ }, "null-check": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/null-check/download/null-check-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/null-check/download/null-check-1.0.0.tgz", "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", "dev": true }, "num2fraction": { "version": "1.2.2", - "resolved": "http://r.cnpmjs.org/num2fraction/download/num2fraction-1.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz", "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, "number-is-nan": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/number-is-nan/download/number-is-nan-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "oauth-sign": { - "version": "0.8.2", - "resolved": "http://r.cnpmjs.org/oauth-sign/download/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "version": "0.9.0", + "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", "dev": true }, "object-assign": { "version": "4.1.1", - "resolved": "http://r.cnpmjs.org/object-assign/download/object-assign-4.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-component": { "version": "0.0.3", - "resolved": "http://r.cnpmjs.org/object-component/download/object-component-0.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/object-component/download/object-component-0.0.3.tgz", "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", "dev": true }, "object-copy": { "version": "0.1.0", - "resolved": "http://r.cnpmjs.org/object-copy/download/object-copy-0.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/object-copy/download/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { @@ -8527,7 +7489,7 @@ "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-0.2.5.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { @@ -8552,7 +7514,7 @@ }, "object-visit": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/object-visit/download/object-visit-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { @@ -8561,7 +7523,7 @@ }, "object.omit": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/object.omit/download/object.omit-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { @@ -8582,7 +7544,7 @@ }, "object.pick": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/object.pick/download/object.pick-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/object.pick/download/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { @@ -8591,13 +7553,13 @@ }, "obuf": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/obuf/download/obuf-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz", "integrity": "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=", "dev": true }, "on-finished": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/on-finished/download/on-finished-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz", "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "dev": true, "requires": { @@ -8606,13 +7568,13 @@ }, "on-headers": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/on-headers/download/on-headers-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/on-headers/download/on-headers-1.0.1.tgz", "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", "dev": true }, "once": { "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/once/download/once-1.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/once/download/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { "wrappy": "1.0.2" @@ -8628,9 +7590,9 @@ } }, "opn": { - "version": "5.3.0", - "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.3.0.tgz", - "integrity": "sha1-ZIcVZchjh18FLP31PT48ta21Oxw=", + "version": "5.4.0", + "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.4.0.tgz", + "integrity": "sha1-y1Reeqt4VivrEao7+rxwQuF2EDU=", "dev": true, "requires": { "is-wsl": "1.1.0" @@ -8638,7 +7600,7 @@ }, "optimist": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/optimist/download/optimist-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/optimist/download/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { @@ -8676,33 +7638,33 @@ }, "options": { "version": "0.0.6", - "resolved": "http://r.cnpmjs.org/options/download/options-0.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/options/download/options-0.0.6.tgz", "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", "dev": true }, "original": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/original/download/original-1.0.1.tgz", - "integrity": "sha1-sKU/9Cupl6jJzR+12q60K51pMZA=", + "version": "1.0.2", + "resolved": "http://registry.npm.taobao.org/original/download/original-1.0.2.tgz", + "integrity": "sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=", "requires": { - "url-parse": "1.4.1" + "url-parse": "1.4.4" } }, "os-browserify": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/os-browserify/download/os-browserify-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, "os-homedir": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/os-homedir/download/os-homedir-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/os-locale/download/os-locale-1.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "optional": true, @@ -8712,13 +7674,13 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, "osenv": { "version": "0.1.5", - "resolved": "http://r.cnpmjs.org/osenv/download/osenv-0.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz", "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, "requires": { @@ -8734,7 +7696,7 @@ }, "p-finally": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/p-finally/download/p-finally-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, @@ -8746,7 +7708,7 @@ }, "p-limit": { "version": "1.3.0", - "resolved": "http://r.cnpmjs.org/p-limit/download/p-limit-1.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz", "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=", "dev": true, "requires": { @@ -8755,7 +7717,7 @@ }, "p-locate": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/p-locate/download/p-locate-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { @@ -8764,13 +7726,13 @@ }, "p-map": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/p-map/download/p-map-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/p-map/download/p-map-1.2.0.tgz", "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=", "dev": true }, "p-try": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/p-try/download/p-try-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, @@ -8785,7 +7747,7 @@ "figgy-pudding": "3.5.1", "get-stream": "4.1.0", "glob": "7.1.3", - "lru-cache": "4.1.3", + "lru-cache": "4.1.5", "make-fetch-happen": "4.0.1", "minimatch": "3.0.4", "minipass": "2.3.5", @@ -8800,7 +7762,7 @@ "promise-inflight": "1.0.1", "promise-retry": "1.1.1", "protoduck": "5.0.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "safe-buffer": "5.1.2", "semver": "5.6.0", "ssri": "6.0.1", @@ -8809,12 +7771,6 @@ "which": "1.3.1" }, "dependencies": { - "bluebird": { - "version": "3.5.3", - "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", - "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", - "dev": true - }, "builtins": { "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/builtins/download/builtins-1.0.3.tgz", @@ -8837,7 +7793,7 @@ "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "ssri": "6.0.1", "unique-filename": "1.1.1", "y18n": "4.0.0" @@ -8854,12 +7810,6 @@ } } }, - "chownr": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", - "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", - "dev": true - }, "get-stream": { "version": "4.1.0", "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz", @@ -8869,26 +7819,6 @@ "pump": "3.0.0" } }, - "glob": { - "version": "7.1.3", - "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", - "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", - "dev": true - }, "mississippi": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz", @@ -8896,14 +7826,14 @@ "dev": true, "requires": { "concat-stream": "1.6.2", - "duplexify": "3.6.0", + "duplexify": "3.6.1", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "3.0.0", "pumpify": "1.5.1", - "stream-each": "1.2.2", + "stream-each": "1.2.3", "through2": "2.0.5" } }, @@ -8913,7 +7843,7 @@ "integrity": "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME=", "dev": true, "requires": { - "hosted-git-info": "2.6.1", + "hosted-git-info": "2.7.1", "osenv": "0.1.5", "semver": "5.6.0", "validate-npm-package-name": "3.0.0" @@ -8969,15 +7899,6 @@ "xtend": "4.0.1" } }, - "unique-filename": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", - "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", - "dev": true, - "requires": { - "unique-slug": "2.0.0" - } - }, "validate-npm-package-name": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/validate-npm-package-name/download/validate-npm-package-name-3.0.0.tgz", @@ -9002,7 +7923,7 @@ }, "parallel-transform": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/parallel-transform/download/parallel-transform-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.1.0.tgz", "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { @@ -9012,21 +7933,22 @@ } }, "parse-asn1": { - "version": "5.1.1", - "resolved": "http://r.cnpmjs.org/parse-asn1/download/parse-asn1-5.1.1.tgz", - "integrity": "sha1-9r8pOBgzK9DatU77Fgh3JHRebKg=", + "version": "5.1.3", + "resolved": "http://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.3.tgz", + "integrity": "sha1-FgDGzAcnNl1ouX86p4k55zWnUgQ=", "dev": true, "requires": { "asn1.js": "4.10.1", "browserify-aes": "1.2.0", "create-hash": "1.2.0", "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.16" + "pbkdf2": "3.0.17", + "safe-buffer": "5.1.2" } }, "parse-glob": { "version": "3.0.4", - "resolved": "http://r.cnpmjs.org/parse-glob/download/parse-glob-3.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/parse-glob/download/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { @@ -9055,7 +7977,7 @@ }, "parse-json": { "version": "2.2.0", - "resolved": "http://r.cnpmjs.org/parse-json/download/parse-json-2.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "requires": { "error-ex": "1.3.2" @@ -9069,7 +7991,7 @@ }, "parsejson": { "version": "0.0.3", - "resolved": "http://r.cnpmjs.org/parsejson/download/parsejson-0.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/parsejson/download/parsejson-0.0.3.tgz", "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "dev": true, "requires": { @@ -9078,7 +8000,7 @@ }, "parseqs": { "version": "0.0.5", - "resolved": "http://r.cnpmjs.org/parseqs/download/parseqs-0.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/parseqs/download/parseqs-0.0.5.tgz", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { @@ -9087,7 +8009,7 @@ }, "parseuri": { "version": "0.0.5", - "resolved": "http://r.cnpmjs.org/parseuri/download/parseuri-0.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/parseuri/download/parseuri-0.0.5.tgz", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { @@ -9096,18 +8018,18 @@ }, "parseurl": { "version": "1.3.2", - "resolved": "http://r.cnpmjs.org/parseurl/download/parseurl-1.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz", "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "dev": true }, "particlesjs": { "version": "2.2.3", - "resolved": "http://r.cnpmjs.org/particlesjs/download/particlesjs-2.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/particlesjs/download/particlesjs-2.2.3.tgz", "integrity": "sha1-TSE8p0Bnn8HMx3Lo2GS4hKCR834=" }, "pascalcase": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/pascalcase/download/pascalcase-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, @@ -9119,58 +8041,69 @@ "requires": { "process": "0.11.10", "util": "0.10.4" + }, + "dependencies": { + "util": { + "version": "0.10.4", + "resolved": "http://registry.npm.taobao.org/util/download/util-0.10.4.tgz", + "integrity": "sha1-OqASW/5mikZy3liFfTrOJ+y3aQE=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + } } }, "path-browserify": { "version": "0.0.0", - "resolved": "http://r.cnpmjs.org/path-browserify/download/path-browserify-0.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, "path-dirname": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/path-dirname/download/path-dirname-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", "dev": true }, "path-exists": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/path-exists/download/path-exists-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/path-is-inside/download/path-is-inside-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz", "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "dev": true }, "path-key": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/path-key/download/path-key-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, "path-parse": { - "version": "1.0.5", - "resolved": "http://r.cnpmjs.org/path-parse/download/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "version": "1.0.6", + "resolved": "http://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz", + "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=", "dev": true }, "path-to-regexp": { "version": "0.1.7", - "resolved": "http://r.cnpmjs.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz", + "resolved": "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, "path-type": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/path-type/download/path-type-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-3.0.0.tgz", "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=", "dev": true, "requires": { @@ -9178,9 +8111,9 @@ } }, "pbkdf2": { - "version": "3.0.16", - "resolved": "http://r.cnpmjs.org/pbkdf2/download/pbkdf2-3.0.16.tgz", - "integrity": "sha1-dAQgjsawG2LYW/g4U6gGT42cKlw=", + "version": "3.0.17", + "resolved": "http://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.0.17.tgz", + "integrity": "sha1-l2wgZTBhexTrsyEUI597CTNuk6Y=", "dev": true, "requires": { "create-hash": "1.2.0", @@ -9192,18 +8125,18 @@ }, "peek-stream": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/peek-stream/download/peek-stream-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/peek-stream/download/peek-stream-1.1.3.tgz", "integrity": "sha1-OzXYS3zLvSYv/zHcENpWhW6tbWc=", "requires": { - "buffer-from": "1.1.0", - "duplexify": "3.6.0", - "through2": "2.0.3" + "buffer-from": "1.1.1", + "duplexify": "3.6.1", + "through2": "2.0.5" }, "dependencies": { "through2": { - "version": "2.0.3", - "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz", + "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", "requires": { "readable-stream": "2.3.6", "xtend": "4.0.1" @@ -9219,18 +8152,18 @@ }, "pify": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true }, "pinkie": { "version": "2.0.4", - "resolved": "http://r.cnpmjs.org/pinkie/download/pinkie-2.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz", "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "requires": { "pinkie": "2.0.4" @@ -9238,7 +8171,7 @@ }, "pkg-dir": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/pkg-dir/download/pkg-dir-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { @@ -9258,7 +8191,7 @@ }, "posix-character-classes": { "version": "0.1.1", - "resolved": "http://r.cnpmjs.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", "dev": true }, @@ -9273,42 +8206,11 @@ "supports-color": "6.1.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", - "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz", - "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - } - } - }, "source-map": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", - "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } } } }, @@ -9321,7 +8223,7 @@ "postcss": "7.0.13", "postcss-value-parser": "3.3.1", "read-cache": "1.0.0", - "resolve": "1.8.1" + "resolve": "1.1.7" } }, "postcss-load-config": { @@ -9344,43 +8246,6 @@ "postcss": "7.0.13", "postcss-load-config": "2.0.0", "schema-utils": "1.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - } } }, "postcss-value-parser": { @@ -9397,37 +8262,37 @@ }, "prepend-http": { "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/prepend-http/download/prepend-http-1.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/prepend-http/download/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "preserve": { "version": "0.2.0", - "resolved": "http://r.cnpmjs.org/preserve/download/preserve-0.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, "prismjs": { "version": "1.15.0", - "resolved": "http://r.cnpmjs.org/prismjs/download/prismjs-1.15.0.tgz", + "resolved": "http://registry.npm.taobao.org/prismjs/download/prismjs-1.15.0.tgz", "integrity": "sha1-iAHTMuRyCRuo3vlJdsiHetYDmNk=", "requires": { - "clipboard": "2.0.1" + "clipboard": "2.0.4" } }, "process": { "version": "0.11.10", - "resolved": "http://r.cnpmjs.org/process/download/process-0.11.10.tgz", + "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=" }, "promise": { "version": "7.3.1", - "resolved": "http://r.cnpmjs.org/promise/download/promise-7.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz", "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "dev": true, "optional": true, @@ -9437,7 +8302,7 @@ }, "promise-inflight": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/promise-inflight/download/promise-inflight-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, @@ -9461,7 +8326,7 @@ }, "promzard": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/promzard/download/promzard-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/promzard/download/promzard-0.3.0.tgz", "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=", "requires": { "read": "1.0.7" @@ -9482,12 +8347,12 @@ "integrity": "sha1-uCePMTHZ1S+hFy7Q9/7AMIX74M4=", "dev": true, "requires": { - "@types/node": "6.0.113", + "@types/node": "6.14.2", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.43", "blocking-proxy": "1.0.1", "chalk": "1.1.3", - "glob": "7.1.2", + "glob": "7.1.3", "jasmine": "2.8.0", "jasminewd2": "2.2.0", "optimist": "0.6.1", @@ -9496,30 +8361,30 @@ "selenium-webdriver": "3.6.0", "source-map-support": "0.4.18", "webdriver-js-extender": "1.0.0", - "webdriver-manager": "12.1.0" + "webdriver-manager": "12.1.1" }, "dependencies": { "@types/node": { - "version": "6.0.113", - "resolved": "http://r.cnpmjs.org/@types/node/download/@types/node-6.0.113.tgz", - "integrity": "sha1-S0HzitA+S0H53CWbO1iuyyLJrrw=", + "version": "6.14.2", + "resolved": "http://registry.npm.taobao.org/@types/node/download/@types/node-6.14.2.tgz", + "integrity": "sha1-QLPbsSIcfWaALLzDL+O4XlRWnHc=", "dev": true }, "adm-zip": { - "version": "0.4.11", - "resolved": "http://registry.npm.taobao.org/adm-zip/download/adm-zip-0.4.11.tgz", - "integrity": "sha1-KqVMhMSwGp0PuJuxGYKlHxPj1io=", + "version": "0.4.13", + "resolved": "http://registry.npm.taobao.org/adm-zip/download/adm-zip-0.4.13.tgz", + "integrity": "sha1-WX4vjMNnIVHhMH0+lc3bx1ZyMUo=", "dev": true }, "ansi-styles": { "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/ansi-styles/download/ansi-styles-2.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, "chalk": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -9532,7 +8397,7 @@ }, "del": { "version": "2.2.2", - "resolved": "http://r.cnpmjs.org/del/download/del-2.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/del/download/del-2.2.2.tgz", "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { @@ -9542,18 +8407,18 @@ "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "rimraf": "2.6.3" } }, "globby": { "version": "5.0.0", - "resolved": "http://r.cnpmjs.org/globby/download/globby-5.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/globby/download/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { "array-union": "1.0.2", "arrify": "1.0.1", - "glob": "7.1.2", + "glob": "7.1.3", "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1" @@ -9561,14 +8426,20 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, "semver": { - "version": "5.5.0", - "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "source-map-support": { @@ -9582,26 +8453,26 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/supports-color/download/supports-color-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, "webdriver-manager": { - "version": "12.1.0", - "resolved": "http://r.cnpmjs.org/webdriver-manager/download/webdriver-manager-12.1.0.tgz", - "integrity": "sha1-9mAeUt5fDJf8cCTIie6yQW8vHZ0=", + "version": "12.1.1", + "resolved": "http://registry.npm.taobao.org/webdriver-manager/download/webdriver-manager-12.1.1.tgz", + "integrity": "sha1-ZsMnH2nO/aqf38pheula+uQcPGI=", "dev": true, "requires": { - "adm-zip": "0.4.11", + "adm-zip": "0.4.13", "chalk": "1.1.3", "del": "2.2.2", - "glob": "7.1.2", + "glob": "7.1.3", "ini": "1.3.5", "minimist": "1.2.0", "q": "1.4.1", - "request": "2.87.0", - "rimraf": "2.6.2", - "semver": "5.5.0", + "request": "2.88.0", + "rimraf": "2.6.3", + "semver": "5.6.0", "xml2js": "0.4.19" } } @@ -9619,13 +8490,13 @@ }, "prr": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/prr/download/prr-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz", "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true }, "pseudomap": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/pseudomap/download/pseudomap-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/pseudomap/download/pseudomap-1.0.2.tgz", "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, @@ -9633,25 +8504,25 @@ "version": "1.1.31", "resolved": "http://registry.npm.taobao.org/psl/download/psl-1.1.31.tgz", "integrity": "sha1-6aqG0BAbWxBcvpOsa3hM1UcnYYQ=", - "dev": true, - "optional": true + "dev": true }, "public-encrypt": { - "version": "4.0.2", - "resolved": "http://r.cnpmjs.org/public-encrypt/download/public-encrypt-4.0.2.tgz", - "integrity": "sha1-RuuRByBr9zSJ+LhbadkTNMZhCZQ=", + "version": "4.0.3", + "resolved": "http://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.3.tgz", + "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=", "dev": true, "requires": { "bn.js": "4.11.8", "browserify-rsa": "4.0.1", "create-hash": "1.2.0", - "parse-asn1": "5.1.1", - "randombytes": "2.0.6" + "parse-asn1": "5.1.3", + "randombytes": "2.0.6", + "safe-buffer": "5.1.2" } }, "pump": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/pump/download/pump-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/pump/download/pump-2.0.1.tgz", "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=", "requires": { "end-of-stream": "1.4.1", @@ -9660,29 +8531,29 @@ }, "pumpify": { "version": "1.5.1", - "resolved": "http://r.cnpmjs.org/pumpify/download/pumpify-1.5.1.tgz", + "resolved": "http://registry.npm.taobao.org/pumpify/download/pumpify-1.5.1.tgz", "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=", "requires": { - "duplexify": "3.6.0", + "duplexify": "3.6.1", "inherits": "2.0.3", "pump": "2.0.1" } }, "punycode": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/punycode/download/punycode-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz", "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", "dev": true }, "q": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/q/download/q-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/q/download/q-1.4.1.tgz", "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", "dev": true }, "qjobs": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/qjobs/download/qjobs-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/qjobs/download/qjobs-1.2.0.tgz", "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=", "dev": true }, @@ -9694,35 +8565,35 @@ }, "querystring": { "version": "0.2.0", - "resolved": "http://r.cnpmjs.org/querystring/download/querystring-0.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "dev": true }, "querystring-es3": { "version": "0.2.1", - "resolved": "http://r.cnpmjs.org/querystring-es3/download/querystring-es3-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, "querystringify": { - "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/querystringify/download/querystringify-2.0.0.tgz", - "integrity": "sha1-+j7W5o6xUVlFfImze8ZHKDMZV1U=" + "version": "2.1.0", + "resolved": "http://registry.npm.taobao.org/querystringify/download/querystringify-2.1.0.tgz", + "integrity": "sha1-fe2N+/eHncxg0KZErGdUsoOtF+8=" }, "randomatic": { - "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/randomatic/download/randomatic-3.0.0.tgz", - "integrity": "sha1-01SQAw6091eN4pLObfsEqRoSiSM=", + "version": "3.1.1", + "resolved": "http://registry.npm.taobao.org/randomatic/download/randomatic-3.1.1.tgz", + "integrity": "sha1-t3bvxZN1mE42xTey9RofCv8Noe0=", "dev": true, "requires": { "is-number": "4.0.0", "kind-of": "6.0.2", - "math-random": "1.0.1" + "math-random": "1.0.4" }, "dependencies": { "is-number": { "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/is-number/download/is-number-4.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-number/download/is-number-4.0.0.tgz", "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=", "dev": true } @@ -9730,7 +8601,7 @@ }, "randombytes": { "version": "2.0.6", - "resolved": "http://r.cnpmjs.org/randombytes/download/randombytes-2.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/randombytes/download/randombytes-2.0.6.tgz", "integrity": "sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=", "dev": true, "requires": { @@ -9739,7 +8610,7 @@ }, "randomfill": { "version": "1.0.4", - "resolved": "http://r.cnpmjs.org/randomfill/download/randomfill-1.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/randomfill/download/randomfill-1.0.4.tgz", "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=", "dev": true, "requires": { @@ -9749,70 +8620,44 @@ }, "range-parser": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/range-parser/download/range-parser-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz", "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "dev": true }, "raven-js": { - "version": "3.26.3", - "resolved": "http://r.cnpmjs.org/raven-js/download/raven-js-3.26.3.tgz", - "integrity": "sha1-DvtJlptbEauWX3sNbaTKECt2PLA=" + "version": "3.27.0", + "resolved": "http://registry.npm.taobao.org/raven-js/download/raven-js-3.27.0.tgz", + "integrity": "sha1-n0fAPheTPOdW4YnzZp1JxEHBum4=" }, "raw-body": { - "version": "2.3.2", - "resolved": "http://r.cnpmjs.org/raw-body/download/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "version": "2.3.3", + "resolved": "http://registry.npm.taobao.org/raw-body/download/raw-body-2.3.3.tgz", + "integrity": "sha1-GzJOzmtXBuFThVvBFIxlu39uoMM=", "dev": true, "requires": { "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", "unpipe": "1.0.0" - }, - "dependencies": { - "depd": { - "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/depd/download/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "http://r.cnpmjs.org/http-errors/download/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.4.0" - } - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/setprototypeof/download/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", - "dev": true - } } }, "raw-loader": { "version": "0.5.1", - "resolved": "http://r.cnpmjs.org/raw-loader/download/raw-loader-0.5.1.tgz", + "resolved": "http://registry.npm.taobao.org/raw-loader/download/raw-loader-0.5.1.tgz", "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", "dev": true }, "read": { "version": "1.0.7", - "resolved": "http://r.cnpmjs.org/read/download/read-1.0.7.tgz", + "resolved": "http://registry.npm.taobao.org/read/download/read-1.0.7.tgz", "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", "requires": { - "mute-stream": "0.0.7" + "mute-stream": "0.0.8" } }, "read-all-stream": { "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/read-all-stream/download/read-all-stream-3.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/read-all-stream/download/read-all-stream-3.1.0.tgz", "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", "requires": { "pinkie-promise": "2.0.1", @@ -9821,7 +8666,7 @@ }, "read-cache": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/read-cache/download/read-cache-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz", "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { @@ -9830,7 +8675,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -9838,11 +8683,11 @@ }, "read-package-json": { "version": "2.0.13", - "resolved": "http://r.cnpmjs.org/read-package-json/download/read-package-json-2.0.13.tgz", + "resolved": "http://registry.npm.taobao.org/read-package-json/download/read-package-json-2.0.13.tgz", "integrity": "sha1-LoLr2fYTuqbS6+Oqcs7+P2jkH0o=", "requires": { - "glob": "7.1.2", - "graceful-fs": "4.1.11", + "glob": "7.1.3", + "graceful-fs": "4.1.15", "json-parse-better-errors": "1.0.2", "normalize-package-data": "2.4.0", "slash": "1.0.0" @@ -9850,7 +8695,7 @@ }, "read-pkg": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/read-pkg/download/read-pkg-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { @@ -9861,18 +8706,18 @@ "dependencies": { "path-type": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/path-type/download/path-type-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "pify": "2.3.0", "pinkie-promise": "2.0.1" } }, "pify": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/pify/download/pify-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -9880,7 +8725,7 @@ }, "read-pkg-up": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { @@ -9890,7 +8735,7 @@ "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/find-up/download/find-up-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { @@ -9900,7 +8745,7 @@ }, "path-exists": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/path-exists/download/path-exists-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { @@ -9911,7 +8756,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://r.cnpmjs.org/readable-stream/download/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "requires": { "core-util-is": "1.0.2", @@ -9925,25 +8770,24 @@ }, "readdir-scoped-modules": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/readdir-scoped-modules/download/readdir-scoped-modules-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/readdir-scoped-modules/download/readdir-scoped-modules-1.0.2.tgz", "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=", "requires": { "debuglog": "1.0.1", "dezalgo": "1.0.3", - "graceful-fs": "4.1.11", + "graceful-fs": "4.1.15", "once": "1.4.0" } }, "readdirp": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/readdirp/download/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "version": "2.2.1", + "resolved": "http://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz", + "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "4.1.15", + "micromatch": "3.1.10", + "readable-stream": "2.3.6" } }, "rechoir": { @@ -9952,12 +8796,12 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.8.1" + "resolve": "1.1.7" } }, "redent": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/redent/download/redent-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "optional": true, @@ -9974,19 +8818,19 @@ }, "regenerate": { "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/regenerate/download/regenerate-1.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz", "integrity": "sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=", "dev": true }, "regenerator-runtime": { "version": "0.11.1", - "resolved": "http://r.cnpmjs.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz", + "resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz", "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=", "dev": true }, "regex-cache": { "version": "0.4.4", - "resolved": "http://r.cnpmjs.org/regex-cache/download/regex-cache-0.4.4.tgz", + "resolved": "http://registry.npm.taobao.org/regex-cache/download/regex-cache-0.4.4.tgz", "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", "dev": true, "requires": { @@ -9995,7 +8839,7 @@ }, "regex-not": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/regex-not/download/regex-not-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz", "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", "dev": true, "requires": { @@ -10005,7 +8849,7 @@ }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/regexpu-core/download/regexpu-core-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { @@ -10016,13 +8860,13 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://r.cnpmjs.org/regjsgen/download/regjsgen-0.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/regjsgen/download/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "regjsparser": { "version": "0.1.5", - "resolved": "http://r.cnpmjs.org/regjsparser/download/regjsparser-0.1.5.tgz", + "resolved": "http://registry.npm.taobao.org/regjsparser/download/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { @@ -10031,7 +8875,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://r.cnpmjs.org/jsesc/download/jsesc-0.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -10039,25 +8883,25 @@ }, "remove-trailing-separator": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, "repeat-element": { - "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/repeat-element/download/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "version": "1.1.3", + "resolved": "http://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.3.tgz", + "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=", "dev": true }, "repeat-string": { "version": "1.6.1", - "resolved": "http://r.cnpmjs.org/repeat-string/download/repeat-string-1.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, "repeating": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/repeating/download/repeating-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/repeating/download/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { @@ -10065,29 +8909,29 @@ } }, "request": { - "version": "2.87.0", - "resolved": "http://registry.npm.taobao.org/request/download/request-2.87.0.tgz", - "integrity": "sha1-MvACNc0I1IK00NaNuTqCnA7VdW4=", + "version": "2.88.0", + "resolved": "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz", + "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", "dev": true, "requires": { "aws-sign2": "0.7.0", - "aws4": "1.7.0", + "aws4": "1.8.0", "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", + "combined-stream": "1.0.7", + "extend": "3.0.2", "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", + "form-data": "2.3.3", + "har-validator": "5.1.3", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", + "mime-types": "2.1.21", + "oauth-sign": "0.9.0", "performance-now": "2.1.0", "qs": "6.5.2", "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", + "tough-cookie": "2.4.3", "tunnel-agent": "0.6.0", "uuid": "3.3.2" }, @@ -10102,7 +8946,7 @@ }, "require-directory": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/require-directory/download/require-directory-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, @@ -10114,27 +8958,24 @@ }, "require-main-filename": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/require-main-filename/download/require-main-filename-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, "requires-port": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/requires-port/download/requires-port-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz", "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.8.1", - "resolved": "http://r.cnpmjs.org/resolve/download/resolve-1.8.1.tgz", - "integrity": "sha1-gvHsGaQjrB+9CAsLqwa6NuhKeiY=", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } + "version": "1.1.7", + "resolved": "http://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true }, "resolve-cwd": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz", "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { @@ -10143,13 +8984,13 @@ }, "resolve-from": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/resolve-from/download/resolve-from-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/resolve-from/download/resolve-from-3.0.0.tgz", "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, "resolve-url": { "version": "0.2.1", - "resolved": "http://r.cnpmjs.org/resolve-url/download/resolve-url-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, @@ -10165,36 +9006,26 @@ }, "ret": { "version": "0.1.15", - "resolved": "http://r.cnpmjs.org/ret/download/ret-0.1.15.tgz", + "resolved": "http://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz", "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=", "dev": true }, "retry": { "version": "0.9.0", - "resolved": "http://r.cnpmjs.org/retry/download/retry-0.9.0.tgz", + "resolved": "http://registry.npm.taobao.org/retry/download/retry-0.9.0.tgz", "integrity": "sha1-b2l+UKDk3cjI9/tUeptg3q1DZ40=" }, - "right-align": { - "version": "0.1.3", - "resolved": "http://r.cnpmjs.org/right-align/download/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - } - }, "rimraf": { - "version": "2.6.2", - "resolved": "http://r.cnpmjs.org/rimraf/download/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "version": "2.6.3", + "resolved": "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.3.tgz", + "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=", "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } }, "ripemd160": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/ripemd160/download/ripemd160-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz", "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=", "dev": true, "requires": { @@ -10213,7 +9044,7 @@ }, "run-queue": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/run-queue/download/run-queue-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/run-queue/download/run-queue-1.0.3.tgz", "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { @@ -10229,18 +9060,18 @@ } }, "rxjs-compat": { - "version": "6.2.1", - "resolved": "http://registry.npm.taobao.org/rxjs-compat/download/rxjs-compat-6.2.1.tgz", - "integrity": "sha1-9aXkvXANtBToKqfLNOXJIixtN1Y=" + "version": "6.3.3", + "resolved": "http://registry.npm.taobao.org/rxjs-compat/download/rxjs-compat-6.3.3.tgz", + "integrity": "sha1-KrO5rA2sDAc3SdVf75wD6h3yBFw=" }, "safe-buffer": { "version": "5.1.2", - "resolved": "http://r.cnpmjs.org/safe-buffer/download/safe-buffer-5.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" }, "safe-regex": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/safe-regex/download/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -10249,71 +9080,21 @@ }, "safer-buffer": { "version": "2.1.2", - "resolved": "http://r.cnpmjs.org/safer-buffer/download/safer-buffer-2.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz", "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", "dev": true }, "sass-graph": { "version": "2.2.4", - "resolved": "http://r.cnpmjs.org/sass-graph/download/sass-graph-2.2.4.tgz", + "resolved": "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz", "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "optional": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", + "glob": "7.1.3", + "lodash": "4.17.11", "scss-tokenizer": "0.2.3", "yargs": "7.1.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true, - "optional": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" - } - } } }, "sass-loader": { @@ -10325,7 +9106,7 @@ "clone-deep": "2.0.2", "loader-utils": "1.1.0", "lodash.tail": "4.1.1", - "neo-async": "2.5.1", + "neo-async": "2.6.0", "pify": "3.0.0", "semver": "5.6.0" }, @@ -10348,27 +9129,27 @@ }, "dependencies": { "agent-base": { - "version": "4.2.0", - "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-4.2.0.tgz", - "integrity": "sha1-mDi1wzkrliutAx5qTF4QJKvsRc4=", + "version": "4.2.1", + "resolved": "http://registry.npm.taobao.org/agent-base/download/agent-base-4.2.1.tgz", + "integrity": "sha1-2J5ZmfeXh1Z0wH2H8mD8Qeg+jKk=", "dev": true, "requires": { "es6-promisify": "5.0.0" } }, "debug": { - "version": "3.1.0", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "version": "3.2.6", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "es6-promise": { - "version": "4.2.4", - "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.4.tgz", - "integrity": "sha1-3EIhwrFlGHYL2MOaUtjzVvwA7Sk=", + "version": "4.2.5", + "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.5.tgz", + "integrity": "sha1-2m0NVpLvtGHggsFIF/4kJ9j10FQ=", "dev": true }, "es6-promisify": { @@ -10377,7 +9158,7 @@ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "es6-promise": "4.2.4" + "es6-promise": "4.2.5" } }, "https-proxy-agent": { @@ -10386,83 +9167,49 @@ "integrity": "sha1-UVUpcPoE1yPgTFbQQXjD+SWSu8A=", "dev": true, "requires": { - "agent-base": "4.2.0", - "debug": "3.1.0" + "agent-base": "4.2.1", + "debug": "3.2.6" } }, "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", "dev": true } } }, "sax": { "version": "0.5.8", - "resolved": "http://r.cnpmjs.org/sax/download/sax-0.5.8.tgz", + "resolved": "http://registry.npm.taobao.org/sax/download/sax-0.5.8.tgz", "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", "dev": true }, "schema-utils": { - "version": "0.4.5", - "resolved": "http://r.cnpmjs.org/schema-utils/download/schema-utils-0.4.5.tgz", - "integrity": "sha1-IYNvBgiqwXt4+ePiTa/xSlyhOj4=", + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", + "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", "dev": true, "requires": { - "ajv": "6.5.2", + "ajv": "6.6.2", + "ajv-errors": "1.0.1", "ajv-keywords": "3.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "http://r.cnpmjs.org/ajv/download/ajv-6.5.2.tgz", - "integrity": "sha1-Z4SV+bgvfMpr4kjdkvWb/14fQ2A=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://r.cnpmjs.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, - "requires": { - "punycode": "2.1.1" - } - } } }, "scss-tokenizer": { "version": "0.2.3", - "resolved": "http://r.cnpmjs.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz", + "resolved": "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "optional": true, "requires": { - "js-base64": "2.5.0", + "js-base64": "2.5.1", "source-map": "0.4.4" }, "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.4.4.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "optional": true, @@ -10474,13 +9221,13 @@ }, "select": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/select/download/select-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/select/download/select-1.1.2.tgz", "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", "optional": true }, "select-hose": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/select-hose/download/select-hose-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz", "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, @@ -10491,14 +9238,14 @@ "dev": true, "requires": { "jszip": "3.1.5", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "tmp": "0.0.30", "xml2js": "0.4.19" }, "dependencies": { "tmp": { "version": "0.0.30", - "resolved": "http://r.cnpmjs.org/tmp/download/tmp-0.0.30.tgz", + "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.30.tgz", "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", "dev": true, "requires": { @@ -10523,17 +9270,17 @@ }, "semver-dsl": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/semver-dsl/download/semver-dsl-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/semver-dsl/download/semver-dsl-1.0.1.tgz", "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "5.6.0" }, "dependencies": { "semver": { - "version": "5.5.0", - "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", "dev": true } } @@ -10549,7 +9296,7 @@ }, "send": { "version": "0.16.2", - "resolved": "http://r.cnpmjs.org/send/download/send-0.16.2.tgz", + "resolved": "http://registry.npm.taobao.org/send/download/send-0.16.2.tgz", "integrity": "sha1-bsyh4PjBVtFBWXVZhI32RzCmu8E=", "dev": true, "requires": { @@ -10579,7 +9326,7 @@ }, "mime": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/mime/download/mime-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/mime/download/mime-1.4.1.tgz", "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, @@ -10592,14 +9339,14 @@ } }, "serialize-javascript": { - "version": "1.5.0", - "resolved": "http://r.cnpmjs.org/serialize-javascript/download/serialize-javascript-1.5.0.tgz", - "integrity": "sha1-GqM2FiyIqJDdrVOEuuvJOmVRYf4=", + "version": "1.6.1", + "resolved": "http://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.6.1.tgz", + "integrity": "sha1-TR9pfsSUKahHym9EKip1USbE2Hk=", "dev": true }, "serve-index": { "version": "1.9.1", - "resolved": "http://r.cnpmjs.org/serve-index/download/serve-index-1.9.1.tgz", + "resolved": "http://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz", "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { @@ -10608,7 +9355,7 @@ "debug": "2.6.9", "escape-html": "1.0.3", "http-errors": "1.6.3", - "mime-types": "2.1.18", + "mime-types": "2.1.21", "parseurl": "1.3.2" }, "dependencies": { @@ -10631,7 +9378,7 @@ }, "serve-static": { "version": "1.13.2", - "resolved": "http://r.cnpmjs.org/serve-static/download/serve-static-1.13.2.tgz", + "resolved": "http://registry.npm.taobao.org/serve-static/download/serve-static-1.13.2.tgz", "integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=", "dev": true, "requires": { @@ -10643,19 +9390,13 @@ }, "set-blocking": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/set-blocking/download/set-blocking-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/set-immediate-shim/download/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, "set-value": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/set-value/download/set-value-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/set-value/download/set-value-2.0.0.tgz", "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", "dev": true, "requires": { @@ -10667,7 +9408,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/extend-shallow/download/extend-shallow-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { @@ -10678,19 +9419,19 @@ }, "setimmediate": { "version": "1.0.5", - "resolved": "http://r.cnpmjs.org/setimmediate/download/setimmediate-1.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", "dev": true }, "setprototypeof": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/setprototypeof/download/setprototypeof-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz", "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=", "dev": true }, "sha.js": { "version": "2.4.11", - "resolved": "http://r.cnpmjs.org/sha.js/download/sha.js-2.4.11.tgz", + "resolved": "http://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz", "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=", "dev": true, "requires": { @@ -10700,7 +9441,7 @@ }, "shallow-clone": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/shallow-clone/download/shallow-clone-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/shallow-clone/download/shallow-clone-1.0.0.tgz", "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=", "dev": true, "requires": { @@ -10711,7 +9452,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "resolved": "http://r.cnpmjs.org/kind-of/download/kind-of-5.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", "dev": true } @@ -10719,7 +9460,7 @@ }, "shebang-command": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/shebang-command/download/shebang-command-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { @@ -10728,7 +9469,7 @@ }, "shebang-regex": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/shebang-regex/download/shebang-regex-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz", "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, @@ -10738,31 +9479,31 @@ "integrity": "sha1-p/MxlSDr8J7oEnWyNorbKGZZsJc=", "dev": true, "requires": { - "glob": "7.1.2", + "glob": "7.1.3", "interpret": "1.2.0", "rechoir": "0.6.2" } }, "signal-exit": { "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/signal-exit/download/signal-exit-3.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, "slash": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/slash/download/slash-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/slash/download/slash-1.0.0.tgz", "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "smart-buffer": { - "version": "4.0.1", - "resolved": "http://registry.npm.taobao.org/smart-buffer/download/smart-buffer-4.0.1.tgz", - "integrity": "sha1-B+ocqNTbJOtMrIZTfX0YmVIhrOM=", + "version": "4.0.2", + "resolved": "http://registry.npm.taobao.org/smart-buffer/download/smart-buffer-4.0.2.tgz", + "integrity": "sha1-UgeFjDgVzGkRBwPGuU5GwVY0OV0=", "dev": true }, "snapdragon": { "version": "0.8.2", - "resolved": "http://r.cnpmjs.org/snapdragon/download/snapdragon-0.8.2.tgz", + "resolved": "http://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz", "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", "dev": true, "requires": { @@ -10773,12 +9514,12 @@ "map-cache": "0.2.2", "source-map": "0.5.7", "source-map-resolve": "0.5.2", - "use": "3.1.0" + "use": "3.1.1" }, "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-0.2.5.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { @@ -10787,18 +9528,24 @@ }, "extend-shallow": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/extend-shallow/download/extend-shallow-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "0.1.1" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, "snapdragon-node": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz", "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", "dev": true, "requires": { @@ -10809,7 +9556,7 @@ "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { @@ -10818,7 +9565,7 @@ }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { @@ -10827,7 +9574,7 @@ }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz", "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { @@ -10836,7 +9583,7 @@ }, "is-descriptor": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/is-descriptor/download/is-descriptor-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { @@ -10849,7 +9596,7 @@ }, "snapdragon-util": { "version": "3.0.1", - "resolved": "http://r.cnpmjs.org/snapdragon-util/download/snapdragon-util-3.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/snapdragon-util/download/snapdragon-util-3.0.1.tgz", "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", "dev": true, "requires": { @@ -10869,7 +9616,7 @@ }, "socket.io": { "version": "1.7.3", - "resolved": "http://r.cnpmjs.org/socket.io/download/socket.io-1.7.3.tgz", + "resolved": "http://registry.npm.taobao.org/socket.io/download/socket.io-1.7.3.tgz", "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=", "dev": true, "requires": { @@ -10884,7 +9631,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10893,13 +9640,13 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://r.cnpmjs.org/ms/download/ms-0.7.2.tgz", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true }, "object-assign": { "version": "4.1.0", - "resolved": "http://r.cnpmjs.org/object-assign/download/object-assign-4.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.0.tgz", "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", "dev": true } @@ -10907,7 +9654,7 @@ }, "socket.io-adapter": { "version": "0.5.0", - "resolved": "http://r.cnpmjs.org/socket.io-adapter/download/socket.io-adapter-0.5.0.tgz", + "resolved": "http://registry.npm.taobao.org/socket.io-adapter/download/socket.io-adapter-0.5.0.tgz", "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", "dev": true, "requires": { @@ -10917,7 +9664,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10926,7 +9673,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://r.cnpmjs.org/ms/download/ms-0.7.2.tgz", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -10934,7 +9681,7 @@ }, "socket.io-client": { "version": "1.7.3", - "resolved": "http://r.cnpmjs.org/socket.io-client/download/socket.io-client-1.7.3.tgz", + "resolved": "http://registry.npm.taobao.org/socket.io-client/download/socket.io-client-1.7.3.tgz", "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=", "dev": true, "requires": { @@ -10953,7 +9700,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://r.cnpmjs.org/debug/download/debug-2.3.3.tgz", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10962,7 +9709,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://r.cnpmjs.org/ms/download/ms-0.7.2.tgz", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -10970,7 +9717,7 @@ }, "socket.io-parser": { "version": "2.3.1", - "resolved": "http://r.cnpmjs.org/socket.io-parser/download/socket.io-parser-2.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-2.3.1.tgz", "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", "dev": true, "requires": { @@ -10982,13 +9729,13 @@ "dependencies": { "component-emitter": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/component-emitter/download/component-emitter-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/component-emitter/download/component-emitter-1.1.2.tgz", "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", "dev": true }, "isarray": { "version": "0.0.1", - "resolved": "http://r.cnpmjs.org/isarray/download/isarray-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true } @@ -10996,7 +9743,7 @@ }, "sockjs": { "version": "0.3.19", - "resolved": "http://r.cnpmjs.org/sockjs/download/sockjs-0.3.19.tgz", + "resolved": "http://registry.npm.taobao.org/sockjs/download/sockjs-0.3.19.tgz", "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=", "dev": true, "requires": { @@ -11006,7 +9753,7 @@ "dependencies": { "faye-websocket": { "version": "0.10.0", - "resolved": "http://r.cnpmjs.org/faye-websocket/download/faye-websocket-0.10.0.tgz", + "resolved": "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { @@ -11022,41 +9769,41 @@ } }, "sockjs-client": { - "version": "1.1.5", - "resolved": "http://r.cnpmjs.org/sockjs-client/download/sockjs-client-1.1.5.tgz", - "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=", + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.3.0.tgz", + "integrity": "sha1-EvydbLZj2lc509xftuhofalcsXc=", "requires": { - "debug": "2.6.9", - "eventsource": "0.1.6", + "debug": "3.2.6", + "eventsource": "1.0.7", "faye-websocket": "0.11.1", "inherits": "2.0.3", "json3": "3.3.2", - "url-parse": "1.4.1" + "url-parse": "1.4.4" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "version": "3.2.6", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "ms": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "version": "2.1.1", + "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=" } } }, "socks": { - "version": "2.2.2", - "resolved": "http://registry.npm.taobao.org/socks/download/socks-2.2.2.tgz", - "integrity": "sha1-8GEhn8LU0zKvtK+T6GXITT+ibis=", + "version": "2.2.3", + "resolved": "http://registry.npm.taobao.org/socks/download/socks-2.2.3.tgz", + "integrity": "sha1-c5nOEeGbKplxU8mDqcy2MGch8tw=", "dev": true, "requires": { "ip": "1.1.5", - "smart-buffer": "4.0.1" + "smart-buffer": "4.0.2" } }, "socks-proxy-agent": { @@ -11066,7 +9813,7 @@ "dev": true, "requires": { "agent-base": "4.2.1", - "socks": "2.2.2" + "socks": "2.2.3" }, "dependencies": { "agent-base": { @@ -11096,15 +9843,15 @@ } }, "source-list-map": { - "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/source-list-map/download/source-list-map-2.0.0.tgz", - "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=", + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz", + "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=", "dev": true }, "source-map": { - "version": "0.5.7", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "version": "0.7.3", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz", + "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=", "dev": true }, "source-map-loader": { @@ -11123,18 +9870,18 @@ "integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "4.17.11" } } } }, "source-map-resolve": { "version": "0.5.2", - "resolved": "http://r.cnpmjs.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz", + "resolved": "http://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz", "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", "dev": true, "requires": { - "atob": "2.1.1", + "atob": "2.1.2", "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", "source-map-url": "0.4.0", @@ -11142,12 +9889,12 @@ } }, "source-map-support": { - "version": "0.5.6", - "resolved": "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.6.tgz", - "integrity": "sha1-RDXO5Gsaq2K46GEM5g94gJHFHBM=", + "version": "0.5.9", + "resolved": "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.9.tgz", + "integrity": "sha1-QbyVOyU0Jn6i1gW8z6e/oxEc7V8=", "dev": true, "requires": { - "buffer-from": "1.1.0", + "buffer-from": "1.1.1", "source-map": "0.6.1" }, "dependencies": { @@ -11161,7 +9908,7 @@ }, "source-map-url": { "version": "0.4.0", - "resolved": "http://r.cnpmjs.org/source-map-url/download/source-map-url-0.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz", "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, @@ -11172,32 +9919,32 @@ "dev": true }, "spdx-correct": { - "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/spdx-correct/download/spdx-correct-3.0.0.tgz", - "integrity": "sha1-BaW01xU6GVvJLDxCW2nzsqlSTII=", + "version": "3.1.0", + "resolved": "http://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.1.0.tgz", + "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=", "requires": { "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-license-ids": "3.0.3" } }, "spdx-exceptions": { - "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/spdx-exceptions/download/spdx-exceptions-2.1.0.tgz", - "integrity": "sha1-LHrmEFbHFKW5ubKyr30xHvXHj+k=" + "version": "2.2.0", + "resolved": "http://registry.npm.taobao.org/spdx-exceptions/download/spdx-exceptions-2.2.0.tgz", + "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=" }, "spdx-expression-parse": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/spdx-expression-parse/download/spdx-expression-parse-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/spdx-expression-parse/download/spdx-expression-parse-3.0.0.tgz", "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "2.2.0", + "spdx-license-ids": "3.0.3" } }, "spdx-license-ids": { - "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/spdx-license-ids/download/spdx-license-ids-3.0.0.tgz", - "integrity": "sha1-enzShHDMbToc/m1miG9rxDDTrIc=" + "version": "3.0.3", + "resolved": "http://registry.npm.taobao.org/spdx-license-ids/download/spdx-license-ids-3.0.3.tgz", + "integrity": "sha1-gcDOjyFHR1YUi7tfO/wPNr8V124=" }, "spdy": { "version": "4.0.0", @@ -11277,12 +10024,12 @@ "integrity": "sha1-gXmTbrjF6JH3SBvVB1qeqaD3SCM=", "dev": true, "requires": { - "chalk": "2.2.2" + "chalk": "2.4.2" } }, "split-string": { "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/split-string/download/split-string-3.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz", "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", "dev": true, "requires": { @@ -11291,20 +10038,20 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/sprintf-js/download/sprintf-js-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { - "version": "1.14.2", - "resolved": "http://r.cnpmjs.org/sshpk/download/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", + "version": "1.16.1", + "resolved": "http://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz", + "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=", "dev": true, "requires": { - "asn1": "0.2.3", + "asn1": "0.2.4", "assert-plus": "1.0.0", "bcrypt-pbkdf": "1.0.2", "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", + "ecc-jsbn": "0.1.2", "getpass": "0.1.7", "jsbn": "0.1.1", "safer-buffer": "2.1.2", @@ -11313,7 +10060,7 @@ }, "ssri": { "version": "5.3.0", - "resolved": "http://r.cnpmjs.org/ssri/download/ssri-5.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz", "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", "dev": true, "requires": { @@ -11322,7 +10069,7 @@ }, "static-extend": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/static-extend/download/static-extend-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { @@ -11332,7 +10079,7 @@ "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "http://r.cnpmjs.org/define-property/download/define-property-0.2.5.tgz", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { @@ -11347,12 +10094,12 @@ "integrity": "sha1-zP/pt0Xei7sVVXHgY/gmP8DivAY=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "4.17.11" } }, "statuses": { "version": "1.4.0", - "resolved": "http://r.cnpmjs.org/statuses/download/statuses-1.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/statuses/download/statuses-1.4.0.tgz", "integrity": "sha1-u3PURtonlhBu/MG2AaJT1sRr0Ic=", "dev": true }, @@ -11367,9 +10114,9 @@ } }, "stream-browserify": { - "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/stream-browserify/download/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "version": "2.0.2", + "resolved": "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.2.tgz", + "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=", "dev": true, "requires": { "inherits": "2.0.3", @@ -11377,9 +10124,9 @@ } }, "stream-each": { - "version": "1.2.2", - "resolved": "http://r.cnpmjs.org/stream-each/download/stream-each-1.2.2.tgz", - "integrity": "sha1-joxGP5HaiZF3h2WHP+TZYNj2Fr0=", + "version": "1.2.3", + "resolved": "http://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz", + "integrity": "sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=", "dev": true, "requires": { "end-of-stream": "1.4.1", @@ -11388,7 +10135,7 @@ }, "stream-http": { "version": "2.8.3", - "resolved": "http://r.cnpmjs.org/stream-http/download/stream-http-2.8.3.tgz", + "resolved": "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz", "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", "dev": true, "requires": { @@ -11401,12 +10148,12 @@ }, "stream-shift": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/stream-shift/download/stream-shift-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.0.tgz", "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, "string-width": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/string-width/download/string-width-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -11417,7 +10164,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://r.cnpmjs.org/string_decoder/download/string_decoder-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz", "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "requires": { "safe-buffer": "5.1.2" @@ -11425,7 +10172,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://r.cnpmjs.org/strip-ansi/download/strip-ansi-3.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { @@ -11434,7 +10181,7 @@ }, "strip-bom": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/strip-bom/download/strip-bom-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { @@ -11443,13 +10190,13 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/strip-eof/download/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, "strip-indent": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/strip-indent/download/strip-indent-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "optional": true, @@ -11465,48 +10212,11 @@ "requires": { "loader-utils": "1.1.0", "schema-utils": "1.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - } } }, "stylus": { "version": "0.54.5", - "resolved": "http://r.cnpmjs.org/stylus/download/stylus-0.54.5.tgz", + "resolved": "http://registry.npm.taobao.org/stylus/download/stylus-0.54.5.tgz", "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { @@ -11520,7 +10230,7 @@ "dependencies": { "glob": { "version": "7.0.6", - "resolved": "http://r.cnpmjs.org/glob/download/glob-7.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.0.6.tgz", "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { @@ -11534,7 +10244,7 @@ }, "source-map": { "version": "0.1.43", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.1.43.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { @@ -11545,7 +10255,7 @@ }, "stylus-loader": { "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/stylus-loader/download/stylus-loader-3.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/stylus-loader/download/stylus-loader-3.0.2.tgz", "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=", "dev": true, "requires": { @@ -11555,9 +10265,9 @@ } }, "supports-color": { - "version": "5.4.0", - "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz", - "integrity": "sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q=", + "version": "6.1.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", + "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", "dev": true, "requires": { "has-flag": "3.0.0" @@ -11570,14 +10280,14 @@ "dev": true }, "tapable": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.0.0.tgz", - "integrity": "sha1-y7Y52QAu7ZxrWXXrIFmNeTbx+fI=", + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz", + "integrity": "sha1-TSl5I8WnKkI2DeKrUtrfquwAAY4=", "dev": true }, "tar": { "version": "2.2.1", - "resolved": "http://r.cnpmjs.org/tar/download/tar-2.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "requires": { "block-stream": "0.0.9", @@ -11593,15 +10303,9 @@ "requires": { "commander": "2.17.1", "source-map": "0.6.1", - "source-map-support": "0.5.6" + "source-map-support": "0.5.9" }, "dependencies": { - "commander": { - "version": "2.17.1", - "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz", - "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", - "dev": true - }, "source-map": { "version": "0.6.1", "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", @@ -11619,31 +10323,13 @@ "cacache": "11.3.2", "find-cache-dir": "2.0.0", "schema-utils": "1.0.0", - "serialize-javascript": "1.5.0", + "serialize-javascript": "1.6.1", "source-map": "0.6.1", "terser": "3.14.1", - "webpack-sources": "1.1.0", + "webpack-sources": "1.3.0", "worker-farm": "1.6.0" }, "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "bluebird": { - "version": "3.5.3", - "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.3.tgz", - "integrity": "sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=", - "dev": true - }, "cacache": { "version": "11.3.2", "resolved": "http://registry.npm.taobao.org/cacache/download/cacache-11.3.2.tgz", @@ -11660,24 +10346,12 @@ "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "ssri": "6.0.1", "unique-filename": "1.1.1", "y18n": "4.0.0" } }, - "chownr": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.1.1.tgz", - "integrity": "sha1-VHJri4//TfBTxCGH6AH7RBLfFJQ=", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, "find-cache-dir": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-2.0.0.tgz", @@ -11698,32 +10372,6 @@ "locate-path": "3.0.0" } }, - "glob": { - "version": "7.1.3", - "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz", - "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, "locate-path": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz", @@ -11750,14 +10398,14 @@ "dev": true, "requires": { "concat-stream": "1.6.2", - "duplexify": "3.6.0", + "duplexify": "3.6.1", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "3.0.0", "pumpify": "1.5.1", - "stream-each": "1.2.2", + "stream-each": "1.2.3", "through2": "2.0.5" } }, @@ -11804,17 +10452,6 @@ "once": "1.4.0" } }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - }, "source-map": { "version": "0.6.1", "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", @@ -11840,15 +10477,6 @@ "xtend": "4.0.1" } }, - "unique-filename": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", - "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", - "dev": true, - "requires": { - "unique-slug": "2.0.0" - } - }, "yallist": { "version": "3.0.3", "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", @@ -11857,14 +10485,9 @@ } } }, - "tether": { - "version": "1.4.4", - "resolved": "http://registry.npm.taobao.org/tether/download/tether-1.4.4.tgz", - "integrity": "sha1-ncbrKz5gHaIJj9Jk5/eosmTeESU=" - }, "thenify": { "version": "3.3.0", - "resolved": "http://r.cnpmjs.org/thenify/download/thenify-3.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/thenify/download/thenify-3.3.0.tgz", "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", "requires": { "any-promise": "1.3.0" @@ -11872,7 +10495,7 @@ }, "thenify-all": { "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/thenify-all/download/thenify-all-1.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/thenify-all/download/thenify-all-1.6.0.tgz", "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", "requires": { "thenify": "3.3.0" @@ -11880,7 +10503,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://r.cnpmjs.org/through/download/through-2.3.8.tgz", + "resolved": "http://registry.npm.taobao.org/through/download/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -11932,12 +10555,12 @@ }, "timed-out": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/timed-out/download/timed-out-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/timed-out/download/timed-out-2.0.0.tgz", "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=" }, "timers-browserify": { "version": "2.0.10", - "resolved": "http://r.cnpmjs.org/timers-browserify/download/timers-browserify-2.0.10.tgz", + "resolved": "http://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.10.tgz", "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=", "dev": true, "requires": { @@ -11946,14 +10569,14 @@ }, "tiny-emitter": { "version": "2.0.2", - "resolved": "http://r.cnpmjs.org/tiny-emitter/download/tiny-emitter-2.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.0.2.tgz", "integrity": "sha1-gtJ0aKylrejl/R5tIrV91D69+3w=", "optional": true }, "tmp": { - "version": "0.0.31", - "resolved": "http://r.cnpmjs.org/tmp/download/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -11961,25 +10584,25 @@ }, "to-array": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/to-array/download/to-array-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/to-array/download/to-array-0.1.4.tgz", "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", "dev": true }, "to-arraybuffer": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz", "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", "dev": true }, "to-fast-properties": { "version": "1.0.3", - "resolved": "http://r.cnpmjs.org/to-fast-properties/download/to-fast-properties-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-1.0.3.tgz", "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, "to-object-path": { "version": "0.3.0", - "resolved": "http://r.cnpmjs.org/to-object-path/download/to-object-path-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { @@ -11999,7 +10622,7 @@ }, "to-regex": { "version": "3.0.2", - "resolved": "http://r.cnpmjs.org/to-regex/download/to-regex-3.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz", "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", "dev": true, "requires": { @@ -12011,7 +10634,7 @@ }, "to-regex-range": { "version": "2.1.1", - "resolved": "http://r.cnpmjs.org/to-regex-range/download/to-regex-range-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { @@ -12020,17 +10643,18 @@ } }, "tough-cookie": { - "version": "2.3.4", - "resolved": "http://r.cnpmjs.org/tough-cookie/download/tough-cookie-2.3.4.tgz", - "integrity": "sha1-7GDO44rGdQY//JelwYlwV47oNlU=", + "version": "2.4.3", + "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.4.3.tgz", + "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", "dev": true, "requires": { + "psl": "1.1.31", "punycode": "1.4.1" }, "dependencies": { "punycode": { "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/punycode/download/punycode-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true } @@ -12038,20 +10662,20 @@ }, "tree-kill": { "version": "1.2.0", - "resolved": "http://r.cnpmjs.org/tree-kill/download/tree-kill-1.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/tree-kill/download/tree-kill-1.2.0.tgz", "integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY=", "dev": true }, "trim-newlines": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/trim-newlines/download/trim-newlines-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true, "optional": true }, "trim-right": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/trim-right/download/trim-right-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz", "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, @@ -12062,7 +10686,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } }, "ts-node": { @@ -12072,76 +10696,61 @@ "dev": true, "requires": { "arrify": "1.0.1", - "chalk": "2.4.1", + "chalk": "2.4.2", "diff": "3.5.0", - "make-error": "1.3.4", + "make-error": "1.3.5", "minimist": "1.2.0", "mkdirp": "0.5.1", - "source-map-support": "0.5.6", + "source-map-support": "0.5.9", "yn": "2.0.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.1", - "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz", - "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" - } - } } }, "tslib": { "version": "1.9.3", - "resolved": "http://r.cnpmjs.org/tslib/download/tslib-1.9.3.tgz", + "resolved": "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz", "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" }, "tslint": { - "version": "5.9.1", - "resolved": "http://registry.npm.taobao.org/tslint/download/tslint-5.9.1.tgz", - "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", + "version": "5.12.1", + "resolved": "http://registry.npm.taobao.org/tslint/download/tslint-5.12.1.tgz", + "integrity": "sha1-jOydRUz4od6bCibXvbrW3jYuUsE=", "dev": true, "requires": { "babel-code-frame": "6.26.0", "builtin-modules": "1.1.1", - "chalk": "2.4.1", - "commander": "2.16.0", + "chalk": "2.4.2", + "commander": "2.17.1", "diff": "3.5.0", - "glob": "7.1.2", - "js-yaml": "3.12.0", + "glob": "7.1.3", + "js-yaml": "3.12.1", "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.5.0", + "resolve": "1.10.0", + "semver": "5.6.0", "tslib": "1.9.3", - "tsutils": "2.27.2" + "tsutils": "2.29.0" }, "dependencies": { - "chalk": { - "version": "2.4.1", - "resolved": "http://r.cnpmjs.org/chalk/download/chalk-2.4.1.tgz", - "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", + "resolve": { + "version": "1.10.0", + "resolved": "http://registry.npm.taobao.org/resolve/download/resolve-1.10.0.tgz", + "integrity": "sha1-O9qur0XMB/N1ZW39LlTtCBCxAbo=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "path-parse": "1.0.6" } }, "semver": { - "version": "5.5.0", - "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "version": "5.6.0", + "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", "dev": true } } }, "tsutils": { - "version": "2.27.2", - "resolved": "http://registry.npm.taobao.org/tsutils/download/tsutils-2.27.2.tgz", - "integrity": "sha1-YLqIoj1veF7EuJxugXnKybQx8cc=", + "version": "2.29.0", + "resolved": "http://registry.npm.taobao.org/tsutils/download/tsutils-2.29.0.tgz", + "integrity": "sha1-MrSIUBRnrL7dS4VJhnOggSrKC5k=", "dev": true, "requires": { "tslib": "1.9.3" @@ -12149,13 +10758,13 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "http://r.cnpmjs.org/tty-browserify/download/tty-browserify-0.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, "tunnel-agent": { "version": "0.6.0", - "resolved": "http://r.cnpmjs.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { @@ -12164,10 +10773,9 @@ }, "tweetnacl": { "version": "0.14.5", - "resolved": "http://r.cnpmjs.org/tweetnacl/download/tweetnacl-0.14.5.tgz", + "resolved": "http://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, - "optional": true + "dev": true }, "type-check": { "version": "0.3.2", @@ -12180,17 +10788,17 @@ }, "type-is": { "version": "1.6.16", - "resolved": "http://r.cnpmjs.org/type-is/download/type-is-1.6.16.tgz", + "resolved": "http://registry.npm.taobao.org/type-is/download/type-is-1.6.16.tgz", "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=", "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.18" + "mime-types": "2.1.21" } }, "typedarray": { "version": "0.0.6", - "resolved": "http://r.cnpmjs.org/typedarray/download/typedarray-0.0.6.tgz", + "resolved": "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, @@ -12200,62 +10808,35 @@ "integrity": "sha1-xYXLlSkSJj2RW0YnJs4kS6UQ7z0=", "dev": true }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.2.7", - "resolved": "http://r.cnpmjs.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-1.2.7.tgz", - "integrity": "sha1-V2ON2ZyFOh6/6dl7QhYKilB/nQA=", + "uglify-js": { + "version": "3.4.9", + "resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.9.tgz", + "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", "dev": true, + "optional": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.5", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.1.0", - "worker-farm": "1.6.0" + "commander": "2.17.1", + "source-map": "0.6.1" }, "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "http://r.cnpmjs.org/commander/download/commander-2.13.0.tgz", - "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", - "dev": true - }, "source-map": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "http://r.cnpmjs.org/uglify-es/download/uglify-es-3.3.9.tgz", - "integrity": "sha1-DBxPBwC+2NvBJM2zBNJZLKID5nc=", "dev": true, - "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" - } + "optional": true } } }, "ultron": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/ultron/download/ultron-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/ultron/download/ultron-1.0.2.tgz", "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", "dev": true }, "union-value": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/union-value/download/union-value-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { @@ -12267,7 +10848,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/extend-shallow/download/extend-shallow-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { @@ -12276,7 +10857,7 @@ }, "set-value": { "version": "0.4.3", - "resolved": "http://r.cnpmjs.org/set-value/download/set-value-0.4.3.tgz", + "resolved": "http://registry.npm.taobao.org/set-value/download/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { @@ -12289,18 +10870,18 @@ } }, "unique-filename": { - "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/unique-filename/download/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz", + "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", "dev": true, "requires": { - "unique-slug": "2.0.0" + "unique-slug": "2.0.1" } }, "unique-slug": { - "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/unique-slug/download/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.1.tgz", + "integrity": "sha1-Xp7cbRzo+yZNsYpQfvm9hURFHKY=", "dev": true, "requires": { "imurmurhash": "0.1.4" @@ -12308,13 +10889,13 @@ }, "unpipe": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/unpipe/download/unpipe-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, "unset-value": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/unset-value/download/unset-value-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/unset-value/download/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { @@ -12324,7 +10905,7 @@ "dependencies": { "has-value": { "version": "0.3.1", - "resolved": "http://r.cnpmjs.org/has-value/download/has-value-0.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { @@ -12335,7 +10916,7 @@ "dependencies": { "isobject": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/isobject/download/isobject-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/isobject/download/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { @@ -12346,7 +10927,7 @@ }, "has-values": { "version": "0.1.4", - "resolved": "http://r.cnpmjs.org/has-values/download/has-values-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/has-values/download/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true } @@ -12354,12 +10935,12 @@ }, "unzip-response": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/unzip-response/download/unzip-response-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/unzip-response/download/unzip-response-1.0.2.tgz", "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=" }, "upath": { "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/upath/download/upath-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/upath/download/upath-1.1.0.tgz", "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=", "dev": true }, @@ -12374,13 +10955,13 @@ }, "urix": { "version": "0.1.0", - "resolved": "http://r.cnpmjs.org/urix/download/urix-0.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, "url": { "version": "0.11.0", - "resolved": "http://r.cnpmjs.org/url/download/url-0.11.0.tgz", + "resolved": "http://registry.npm.taobao.org/url/download/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, "requires": { @@ -12390,52 +10971,49 @@ "dependencies": { "punycode": { "version": "1.3.2", - "resolved": "http://r.cnpmjs.org/punycode/download/punycode-1.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true } } }, "url-parse": { - "version": "1.4.1", - "resolved": "http://r.cnpmjs.org/url-parse/download/url-parse-1.4.1.tgz", - "integrity": "sha1-TeydrT3IWF+GL+1GHS4Zu/Yj3zA=", + "version": "1.4.4", + "resolved": "http://registry.npm.taobao.org/url-parse/download/url-parse-1.4.4.tgz", + "integrity": "sha1-ysFVbpX6oDA2kf7Fz51aG8NGSPg=", "requires": { - "querystringify": "2.0.0", + "querystringify": "2.1.0", "requires-port": "1.0.0" } }, "url-parse-lax": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/url-parse-lax/download/url-parse-lax-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-1.0.0.tgz", "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "requires": { "prepend-http": "1.0.4" } }, "use": { - "version": "3.1.0", - "resolved": "http://r.cnpmjs.org/use/download/use-3.1.0.tgz", - "integrity": "sha1-FHFr8D/f79AwQK71jYtLhfOnxUQ=", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } + "version": "3.1.1", + "resolved": "http://registry.npm.taobao.org/use/download/use-3.1.1.tgz", + "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=", + "dev": true }, "useragent": { "version": "2.3.0", - "resolved": "http://r.cnpmjs.org/useragent/download/useragent-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/useragent/download/useragent-2.3.0.tgz", "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "tmp": "0.0.31" + "lru-cache": "4.1.5", + "tmp": "0.0.33" } }, "util": { - "version": "0.10.4", - "resolved": "http://r.cnpmjs.org/util/download/util-0.10.4.tgz", - "integrity": "sha1-OqASW/5mikZy3liFfTrOJ+y3aQE=", + "version": "0.11.1", + "resolved": "http://registry.npm.taobao.org/util/download/util-0.11.1.tgz", + "integrity": "sha1-MjZzNyDsZLsn9uJvQhqqLhtYjWE=", "dev": true, "requires": { "inherits": "2.0.3" @@ -12443,27 +11021,27 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/util-deprecate/download/util-deprecate-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", - "resolved": "http://r.cnpmjs.org/utils-merge/download/utils-merge-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "http://r.cnpmjs.org/validate-npm-package-license/download/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha1-gWQ7y+8b3+zUYjeT3EZIlIupgzg=", + "version": "3.0.4", + "resolved": "http://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=", "requires": { - "spdx-correct": "3.0.0", + "spdx-correct": "3.1.0", "spdx-expression-parse": "3.0.0" } }, "validate-npm-package-name": { "version": "2.2.2", - "resolved": "http://r.cnpmjs.org/validate-npm-package-name/download/validate-npm-package-name-2.2.2.tgz", + "resolved": "http://registry.npm.taobao.org/validate-npm-package-name/download/validate-npm-package-name-2.2.2.tgz", "integrity": "sha1-9laVsi9zJEQgGaPH+jmm5/0pkIU=", "requires": { "builtins": "0.0.7" @@ -12471,13 +11049,13 @@ }, "vary": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/vary/download/vary-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, "verror": { "version": "1.10.0", - "resolved": "http://r.cnpmjs.org/verror/download/verror-1.10.0.tgz", + "resolved": "http://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { @@ -12488,7 +11066,7 @@ }, "vm-browserify": { "version": "0.0.4", - "resolved": "http://r.cnpmjs.org/vm-browserify/download/vm-browserify-0.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/vm-browserify/download/vm-browserify-0.0.4.tgz", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "dev": true, "requires": { @@ -12497,46 +11075,33 @@ }, "void-elements": { "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/void-elements/download/void-elements-2.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/void-elements/download/void-elements-2.0.1.tgz", "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", "dev": true }, "watchpack": { "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/watchpack/download/watchpack-1.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz", "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=", "dev": true, "requires": { "chokidar": "2.0.4", - "graceful-fs": "4.1.11", - "neo-async": "2.5.1" + "graceful-fs": "4.1.15", + "neo-async": "2.6.0" } }, "wbuf": { "version": "1.7.3", - "resolved": "http://r.cnpmjs.org/wbuf/download/wbuf-1.7.3.tgz", + "resolved": "http://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz", "integrity": "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=", "dev": true, "requires": { "minimalistic-assert": "1.0.1" } }, - "webassemblyjs": { - "version": "1.4.3", - "resolved": "http://registry.npm.taobao.org/webassemblyjs/download/webassemblyjs-1.4.3.tgz", - "integrity": "sha1-BZGJPvuPvedEmCUcvkstg9+SOcs=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/validation": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" - } - }, "webdriver-js-extender": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/webdriver-js-extender/download/webdriver-js-extender-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/webdriver-js-extender/download/webdriver-js-extender-1.0.0.tgz", "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=", "dev": true, "requires": { @@ -12546,18 +11111,18 @@ "dependencies": { "sax": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/sax/download/sax-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/sax/download/sax-0.6.1.tgz", "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", "dev": true }, "selenium-webdriver": { "version": "2.53.3", - "resolved": "http://r.cnpmjs.org/selenium-webdriver/download/selenium-webdriver-2.53.3.tgz", + "resolved": "http://registry.npm.taobao.org/selenium-webdriver/download/selenium-webdriver-2.53.3.tgz", "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", "dev": true, "requires": { "adm-zip": "0.4.4", - "rimraf": "2.6.2", + "rimraf": "2.6.3", "tmp": "0.0.24", "ws": "1.1.2", "xml2js": "0.4.4" @@ -12565,13 +11130,13 @@ }, "tmp": { "version": "0.0.24", - "resolved": "http://r.cnpmjs.org/tmp/download/tmp-0.0.24.tgz", + "resolved": "http://registry.npm.taobao.org/tmp/download/tmp-0.0.24.tgz", "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=", "dev": true }, "xml2js": { "version": "0.4.4", - "resolved": "http://r.cnpmjs.org/xml2js/download/xml2js-0.4.4.tgz", + "resolved": "http://registry.npm.taobao.org/xml2js/download/xml2js-0.4.4.tgz", "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=", "dev": true, "requires": { @@ -12582,73 +11147,64 @@ } }, "webpack": { - "version": "4.8.3", - "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.8.3.tgz", - "integrity": "sha1-lXyOgAAPnlzAPXdeeLRy2JVPTus=", + "version": "4.29.0", + "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.29.0.tgz", + "integrity": "sha1-8s/vg/euQEuoif9dQ+/Shcom51A=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/wasm-edit": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "acorn": "5.7.1", - "acorn-dynamic-import": "3.0.0", - "ajv": "6.5.2", + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/wasm-edit": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "acorn": "6.0.5", + "acorn-dynamic-import": "4.0.0", + "ajv": "6.6.2", "ajv-keywords": "3.2.0", - "chrome-trace-event": "0.1.3", + "chrome-trace-event": "1.0.0", "enhanced-resolve": "4.1.0", - "eslint-scope": "3.7.1", - "loader-runner": "2.3.0", + "eslint-scope": "4.0.0", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.4.0", "loader-utils": "1.1.0", "memory-fs": "0.4.1", "micromatch": "3.1.10", "mkdirp": "0.5.1", - "neo-async": "2.5.1", - "node-libs-browser": "2.1.0", - "schema-utils": "0.4.5", - "tapable": "1.0.0", - "uglifyjs-webpack-plugin": "1.2.7", + "neo-async": "2.6.0", + "node-libs-browser": "2.2.0", + "schema-utils": "0.4.7", + "tapable": "1.1.1", + "terser-webpack-plugin": "1.2.1", "watchpack": "1.6.0", - "webpack-sources": "1.1.0" + "webpack-sources": "1.3.0" }, "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "http://r.cnpmjs.org/ajv/download/ajv-6.5.2.tgz", - "integrity": "sha1-Z4SV+bgvfMpr4kjdkvWb/14fQ2A=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://r.cnpmjs.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "acorn": { + "version": "6.0.5", + "resolved": "http://registry.npm.taobao.org/acorn/download/acorn-6.0.5.tgz", + "integrity": "sha1-gXMMCBXz87NNjvqVy3Qwll9NiHo=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://r.cnpmjs.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "acorn-dynamic-import": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg=", "dev": true }, - "uri-js": { - "version": "4.2.2", - "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "schema-utils": { + "version": "0.4.7", + "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz", + "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", "dev": true, "requires": { - "punycode": "2.1.1" + "ajv": "6.6.2", + "ajv-keywords": "3.2.0" } } } }, "webpack-core": { "version": "0.6.9", - "resolved": "http://r.cnpmjs.org/webpack-core/download/webpack-core-0.6.9.tgz", + "resolved": "http://registry.npm.taobao.org/webpack-core/download/webpack-core-0.6.9.tgz", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, "requires": { @@ -12658,13 +11214,13 @@ "dependencies": { "source-list-map": { "version": "0.1.8", - "resolved": "http://r.cnpmjs.org/source-list-map/download/source-list-map-0.1.8.tgz", + "resolved": "http://registry.npm.taobao.org/source-list-map/download/source-list-map-0.1.8.tgz", "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", "dev": true }, "source-map": { "version": "0.4.4", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.4.4.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -12714,7 +11270,7 @@ "ip": "1.1.5", "killable": "1.0.1", "loglevel": "1.6.1", - "opn": "5.3.0", + "opn": "5.4.0", "portfinder": "1.0.17", "schema-utils": "1.0.0", "selfsigned": "1.10.4", @@ -12724,25 +11280,13 @@ "sockjs-client": "1.3.0", "spdy": "4.0.0", "strip-ansi": "3.0.1", - "supports-color": "5.4.0", + "supports-color": "5.5.0", "url": "0.11.0", "webpack-dev-middleware": "3.4.0", "webpack-log": "2.0.0", "yargs": "12.0.2" }, "dependencies": { - "ajv": { - "version": "6.7.0", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz", - "integrity": "sha1-4857s3LWV3uxg58d/fy/WtKUjZY=", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, "ansi-regex": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", @@ -12808,15 +11352,6 @@ "xregexp": "4.0.0" } }, - "eventsource": { - "version": "1.0.7", - "resolved": "http://registry.npm.taobao.org/eventsource/download/eventsource-1.0.7.tgz", - "integrity": "sha1-j7xyyT/NNAiAkLwKTmT0tc7m2NA=", - "dev": true, - "requires": { - "original": "1.0.1" - } - }, "execa": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/execa/download/execa-1.0.0.tgz", @@ -12832,12 +11367,6 @@ "strip-eof": "1.0.0" } }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, "find-up": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz", @@ -12868,12 +11397,6 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, "lcid": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz", @@ -12944,37 +11467,12 @@ "once": "1.4.0" } }, - "schema-utils": { - "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", - "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", - "dev": true, - "requires": { - "ajv": "6.7.0", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.2.0" - } - }, "semver": { "version": "5.6.0", "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.6.0.tgz", "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", "dev": true }, - "sockjs-client": { - "version": "1.3.0", - "resolved": "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.3.0.tgz", - "integrity": "sha1-EvydbLZj2lc509xftuhofalcsXc=", - "dev": true, - "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.4" - } - }, "string-width": { "version": "2.1.1", "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz", @@ -12996,14 +11494,13 @@ } } }, - "url-parse": { - "version": "1.4.4", - "resolved": "http://registry.npm.taobao.org/url-parse/download/url-parse-1.4.4.tgz", - "integrity": "sha1-ysFVbpX6oDA2kf7Fz51aG8NGSPg=", + "supports-color": { + "version": "5.5.0", + "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "querystringify": "2.0.0", - "requires-port": "1.0.0" + "has-flag": "3.0.0" } }, "which-module": { @@ -13067,22 +11564,22 @@ "integrity": "sha1-D9446r8tX9hSUcJKWoxI+KP063s=", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "4.17.11" } }, "webpack-sources": { - "version": "1.1.0", - "resolved": "http://r.cnpmjs.org/webpack-sources/download/webpack-sources-1.1.0.tgz", - "integrity": "sha1-oQHrrlnWUHNU1x2AE5UKOot6WlQ=", + "version": "1.3.0", + "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz", + "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", "dev": true, "requires": { - "source-list-map": "2.0.0", + "source-list-map": "2.0.1", "source-map": "0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz", + "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "dev": true } @@ -13099,16 +11596,16 @@ }, "websocket-driver": { "version": "0.7.0", - "resolved": "http://r.cnpmjs.org/websocket-driver/download/websocket-driver-0.7.0.tgz", + "resolved": "http://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.0.tgz", "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "requires": { - "http-parser-js": "0.4.13", + "http-parser-js": "0.5.0", "websocket-extensions": "0.1.3" } }, "websocket-extensions": { "version": "0.1.3", - "resolved": "http://r.cnpmjs.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz", "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=" }, "whatwg-fetch": { @@ -13124,7 +11621,7 @@ }, "which": { "version": "1.3.1", - "resolved": "http://r.cnpmjs.org/which/download/which-1.3.1.tgz", + "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz", "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { @@ -13133,27 +11630,20 @@ }, "which-module": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/which-module/download/which-module-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "http://r.cnpmjs.org/wide-align/download/wide-align-1.1.3.tgz", + "resolved": "http://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz", "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", "dev": true, "requires": { "string-width": "1.0.2" } }, - "window-size": { - "version": "0.1.0", - "resolved": "http://r.cnpmjs.org/window-size/download/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - }, "wordwrap": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz", @@ -13162,7 +11652,7 @@ }, "worker-farm": { "version": "1.6.0", - "resolved": "http://r.cnpmjs.org/worker-farm/download/worker-farm-1.6.0.tgz", + "resolved": "http://registry.npm.taobao.org/worker-farm/download/worker-farm-1.6.0.tgz", "integrity": "sha1-rsxAWXb6talVJhgIRvDboojzpKA=", "dev": true, "requires": { @@ -13171,7 +11661,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://r.cnpmjs.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { @@ -13181,12 +11671,12 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "http://r.cnpmjs.org/wrappy/download/wrappy-1.0.2.tgz", + "resolved": "http://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { "version": "1.1.2", - "resolved": "http://r.cnpmjs.org/ws/download/ws-1.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/ws/download/ws-1.1.2.tgz", "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", "dev": true, "requires": { @@ -13196,13 +11686,13 @@ }, "wtf-8": { "version": "1.0.0", - "resolved": "http://r.cnpmjs.org/wtf-8/download/wtf-8-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/wtf-8/download/wtf-8-1.0.0.tgz", "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", "dev": true }, "xml2js": { "version": "0.4.19", - "resolved": "http://r.cnpmjs.org/xml2js/download/xml2js-0.4.19.tgz", + "resolved": "http://registry.npm.taobao.org/xml2js/download/xml2js-0.4.19.tgz", "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "dev": true, "requires": { @@ -13212,7 +11702,7 @@ "dependencies": { "sax": { "version": "1.2.4", - "resolved": "http://r.cnpmjs.org/sax/download/sax-1.2.4.tgz", + "resolved": "http://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz", "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", "dev": true } @@ -13220,13 +11710,13 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://r.cnpmjs.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz", + "resolved": "http://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true }, "xmlhttprequest-ssl": { "version": "1.5.3", - "resolved": "http://r.cnpmjs.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.3.tgz", + "resolved": "http://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.3.tgz", "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", "dev": true }, @@ -13238,42 +11728,67 @@ }, "xtend": { "version": "4.0.1", - "resolved": "http://r.cnpmjs.org/xtend/download/xtend-4.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "xterm": { - "version": "3.4.1", - "resolved": "http://r.cnpmjs.org/xterm/download/xterm-3.4.1.tgz", - "integrity": "sha1-EkUpeeotszcfgZWDLXQHq7qYiYA=" + "version": "3.10.1", + "resolved": "http://registry.npm.taobao.org/xterm/download/xterm-3.10.1.tgz", + "integrity": "sha1-FKzPkncuWmco8xejwgm6cUtzyLU=" }, "y18n": { "version": "4.0.0", - "resolved": "http://r.cnpmjs.org/y18n/download/y18n-4.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz", "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=", "dev": true }, "yallist": { "version": "2.1.2", - "resolved": "http://r.cnpmjs.org/yallist/download/yallist-2.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { - "version": "3.10.0", - "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "version": "7.1.0", + "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", + "camelcase": "3.0.0", + "cliui": "3.2.0", "decamelize": "1.2.0", - "window-size": "0.1.0" + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true, + "optional": true + }, + "y18n": { + "version": "3.2.1", + "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true, + "optional": true + } } }, "yargs-parser": { "version": "5.0.0", - "resolved": "http://r.cnpmjs.org/yargs-parser/download/yargs-parser-5.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz", "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "optional": true, @@ -13283,7 +11798,7 @@ "dependencies": { "camelcase": { "version": "3.0.0", - "resolved": "http://r.cnpmjs.org/camelcase/download/camelcase-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true, "optional": true @@ -13292,13 +11807,13 @@ }, "yeast": { "version": "0.1.2", - "resolved": "http://r.cnpmjs.org/yeast/download/yeast-0.1.2.tgz", + "resolved": "http://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true }, "yn": { "version": "2.0.0", - "resolved": "http://r.cnpmjs.org/yn/download/yn-2.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/yn/download/yn-2.0.0.tgz", "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=", "dev": true }, @@ -13309,7 +11824,7 @@ }, "zrender": { "version": "4.0.4", - "resolved": "http://r.cnpmjs.org/zrender/download/zrender-4.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/zrender/download/zrender-4.0.4.tgz", "integrity": "sha1-kQ5g2IjwDJWZBz8jdY3SM0X+SP0=" } } diff --git a/src/frontend/package.json b/src/frontend/package.json index b0c3ac31c..6b47f8476 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -82,6 +82,6 @@ "ts-node": "~5.0.1", "tslint": "^5.9.1", "typescript": "~3.2.4", - "webpack": "4.8.3" + "webpack": "^4.29.0" } } diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html index 83d014f7f..90b387028 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html @@ -103,17 +103,28 @@

{{title}}[{{cluster?.name}}]

- + + + + + + + + + + + + + +
diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts index f08bb6d9f..b40807485 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/list-persistentvolume/list-persistentvolume.component.ts @@ -25,7 +25,7 @@ export class ListPersistentVolumeComponent implements OnInit, OnDestroy { @Input() persistentVolumes: PersistentVolume[]; @Input() cluster: string; @Input() showState: object; - sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.Unsorted; + sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; sorted = false; currentPage = 1; _pageSize = 10; diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html index 055ff8e70..90fef179f 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html @@ -34,20 +34,32 @@

{{'PVC.CREATE_TMP' | translate}}

- ReadWriteOnce ReadOnlyMany ReadWriteMany - + --> + + + + + + + + + + + +
Date: Fri, 25 Jan 2019 16:01:33 +0800 Subject: [PATCH 031/112] frontend: fix combineLaest import --- .../create-edit-persistentvolume.component.ts | 4 ++-- .../create-edit-autoscaletpl.component.ts | 4 ++-- .../src/app/portal/configmap/configmap.component.ts | 6 +++--- .../create-edit-configmaptpl.component.ts | 4 ++-- .../create-edit-cronjobtpl.component.ts | 4 ++-- src/frontend/src/app/portal/cronjob/cronjob.component.ts | 8 ++++---- .../create-edit-daemonsettpl.component.ts | 4 ++-- .../src/app/portal/daemonset/daemonset.component.ts | 6 +++--- .../create-edit-deploymenttpl.component.ts | 4 ++-- .../src/app/portal/deployment/deployment.component.ts | 6 +++--- .../create-edit-ingresstpl.component.ts | 4 ++-- .../create-edit-persistentvolumeclaimtpl.component.ts | 4 ++-- .../list-persistentvolumeclaim.component.ts | 4 ++-- .../persistentvolumeclaim.component.ts | 6 +++--- .../create-edit-secrettpl.component.ts | 4 ++-- src/frontend/src/app/portal/secret/secret.component.ts | 6 +++--- .../create-edit-statefulsettpl.component.ts | 4 ++-- .../src/app/portal/statefulset/statefulset.component.ts | 6 +++--- src/frontend/src/app/shared/base/resource/resource.ts | 8 ++++---- .../src/app/shared/interceptor/auth-interceptor.ts | 3 ++- 20 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts index 131950193..d04ea7d64 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.ts @@ -9,7 +9,7 @@ import { CephFSVolumeSource, PersistentVolume, RBDVolumeSource } from '../../../ import { PersistentVolumeClient } from '../../../../shared/client/v1/kubernetes/persistentvolume'; import { ActivatedRoute, Router } from '@angular/router'; import { ClusterService } from '../../../../shared/client/v1/cluster.service'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { Cluster } from '../../../../shared/model/v1/cluster'; import { AceEditorMsg } from '../../../../shared/ace-editor/ace-editor'; import { AceEditorService } from '../../../../shared/ace-editor/ace-editor.service'; @@ -94,7 +94,7 @@ export class CreateEditPersistentVolumeComponent implements OnInit { this.actionType = ActionType.ADD_NEW; this.title = '创建PV'; } - Observable.combineLatest( + combineLatest( observables ).subscribe( response => { diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts index cd46337bf..1c66974b7 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts @@ -7,7 +7,7 @@ import { AuthService } from '../../../shared/auth/auth.service'; import { defaultAutoscale } from '../../../shared/default-models/autoscale.const'; import { Location } from '@angular/common'; import { ActionType } from '../../../shared/shared.const'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AutoscaleTplService } from '../../../shared/client/v1/autoscaletpl.service'; @@ -67,7 +67,7 @@ export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplate } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.resource = response[1].data; diff --git a/src/frontend/src/app/portal/configmap/configmap.component.ts b/src/frontend/src/app/portal/configmap/configmap.component.ts index e69590839..64b3b4f9d 100644 --- a/src/frontend/src/app/portal/configmap/configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/configmap.component.ts @@ -13,7 +13,7 @@ import { import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ListConfigMapComponent } from './list-configmap/list-configmap.component'; import { CreateEditConfigMapComponent } from './create-edit-configmap/create-edit-configmap.component'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { ConfigMapClient } from '../../shared/client/v1/kubernetes/configmap'; import { AppService } from '../../shared/client/v1/app.service'; import { ConfigMapService } from '../../shared/client/v1/configmap.service'; @@ -238,7 +238,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { const appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.configMapId = parseInt(this.route.snapshot.params['configMapId'], 10); - Observable.combineLatest( + combineLatest( this.configMapService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', appId + ''), this.appService.getById(appId, namespaceId) ).subscribe( @@ -311,7 +311,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.configMapTplService.listPage(this.pageState, this.app.id, this.configMapId.toString()), this.publishService.listStatus(PublishType.CONFIGMAP, this.configMapId) ).subscribe( diff --git a/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts b/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts index 7de0a8039..938908f4e 100644 --- a/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts +++ b/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts @@ -6,7 +6,7 @@ import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { DOCUMENT, EventManager } from '@angular/platform-browser'; import { ConfigMapTpl } from '../../../shared/model/v1/configmaptpl'; import { App } from '../../../shared/model/v1/app'; @@ -160,7 +160,7 @@ export class CreateEditConfigMapTplComponent implements OnInit, AfterViewInit, O this.actionType = ActionType.ADD_NEW; } this.createForm(); - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { const clusters = response[0].data; for (let i = 0; i < clusters.length; i++) { diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts index f8a474230..a09a52f3a 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts @@ -32,7 +32,7 @@ import { AuthService } from '../../../shared/auth/auth.service'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; import { defaultCronJob } from '../../../shared/default-models/cronjob.const'; -import { Observable } from 'rxjs'; +import { combineLatest } from 'rxjs'; import * as cron from 'cron-parser'; import { ObjectMeta } from '../../../shared/model/v1/kubernetes/deployment'; @@ -245,7 +245,7 @@ export class CreateEditCronjobTplComponent implements OnInit, AfterViewInit, OnD } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.cronjob = response[1].data; diff --git a/src/frontend/src/app/portal/cronjob/cronjob.component.ts b/src/frontend/src/app/portal/cronjob/cronjob.component.ts index 6db3beb8f..d635578f4 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ListCronjobComponent } from './list-cronjob/list-cronjob.component'; import { ListJobComponent } from './list-job/list-job.component'; import { CreateEditCronjobComponent } from './create-edit-cronjob/create-edit-cronjob.component'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { ClrDatagridStateInterface } from '@clr/angular'; import { CronjobClient } from '../../shared/client/v1/kubernetes/cronjob'; import { CronjobStatus, CronjobTpl } from '../../shared/model/v1/cronjobtpl'; @@ -277,7 +277,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.cronjobId = parseInt(this.route.snapshot.params['cronjobId'], 10); - Observable.combineLatest( + combineLatest( this.clusterService.getNames(), this.cronjobService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId), @@ -412,7 +412,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.cronjobTplService.listPage(this.pageState, this.appId, this.cronjobId.toString()), this.publishService.listStatus(PublishType.CRONJOB, this.cronjobId), this.cronjobService.getById(this.cronjobId, this.appId), @@ -443,7 +443,7 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { totalCount: this.jobPageState.page.totalCount }); } - Observable.combineLatest( + combineLatest( this.jobClient.listAllClusterByCronjobName(this.appId, this.cacheService.kubeNamespace, this.cronjobName) ).subscribe( response => { diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts index ec1ec0aca..1990be475 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts @@ -29,7 +29,7 @@ import { App } from '../../../shared/model/v1/app'; import { AppService } from '../../../shared/client/v1/app.service'; import { ActionType, appLabelKey, defaultResources, namespaceLabelKey } from '../../../shared/shared.const'; import { CacheService } from '../../../shared/auth/cache.service'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { AuthService } from '../../../shared/auth/auth.service'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; @@ -227,7 +227,7 @@ export class CreateEditDaemonSetTplComponent implements OnInit, AfterViewInit, O } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.daemonSet = response[1].data; diff --git a/src/frontend/src/app/portal/daemonset/daemonset.component.ts b/src/frontend/src/app/portal/daemonset/daemonset.component.ts index b2533fbac..4028fd3e9 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.component.ts @@ -1,7 +1,7 @@ import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ClrDatagridStateInterface } from '@clr/angular'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { Subscription } from 'rxjs/Subscription'; import { AuthService } from '../../shared/auth/auth.service'; import { CacheService } from '../../shared/auth/cache.service'; @@ -266,7 +266,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.daemonSetId = parseInt(this.route.snapshot.params['daemonSetId'], 10); - Observable.combineLatest( + combineLatest( this.clusterService.getNames(), this.daemonSetService.listPage(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), this.appId, 'false'), this.appService.getById(this.appId, namespaceId) @@ -390,7 +390,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { this.pageState.params['deleted'] = false; this.pageState.params['daemonSetId'] = this.daemonSetId; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.daemonSetTplService.listPage(this.pageState, this.appId), this.publishService.listStatus(PublishType.DAEMONSET, this.daemonSetId) ).subscribe( diff --git a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts index c11a54e93..75e6d3c90 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts +++ b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts @@ -28,7 +28,7 @@ import { } from '../../../shared/model/v1/kubernetes/deployment'; import 'rxjs/add/observable/combineLatest'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { DeploymentTpl } from '../../../shared/model/v1/deploymenttpl'; import { App } from '../../../shared/model/v1/app'; import { Deployment } from '../../../shared/model/v1/deployment'; @@ -256,7 +256,7 @@ export class CreateEditDeploymentTplComponent implements OnInit, AfterViewInit, } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.deployment = response[1].data; diff --git a/src/frontend/src/app/portal/deployment/deployment.component.ts b/src/frontend/src/app/portal/deployment/deployment.component.ts index d8033e5af..d0619121d 100644 --- a/src/frontend/src/app/portal/deployment/deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/deployment.component.ts @@ -3,7 +3,6 @@ import { MessageHandlerService } from '../../shared/message-handler/message-hand import { ActivatedRoute, Router } from '@angular/router'; import { ListDeploymentComponent } from './list-deployment/list-deployment.component'; import { CreateEditDeploymentComponent } from './create-edit-deployment/create-edit-deployment.component'; -import { Observable } from 'rxjs/Observable'; import { ClrDatagridStateInterface } from '@clr/angular'; import { DeploymentClient } from '../../shared/client/v1/kubernetes/deployment'; import { DeploymentStatus, DeploymentTpl } from '../../shared/model/v1/deploymenttpl'; @@ -31,6 +30,7 @@ import { PublishStatus } from '../../shared/model/v1/publish-status'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; +import { combineLatest } from 'rxjs'; import { PageState } from '../../shared/page/page-state'; import { TabDragService } from '../../shared/client/v1/tab-drag.service'; import { OrderItem } from '../../shared/model/v1/order'; @@ -253,7 +253,7 @@ export class DeploymentComponent implements OnInit, OnDestroy, AfterContentInit this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.deploymentId = parseInt(this.route.snapshot.params['deploymentId'], 10); - Observable.combineLatest( + combineLatest( this.clusterService.getNames(), this.deploymentService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId) @@ -405,7 +405,7 @@ export class DeploymentComponent implements OnInit, OnDestroy, AfterContentInit } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.deploymentTplService.listPage(this.pageState, this.appId, this.deploymentId.toString()), this.publishService.listStatus(PublishType.DEPLOYMENT, this.deploymentId) ).subscribe( diff --git a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts index d069488ef..5e99781a0 100644 --- a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts +++ b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts @@ -5,7 +5,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ActionType } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { AppService } from '../../../shared/client/v1/app.service'; import { CacheService } from '../../../shared/auth/cache.service'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; @@ -72,7 +72,7 @@ export class CreateEditIngressTplComponent extends CreateEditResourceTemplate im } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.resource = response[1].data; diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts index 8d43df02c..b057adad2 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts @@ -6,7 +6,7 @@ import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { DOCUMENT, EventManager } from '@angular/platform-browser'; import { App } from '../../../shared/model/v1/app'; import { AppService } from '../../../shared/client/v1/app.service'; @@ -164,7 +164,7 @@ export class CreateEditPersistentVolumeClaimTplComponent implements OnInit, Afte this.actionType = ActionType.ADD_NEW; } this.createForm(); - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { const clusters = response[0].data; for (let i = 0; i < clusters.length; i++) { diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index 76650819a..454ee0cb5 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -25,7 +25,7 @@ import { PublishStatus } from '../../../shared/model/v1/publish-status'; import { ActivatedRoute, Router } from '@angular/router'; import { PersistentVolumeClaimService } from '../../../shared/client/v1/persistentvolumeclaim.service'; import { AppService } from '../../../shared/client/v1/app.service'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { PageState } from '../../../shared/page/page-state'; import { PublishService } from '../../../shared/client/v1/publish.service'; import { isArrayEmpty, isArrayNotEmpty } from '../../../shared/utils'; @@ -373,7 +373,7 @@ export class ListPersistentVolumeClaimComponent implements OnInit, OnDestroy { this.pageState.params['isOnline'] = this.isOnline; this.pageState.sort.by = 'id'; this.pageState.sort.reverse = true; - Observable.combineLatest( + combineLatest( this.pvcTplService.listPage(this.pageState, this.appId), this.publishService.listStatus(PublishType.PERSISTENT_VOLUME_CLAIM, this.pvcId) ).subscribe( diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts index 8882909eb..37435de06 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/persistentvolumeclaim.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co import { ActivatedRoute, Router } from '@angular/router'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, PublishType } from '../../shared/shared.const'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { AppService } from '../../shared/client/v1/app.service'; import { App } from '../../shared/model/v1/app'; import { CacheService } from '../../shared/auth/cache.service'; @@ -94,7 +94,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { const namespaceId = this.cacheService.namespaceId; let pvcId = parseInt(this.route.snapshot.params['pvcId'], 10); - Observable.combineLatest( + combineLatest( this.pvcService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId), ).subscribe( @@ -171,7 +171,7 @@ export class PersistentVolumeClaimComponent implements OnInit, OnDestroy { } updatePvcs(): void { - Observable.combineLatest( + combineLatest( this.pvcService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), ).subscribe( response => { diff --git a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts index 576039432..fa2e0d1ee 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts +++ b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts @@ -6,7 +6,7 @@ import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { DOCUMENT, EventManager } from '@angular/platform-browser'; import { SecretTpl } from '../../../shared/model/v1/secrettpl'; import { App } from '../../../shared/model/v1/app'; @@ -161,7 +161,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe this.actionType = ActionType.ADD_NEW; } this.createForm(); - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { const clusters = response[0].data; for (let i = 0; i < clusters.length; i++) { diff --git a/src/frontend/src/app/portal/secret/secret.component.ts b/src/frontend/src/app/portal/secret/secret.component.ts index 6ce792ab6..5ceea1278 100644 --- a/src/frontend/src/app/portal/secret/secret.component.ts +++ b/src/frontend/src/app/portal/secret/secret.component.ts @@ -13,7 +13,7 @@ import { import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ListSecretComponent } from './list-secret/list-secret.component'; import { CreateEditSecretComponent } from './create-edit-secret/create-edit-secret.component'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { SecretClient } from '../../shared/client/v1/kubernetes/secret'; import { AppService } from '../../shared/client/v1/app.service'; import { SecretService } from '../../shared/client/v1/secret.service'; @@ -239,7 +239,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); this.secretId = parseInt(this.route.snapshot.params['secretId'], 10); const namespaceId = this.cacheService.namespaceId; - Observable.combineLatest( + combineLatest( this.secretService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId) ).subscribe( @@ -311,7 +311,7 @@ export class SecretComponent implements AfterContentInit, OnDestroy, OnInit { } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.secretTplService.listPage(this.pageState, this.app.id, this.secretId.toString()), this.publishService.listStatus(PublishType.SECRET, this.secretId) ).subscribe( diff --git a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts index addccb02b..a6b7a95e8 100644 --- a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts +++ b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts @@ -34,7 +34,7 @@ import { Statefulset } from '../../../shared/model/v1/statefulset'; import { StatefulsetTplService } from '../../../shared/client/v1/statefulsettpl.service'; import { StatefulsetTemplate } from '../../../shared/model/v1/statefulsettpl'; import { defaultStatefulset } from '../../../shared/default-models/statefulset.const'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { AuthService } from '../../../shared/auth/auth.service'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; @@ -225,7 +225,7 @@ export class CreateEditStatefulsettplComponent implements OnInit, AfterViewInit, } else { this.actionType = ActionType.ADD_NEW; } - Observable.combineLatest(observables).subscribe( + combineLatest(observables).subscribe( response => { this.app = response[0].data; this.statefulset = response[1].data; diff --git a/src/frontend/src/app/portal/statefulset/statefulset.component.ts b/src/frontend/src/app/portal/statefulset/statefulset.component.ts index 586e4ade6..c443bea17 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/statefulset.component.ts @@ -1,7 +1,7 @@ import { AfterContentInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { ClrDatagridStateInterface } from '@clr/angular'; import { App } from '../../shared/model/v1/app'; import { Cluster } from '../../shared/model/v1/cluster'; @@ -274,7 +274,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.statefulsetId = parseInt(this.route.snapshot.params['statefulsetId'], 10); - Observable.combineLatest( + combineLatest( this.clusterService.getNames(), this.statefulsetService.listPage(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), this.appId, 'false'), this.appService.getById(this.appId, namespaceId) @@ -397,7 +397,7 @@ export class StatefulsetComponent implements AfterContentInit, OnDestroy, OnInit this.pageState.params['deleted'] = false; this.pageState.params['statefulsetId'] = this.statefulsetId; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.statefulsetTplService.listPage(this.pageState, this.appId), this.publishService.listStatus(PublishType.STATEFULSET, this.statefulsetId) ).subscribe( diff --git a/src/frontend/src/app/shared/base/resource/resource.ts b/src/frontend/src/app/shared/base/resource/resource.ts index f3247f9a6..5ceda95b1 100644 --- a/src/frontend/src/app/shared/base/resource/resource.ts +++ b/src/frontend/src/app/shared/base/resource/resource.ts @@ -24,7 +24,7 @@ import { PublishType, TemplateState } from '../../shared.const'; -import { Observable } from 'rxjs/Observable'; +import { combineLatest } from 'rxjs'; import { ClrDatagridStateInterface } from '@clr/angular'; import { CreateEditResource } from './create-edit-resource'; import { ListResource } from './list-resource'; @@ -190,7 +190,7 @@ export class Resource { } this.pageState.params['deleted'] = false; this.pageState.params['isOnline'] = this.isOnline; - Observable.combineLatest( + combineLatest( this.templateService.listPage(this.pageState, this.appId, this.resourceId.toString()), this.publishService.listStatus(this.publishType, this.resourceId) ).subscribe( @@ -275,7 +275,7 @@ export class Resource { this.appId = parseInt(this.route.parent.snapshot.params['id'], 10); const namespaceId = this.cacheService.namespaceId; this.resourceId = parseInt(this.route.snapshot.params['resourceId'], 10); - Observable.combineLatest( + combineLatest( this.clusterService.getNames(), this.resourceService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), this.appService.getById(this.appId, namespaceId) @@ -383,7 +383,7 @@ export class Resource { if (id) { this.resourceId = id; this.setNavigateURI(); - Observable.combineLatest( + combineLatest( this.resourceService.list(PageState.fromState({sort: {by: 'id', reverse: false}}, {pageSize: 1000}), 'false', this.appId + ''), ).subscribe( response => { diff --git a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts index 679ae1259..b59865f49 100644 --- a/src/frontend/src/app/shared/interceptor/auth-interceptor.ts +++ b/src/frontend/src/app/shared/interceptor/auth-interceptor.ts @@ -1,5 +1,6 @@ import { Observable } from 'rxjs/Observable'; import { Injectable } from '@angular/core'; +import { from } from 'rxjs'; import { HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from '@angular/common/http'; import 'rxjs/add/observable/fromPromise'; import { LoginTokenKey } from '../shared.const'; @@ -10,7 +11,7 @@ export class AuthInterceptor implements HttpInterceptor { } intercept(request: HttpRequest, next: HttpHandler): Observable> { - return Observable.fromPromise(this.handleAccess(request, next)); + return from(this.handleAccess(request, next)); } private async handleAccess(request: HttpRequest, next: HttpHandler): From 409680f808b6b41fad1ffa8fc40aa3175a89e81a Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 16:59:59 +0800 Subject: [PATCH 032/112] frontend:Add backend resource basic class --- .../create-edit-resource-template.ts | 143 +++++++++++++++++ .../admin-resource/create-edit-resource.ts | 145 ++++++++++++++++++ .../admin-resource/list-resource-template.ts | 44 ++++++ .../base/admin-resource/list-resource.ts | 71 +++++++++ .../base/admin-resource/resource-template.ts | 114 ++++++++++++++ .../shared/base/admin-resource/resource.ts | 110 +++++++++++++ .../admin-resource/trash-resource-template.ts | 108 +++++++++++++ .../base/admin-resource/trash-resource.ts | 106 +++++++++++++ 8 files changed, 841 insertions(+) create mode 100644 src/frontend/src/app/shared/base/admin-resource/create-edit-resource-template.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/list-resource.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/resource-template.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/resource.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts create mode 100644 src/frontend/src/app/shared/base/admin-resource/trash-resource.ts diff --git a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource-template.ts new file mode 100644 index 000000000..8157dfb00 --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource-template.ts @@ -0,0 +1,143 @@ +import { EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; + +import 'rxjs/add/operator/debounceTime'; +import 'rxjs/add/operator/distinctUntilChanged'; +import { NgForm } from '@angular/forms'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { ActionType } from '../../shared.const'; +import { AceEditorBoxComponent } from '../../ace-editor/ace-editor-box/ace-editor-box.component'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; + +export class CreateEditResourceTemplateComponent implements OnInit { + @Output() create = new EventEmitter(); + modalOpened: boolean; + + ngForm: NgForm; + @ViewChild('ngForm') + currentForm: NgForm; + + // template: any = new IngressTpl(); + checkOnGoing = false; + isSubmitOnGoing = false; + + title: string; + actionType: ActionType; + + resources: any[]; + + @ViewChild(AceEditorBoxComponent) aceBox: any; + constructor(public resourceTemplateService: any, + public resourceService: any, + public messageHandlerService: MessageHandlerService, + public aceEditorService: AceEditorService, + public template: any, + public componentName: string, + public defaultResourceTemplate: string) { + } + + ngOnInit(): void { + this.resourceService.getNames().subscribe( + response => { + this.resources = response.data; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + initJsonEditor(): void { + let json = {}; + if (this.template && this.template.template) { + json = JSON.parse(this.template.template); + } + this.aceEditorService.announceMessage(AceEditorMsg.Instance(json)); + } + + newOrEditResourceTemplate(id?: number) { + this.modalOpened = true; + if (id) { + this.actionType = ActionType.EDIT; + this.title = `编辑 ${this.componentName}`; + this.resourceTemplateService.getById(id, 0).subscribe( + status => { + this.template = status.data; + this.initJsonEditor(); + }, + error => { + this.messageHandlerService.handleError(error); + + }); + } else { + this.actionType = ActionType.ADD_NEW; + this.title = `编辑 ${this.componentName}`; + this.template = {}; + this.initJsonEditor(); + } + } + + onCancel() { + this.modalOpened = false; + this.currentForm.reset(); + } + + onSubmit() { + if (this.isSubmitOnGoing) { + return; + } + this.isSubmitOnGoing = true; + if (!this.aceBox.isValid) { + alert('语法有误，请检查！'); + this.isSubmitOnGoing = false; + return; + } + this.template.template = this.aceBox.getValue(); + for (const resource of this.resources) { + if (resource.id === this.template.ingressId) { + this.template.name = resource.name; + } + } + switch (this.actionType) { + case ActionType.ADD_NEW: + this.resourceTemplateService.create(this.template, 0).subscribe( + status => { + this.isSubmitOnGoing = false; + this.create.emit(true); + this.modalOpened = false; + this.messageHandlerService.showSuccess(`创建 ${this.componentName}成功！`); + }, + error => { + this.isSubmitOnGoing = false; + this.modalOpened = false; + this.messageHandlerService.handleError(error); + + } + ); + break; + case ActionType.EDIT: + this.resourceTemplateService.update(this.template, 0).subscribe( + status => { + this.isSubmitOnGoing = false; + this.create.emit(true); + this.modalOpened = false; + this.messageHandlerService.showSuccess(`更新 ${this.componentName}成功！`); + }, + error => { + this.isSubmitOnGoing = false; + this.modalOpened = false; + this.messageHandlerService.handleError(error); + + } + ); + break; + } + } + + public get isValid(): boolean { + return this.currentForm && + this.currentForm.valid && + !this.isSubmitOnGoing && + !this.checkOnGoing; + } + + +} diff --git a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts new file mode 100644 index 000000000..3a0df5b07 --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts @@ -0,0 +1,145 @@ +import { EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import 'rxjs/add/operator/debounceTime'; +import 'rxjs/add/operator/distinctUntilChanged'; +import { NgForm } from '@angular/forms'; +import { ActionType } from '../../shared.const'; +import { App } from '../../model/v1/app'; +import { AppService } from '../../client/v1/app.service'; +import { AceEditorBoxComponent } from '../../ace-editor/ace-editor-box/ace-editor-box.component'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; + +export class CreateEditResourceComponent implements OnInit { + @Output() create = new EventEmitter(); + modalOpened: boolean; + + ngForm: NgForm; + @ViewChild('ngForm') + currentForm: NgForm; + + @ViewChild(AceEditorBoxComponent) + aceBox: any; + + checkOnGoing = false; + isSubmitOnGoing = false; + isNameValid = true; + + title: string; + actionType: ActionType; + + apps: App[]; + + constructor(public resourceService: any, + public appService: AppService, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService, + public resource: any, + public defaultKubeResource: any, + public resourceType: string) { + } + + ngOnInit(): void { + this.appService + .getNames() + .subscribe( + response => { + this.apps = response.data; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + newOrEditResource(id?: number) { + this.modalOpened = true; + if (id) { + this.actionType = ActionType.EDIT; + this.title = `编辑 {this.resourceType}`; + this.resourceService.getById(id, 0).subscribe( + status => { + this.resource = status.data; + this.resource.metaDataObj = JSON.parse(this.resource.metaData ? this.resource.metaData : '{}'); + this.initJsonEditor(); + }, + error => { + this.messageHandlerService.handleError(error); + + }); + } else { + this.actionType = ActionType.ADD_NEW; + this.title = `创建 {this.resourceType}`; + this.resource = JSON.parse(this.defaultKubeResource); + this.initJsonEditor(); + } + } + + initJsonEditor(): void { + this.aceEditorService.announceMessage(AceEditorMsg.Instance(this.resource.metaDataObj)); + } + + onCancel() { + this.modalOpened = false; + this.currentForm.reset(); + } + + onSubmit() { + if (this.isSubmitOnGoing) { + return; + } + this.isSubmitOnGoing = true; + this.resource.metaData = this.aceBox.getValue(); + switch (this.actionType) { + case ActionType.ADD_NEW: + this.resourceService.create(this.resource).subscribe( + status => { + this.isSubmitOnGoing = false; + this.create.emit(true); + this.modalOpened = false; + this.messageHandlerService.showSuccess(`创建 ${this.resourceType} 成功！`); + }, + error => { + this.isSubmitOnGoing = false; + this.modalOpened = false; + this.messageHandlerService.handleError(error); + + } + ); + break; + case ActionType.EDIT: + this.resourceService.update(this.resource).subscribe( + status => { + this.isSubmitOnGoing = false; + this.create.emit(true); + this.modalOpened = false; + this.messageHandlerService.showSuccess(`更新 ${this.resourceType} 成功！`); + }, + error => { + this.isSubmitOnGoing = false; + this.modalOpened = false; + this.messageHandlerService.handleError(error); + + } + ); + break; + } + } + + public get isValid(): boolean { + return this.currentForm && + this.currentForm.valid && + !this.isSubmitOnGoing && + this.isNameValid && + !this.checkOnGoing; + } + + // Handle the form validation + handleValidation(): void { + const cont = this.currentForm.controls['name']; + if (cont) { + this.isNameValid = cont.valid; + } + + } + +} + diff --git a/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts new file mode 100644 index 000000000..70bf51f08 --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts @@ -0,0 +1,44 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { State } from '@clr/angular'; +import { Page } from '../../page/page-state'; + +export class ListResourceTemplateComponent implements OnInit { + + @Input() templates: any[]; + + @Input() page: Page; + currentPage = 1; + state: State; + + @Output() paginate = new EventEmitter(); + @Output() delete = new EventEmitter(); + @Output() edit = new EventEmitter(); + + + constructor(public router: Router) { + } + + ngOnInit(): void { + } + + pageSizeChange(pageSize: number) { + this.state.page.to = pageSize - 1; + this.state.page.size = pageSize; + this.currentPage = 1; + this.paginate.emit(this.state); + } + + refresh(state: State) { + this.state = state; + this.paginate.emit(state); + } + + deleteResourceTemplate(template: any) { + this.delete.emit(template); + } + + editResourceTemplate(template: any) { + this.edit.emit(template); + } +} diff --git a/src/frontend/src/app/shared/base/admin-resource/list-resource.ts b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts new file mode 100644 index 000000000..74c5c0b07 --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts @@ -0,0 +1,71 @@ +import { EventEmitter, Input, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { State } from '@clr/angular'; +import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; +import { Page } from '../../page/page-state'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; + +export class ListResourceComponent { + @Input() resources: any[]; + + @Input() page: Page; + currentPage = 1; + state: State; + + @Output() paginate = new EventEmitter(); + @Output() delete = new EventEmitter(); + @Output() edit = new EventEmitter(); + + constructor( + public breadcrumbService: BreadcrumbService, + public router: Router, + public aceEditorService: AceEditorService, + public resourceType: string, + ) { + + breadcrumbService.hideRoute(`/admin/${this.resourceType}/relate-tpl`); + breadcrumbService.hideRoute(`/admin/${this.resourceType}/app`); + } + + pageSizeChange(pageSize: number) { + this.state.page.to = pageSize - 1; + this.state.page.size = pageSize; + this.currentPage = 1; + this.paginate.emit(this.state); + } + + refresh(state: State) { + this.state = state; + this.paginate.emit(state); + } + + deleteResource(resource: any) { + this.delete.emit(resource); + } + + editResource(resource: any) { + this.edit.emit(resource); + } + + goToLink(resource: any, gate: string) { + let linkUrl = new Array(); + switch (gate) { + case 'tpl': + this.breadcrumbService.addFriendlyNameForRouteRegex(`/admin/${this.resourceType}/relate-tpl/[0-9]*`, '[' + resource.name + ']模板列表'); + linkUrl = ['admin', this.resourceType, 'relate-tpl', resource.id]; + break; + case 'app': + this.breadcrumbService.addFriendlyNameForRouteRegex(`/admin/${this.resourceType}/app/[0-9]*`, '[' + resource.app.name + ']项目详情'); + linkUrl = ['admin', this.resourceType, 'app', resource.app.id]; + break; + default: + break; + } + this.router.navigate(linkUrl); + } + + viewMetaDataTemplate(tpl: string) { + this.aceEditorService.announceMessage(AceEditorMsg.Instance(tpl, false, '元数据查看')); + } +} diff --git a/src/frontend/src/app/shared/base/admin-resource/resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts new file mode 100644 index 000000000..4569d26c8 --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts @@ -0,0 +1,114 @@ +import { OnInit, OnDestroy, ViewChild } from '@angular/core'; +import { BreadcrumbService } from '../../client/v1/breadcrumb.service'; +import { Router, ActivatedRoute } from '@angular/router'; +import { State } from '@clr/angular'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; +import { Subscription } from 'rxjs/Subscription'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { PageState } from '../../page/page-state'; +import { CreateEditResourceTemplateComponent } from './create-edit-resource-template'; +import { ListResourceTemplateComponent } from './list-resource-template'; + +export class ResourceTemplateComponent implements OnInit, OnDestroy { + // @ViewChild(CreateEditResourceTemplateComponent) + listResourceTemplateComponent: ListResourceTemplateComponent; + // @ViewChild(CreateEditResourceTemplateComponent) + createEditResourceTemplateComponent: CreateEditResourceTemplateComponent; + + pageState: PageState = new PageState({pageSize: 10}); + templates: any[]; + resourceId: string; + // componentName = 'Ingress 模板'; + + subscription: Subscription; + + constructor( + public breadcrumbService: BreadcrumbService, + public route: ActivatedRoute, + public resourceTemplateService: any, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public componentName: string, + public resourceType: string, + public confirmationTargets: ConfirmationTargets) { + breadcrumbService.addFriendlyNameForRoute(`/admin/${this.resourceType}/tpl`, this.componentName + '列表'); + breadcrumbService.addFriendlyNameForRoute(`/admin/${this.resourceType}/tpl/trash`, '已删除' + this.componentName + '列表'); + this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { + if (message && + message.state === ConfirmationState.CONFIRMED && + message.source === confirmationTargets) { + const id = message.data; + this.resourceTemplateService.deleteById(id, 0) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${this.componentName}删除成功！`); + this.retrieve(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + }); + } + + ngOnInit() { + this.route.params.subscribe(params => { + this.resourceId = params['gid']; + if (typeof(this.resourceId) === 'undefined') { + this.resourceId = ''; + } + }); + } + + ngOnDestroy(): void { + if (this.subscription) { + this.subscription.unsubscribe(); + } + } + + retrieve(state?: State): void { + if (state) { + this.pageState = + PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + } + this.pageState.params['deleted'] = false; + this.resourceTemplateService.listPage(this.pageState, 0, this.resourceId) + .subscribe( + response => { + const data = response.data; + this.pageState.page.totalPage = data.totalPage; + this.pageState.page.totalCount = data.totalCount; + this.templates = data.list; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + createResourceTemplate(created: boolean) { + if (created) { + this.retrieve(); + } + } + + openModal(): void { + this.createEditResourceTemplateComponent.newOrEditResourceTemplate(); + } + + deleteResourceTemplate(template: any) { + const deletionMessage = new ConfirmationMessage( + `删除 ${this.componentName}确认`, + `你确认删除 ${this.componentName}` + template.name + ' ？', + template.id, + this.confirmationTargets, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); + } + + editResourceTemplate(template: any) { + this.createEditResourceTemplateComponent.newOrEditResourceTemplate(template.id); + } +} diff --git a/src/frontend/src/app/shared/base/admin-resource/resource.ts b/src/frontend/src/app/shared/base/admin-resource/resource.ts new file mode 100644 index 000000000..353c59c3a --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/resource.ts @@ -0,0 +1,110 @@ +import { ViewChild, OnInit, OnDestroy } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { State } from '@clr/angular'; +import { Subscription } from 'rxjs/Subscription'; +import { PageState } from '../../page/page-state'; +import { BreadcrumbService } from '../../client/v1/breadcrumb.service'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { ListResourceComponent } from './list-resource'; +import { CreateEditResourceComponent } from './create-edit-resource'; + +export class ResourceComponent implements OnInit, OnDestroy { + // @ViewChild(ListResourceComponent) + listResourceComponent: ListResourceComponent; + // @ViewChild(CreateEditResourceComponent) + createEditResourceComponent: CreateEditResourceComponent; + + pageState: PageState = new PageState(); + resources: any[]; + appId: string; + + subscription: Subscription; + + constructor( + public breadcrumbService: BreadcrumbService, + public route: ActivatedRoute, + public resourceService: any, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public componentName: string, + public confirmationTarget: ConfirmationTargets) { + breadcrumbService.addFriendlyNameForRoute(`/admin/${this.componentName}`, this.componentName + '列表'); + breadcrumbService.addFriendlyNameForRoute(`/admin/${this.componentName}/trash`, '已删除' + this.componentName + '列表'); + this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { + if (message && + message.state === ConfirmationState.CONFIRMED && + message.source === this.confirmationTarget) { + const id = message.data; + this.resourceService.deleteById(id, 0) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${this.componentName} 删除成功！`); + this.retrieve(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + }); + } + + ngOnInit() { + this.route.params.subscribe(params => { + this.appId = params['aid']; + if (typeof(this.appId) === 'undefined') { + this.appId = ''; + } + }); + } + + ngOnDestroy(): void { + if (this.subscription) { + this.subscription.unsubscribe(); + } + } + + retrieve(state?: State): void { + if (state) { + this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + } + this.resourceService.list(this.pageState, 'false', this.appId) + .subscribe( + response => { + const data = response.data; + this.pageState.page.totalPage = data.totalPage; + this.pageState.page.totalCount = data.totalCount; + this.resources = data.list; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + createResource(created: boolean) { + if (created) { + this.retrieve(); + } + } + + openModal(): void { + this.createEditResourceComponent.newOrEditResource(); + } + + deleteResource(resource: any) { + const deletionMessage = new ConfirmationMessage( + `删除 ${this.componentName} 确认`, + '你确认删除 ${this.componentName} ' + resource.name + ' ？', + resource.id, + this.confirmationTarget, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); + } + + editResource(resource: any) { + this.createEditResourceComponent.newOrEditResource(resource.id); + } +} diff --git a/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts new file mode 100644 index 000000000..ec5c77aba --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts @@ -0,0 +1,108 @@ +import { OnDestroy, OnInit } from '@angular/core'; +import { State } from '@clr/angular'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { Subscription } from 'rxjs/Subscription'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; +import { PageState } from '../../page/page-state'; + +export class TrashResourceTemplateComponent implements OnInit, OnDestroy { + + templates: any[]; + pageState: PageState = new PageState(); + currentPage = 1; + state: State; + + subscription: Subscription; + + constructor(public resourceTemplateService: any, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public aceEditorService: AceEditorService, + public componentName: string, + public resourceType: string, + public confirmationTargets: ConfirmationTargets) { + this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { + if (message && + message.state === ConfirmationState.CONFIRMED && + message.source === confirmationTargets) { + const id = message.data; + this.resourceTemplateService + .deleteById(id, 0, false) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${resourceType} 删除成功！`); + this.refresh(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + }); + } + + ngOnInit(): void { + } + + ngOnDestroy(): void { + if (this.subscription) { + this.subscription.unsubscribe(); + } + } + + pageSizeChange(pageSize: number) { + this.state.page.to = pageSize - 1; + this.state.page.size = pageSize; + this.currentPage = 1; + this.refresh(this.state); + } + + refresh(state?: State) { + if (state) { + this.state = state; + this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + } + this.pageState.params['deleted'] = true; + this.resourceTemplateService.listPage(this.pageState, 0) + .subscribe( + response => { + const data = response.data; + this.pageState.page.totalPage = data.totalPage; + this.pageState.page.totalCount = data.totalCount; + this.templates = data.list; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + deleteResourceTemplate(template: any) { + const deletionMessage = new ConfirmationMessage( + `删除 ${this.resourceType} 确认`, + `你确认永久删除 ${this.resourceType} ${template.name} ？删除后将不可恢复！`, + template.id, + this.confirmationTargets, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); + } + + viewResourceTemplate(template: any) { + this.aceEditorService.announceMessage(AceEditorMsg.Instance(template.template, false, '详情')); + } + + recoverResourceTemplate(template: any) { + template.deleted = false; + this.resourceTemplateService.update(template, 0) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${this.resourceType} 模版恢复成功！`); + this.refresh(); + }, + error => this.messageHandlerService.handleError(error) + ); + } +} diff --git a/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts b/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts new file mode 100644 index 000000000..4caba82ad --- /dev/null +++ b/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts @@ -0,0 +1,106 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { State } from '@clr/angular'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { Subscription } from 'rxjs/Subscription'; +import { PageState } from '../../page/page-state'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; + +export class TrashResourceComponent implements OnInit, OnDestroy { + + resources: any[]; + pageState: PageState = new PageState(); + currentPage = 1; + state: State; + + subscription: Subscription; + + constructor(public resourceService: any, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public aceEditorService: AceEditorService, + public resourceType: string, + public confirmationTarget: ConfirmationTargets) { + this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { + if (message && + message.state === ConfirmationState.CONFIRMED && + message.source === confirmationTarget) { + const id = message.data; + this.resourceService.deleteById(id, 0, false) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${resourceType} 删除成功！`); + this.refresh(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + }); + } + + ngOnInit(): void { + } + + ngOnDestroy(): void { + if (this.subscription) { + this.subscription.unsubscribe(); + } + } + + pageSizeChange(pageSize: number) { + this.state.page.to = pageSize - 1; + this.state.page.size = pageSize; + this.currentPage = 1; + this.refresh(this.state); + } + + refresh(state?: State) { + if (state) { + this.state = state; + this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + } + this.resourceService.list(this.pageState, 'true') + .subscribe( + response => { + const data = response.data; + this.pageState.page.totalPage = data.totalPage; + this.pageState.page.totalCount = data.totalCount; + this.resources = data.list; + }, + error => this.messageHandlerService.handleError(error) + ); + } + + deleteResource(resource: any) { + const deletionMessage = new ConfirmationMessage( + `删除 ${this.resourceType} 确认`, + `你确认永久删除 ${this.resourceType} ` + resource.name + ' ？删除后将不可恢复！', + resource.id, + this.confirmationTarget, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); + } + + recoverResource(resource: any) { + resource.deleted = false; + this.resourceService + .update(resource) + .subscribe( + response => { + this.messageHandlerService.showSuccess(`${this.resourceType} 恢复成功！`); + this.refresh(); + }, + error => this.messageHandlerService.handleError(error) + ); + } + + viewMetaDataTemplate(tpl: string) { + this.aceEditorService.announceMessage(AceEditorMsg.Instance(tpl, false, '元数据查看')); + } +} From 9843b20303149e6401d1fcfbea15ef26ec3db6a2 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 17:07:12 +0800 Subject: [PATCH 033/112] backend:Add HPA get names API --- src/backend/controllers/hpa/hpa.go | 19 +++++++++++++++++++ src/backend/models/hpa.go | 19 +++++++++++++++++++ .../routers/commentsRouter_controllers_hpa.go | 14 +++++++++++--- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/backend/controllers/hpa/hpa.go b/src/backend/controllers/hpa/hpa.go index 7dee15023..19b030eb9 100644 --- a/src/backend/controllers/hpa/hpa.go +++ b/src/backend/controllers/hpa/hpa.go @@ -42,6 +42,25 @@ func (c *HPAController) Prepare() { } } +// @router /names [get] +func (c *HPAController) GetNames() { + filters := make(map[string]interface{}) + deleted := c.GetDeleteFromQuery() + filters["Deleted"] = deleted + if c.AppId != 0 { + filters["App__Id"] = c.AppId + } + + hpas, err := models.HPAModel.GetNames(filters) + if err != nil { + logs.Error("get names error. %v, delete-status %v", err, deleted) + c.HandleError(err) + return + } + + c.Success(hpas) +} + // @router / [get] func (c *HPAController) List() { param := c.BuildQueryParam() diff --git a/src/backend/models/hpa.go b/src/backend/models/hpa.go index 7e522f92b..73619f387 100644 --- a/src/backend/models/hpa.go +++ b/src/backend/models/hpa.go @@ -33,6 +33,25 @@ func (*HPA) TableName() string { return TableNameHPA } +func (*hpaModel) GetNames(filters map[string]interface{}) ([]HPA, error) { + hpas := []HPA{} + qs := Ormer(). + QueryTable(new(HPA)) + + if len(filters) > 0 { + for k, v := range filters { + qs = qs.Filter(k, v) + } + } + _, err := qs.All(&hpas, "Id", "Name") + + if err != nil { + return nil, err + } + + return hpas, nil +} + func (*hpaModel) Add(hpa *HPA) (id int64, err error) { hpa.App = &App{Id: hpa.AppId} hpa.CreateTime = nil diff --git a/src/backend/routers/commentsRouter_controllers_hpa.go b/src/backend/routers/commentsRouter_controllers_hpa.go index cdb11ca41..cfa285744 100644 --- a/src/backend/routers/commentsRouter_controllers_hpa.go +++ b/src/backend/routers/commentsRouter_controllers_hpa.go @@ -23,6 +23,14 @@ func init() { MethodParams: param.Make(), Params: nil}) + beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"] = append(beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"], + beego.ControllerComments{ + Method: "Delete", + Router: `/:id([0-9]+)`, + AllowHTTPMethods: []string{"delete"}, + MethodParams: param.Make(), + Params: nil}) + beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"] = append(beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"], beego.ControllerComments{ Method: "Get", @@ -41,9 +49,9 @@ func init() { beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"] = append(beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/hpa:HPAController"], beego.ControllerComments{ - Method: "Delete", - Router: `/:id([0-9]+)`, - AllowHTTPMethods: []string{"delete"}, + Method: "GetNames", + Router: `/names`, + AllowHTTPMethods: []string{"get"}, MethodParams: param.Make(), Params: nil}) From 1e7840b3bc3b134c779dc362b36cfa1213a0e252 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 17:13:25 +0800 Subject: [PATCH 034/112] frontend:Add backend HPA list --- .../src/app/admin/admin-routing.module.ts | 10 +++ .../admin/autoscale/autoscale.component.html | 14 ++++ .../admin/autoscale/autoscale.component.scss | 0 .../autoscale/autoscale.component.spec.ts | 25 +++++++ .../admin/autoscale/autoscale.component.ts | 32 +++++++++ .../create-edit-autoscale.component.html | 50 ++++++++++++++ .../create-edit-autoscale.component.scss | 0 .../create-edit-autoscale.component.spec.ts | 25 +++++++ .../create-edit-autoscale.component.ts | 24 +++++++ .../list-autoscale.component.html | 62 ++++++++++++++++++ .../list-autoscale.component.scss | 0 .../list-autoscale.component.spec.ts | 25 +++++++ .../list-autoscale.component.ts | 21 ++++++ .../trash-autoscale.component.html | 65 +++++++++++++++++++ .../trash-autoscale.component.scss | 0 .../trash-autoscale.component.spec.ts | 25 +++++++ .../trash-autoscale.component.ts | 23 +++++++ .../app/shared/client/v1/autoscale.service.ts | 18 ++--- 18 files changed, 410 insertions(+), 9 deletions(-) create mode 100644 src/frontend/src/app/admin/autoscale/autoscale.component.html create mode 100644 src/frontend/src/app/admin/autoscale/autoscale.component.scss create mode 100644 src/frontend/src/app/admin/autoscale/autoscale.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscale/autoscale.component.ts create mode 100644 src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html create mode 100644 src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.scss create mode 100644 src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts create mode 100644 src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html create mode 100644 src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.scss create mode 100644 src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.ts create mode 100644 src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html create mode 100644 src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.scss create mode 100644 src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 84838dcc1..05145c835 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -64,6 +64,10 @@ import { IngressTplComponent } from './ingresstpl/ingresstpl.component'; import { TrashIngressTplComponent } from './ingresstpl/trash-ingresstpl/trash-ingresstpl.component'; import { KubeDeploymentComponent } from './kubernetes/deployment/kube-deployment.component'; import { KubeNamespaceComponent } from './kubernetes/namespace/kube-namespace.component'; +import { AutoscaleComponent } from './autoscale/autoscale.component'; +import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autoscale.component'; +import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; +import {TrashAutoscaletplComponent} from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; const routes: Routes = [ @@ -151,6 +155,12 @@ const routes: Routes = [ {path: 'ingress/tpl/trash', component: TrashIngressTplComponent}, {path: 'ingress/relate-tpl/:gid', component: IngressTplComponent}, {path: 'ingress/app/:aid', component: AppComponent}, + {path: 'hpa', component: AutoscaleComponent}, + {path: 'hpa/trash', component: TrashAutoscaleComponent}, + {path: 'hpa/tpl', component: AutoscaletplComponent}, + {path: 'hpa/tpl/trash', component: TrashAutoscaletplComponent}, + {path: 'hpa/relate-tpl/:gid', component: AutoscaletplComponent}, + {path: 'hpa/app/:aid', component: AppComponent}, {path: 'kubernetes/deployment', component: KubeDeploymentComponent}, {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent}, {path: 'kubernetes/namespace', component: KubeNamespaceComponent}, diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.html b/src/frontend/src/app/admin/autoscale/autoscale.component.html new file mode 100644 index 000000000..bbfa1cc18 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.html @@ -0,0 +1,14 @@ +
+
+
+

HPA 列表

+
+
+
+ + +
+
+ +
+
diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.scss b/src/frontend/src/app/admin/autoscale/autoscale.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.spec.ts b/src/frontend/src/app/admin/autoscale/autoscale.component.spec.ts new file mode 100644 index 000000000..0c5741184 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AutoscaleComponent } from './autoscale.component'; + +describe('AutoscaleComponent', () => { + let component: AutoscaleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AutoscaleComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscaleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.ts b/src/frontend/src/app/admin/autoscale/autoscale.component.ts new file mode 100644 index 000000000..9eb57bee8 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.ts @@ -0,0 +1,32 @@ +import {Component, OnInit, ViewChild} from '@angular/core'; +import { ResourceComponent } from '../../shared/base/admin-resource/resource'; +import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; +import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; +import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { ActivatedRoute } from '@angular/router'; +import { ConfirmationTargets } from '../../shared/shared.const'; +import { AutoscaleService } from '../../shared/client/v1/autoscale.service'; +import { ListAutoscaleComponent } from './list-autoscale/list-autoscale.component'; +import { CreateEditAutoscaleComponent } from './create-edit-autoscale/create-edit-autoscale.component'; + +@Component({ + selector: 'wayne-autoscale', + templateUrl: './autoscale.component.html', + styleUrls: ['./autoscale.component.scss'] +}) +export class AutoscaleComponent extends ResourceComponent { + @ViewChild(ListAutoscaleComponent) + listResourceComponent: ListAutoscaleComponent; + @ViewChild(CreateEditAutoscaleComponent) + createEditResourceComponent: CreateEditAutoscaleComponent; + + constructor(public breadcrumbService: BreadcrumbService, + public route: ActivatedRoute, + public resourceService: AutoscaleService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + ) { + super(breadcrumbService, route, resourceService, messageHandlerService, deletionDialogService, 'HPA', ConfirmationTargets.AUTOSCALE); + } + +} diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html new file mode 100644 index 000000000..cec8a5edf --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html @@ -0,0 +1,50 @@ + +

{{title}}

+
+ +
+
+ +
+ +
+
+
+ + + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+ diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.scss b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts new file mode 100644 index 000000000..1f160e60f --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateEditAutoscaleComponent } from './create-edit-autoscale.component'; + +describe('CreateEditAutoscaleComponent', () => { + let component: CreateEditAutoscaleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateEditAutoscaleComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateEditAutoscaleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts new file mode 100644 index 000000000..69376a074 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { CreateEditResourceComponent } from '../../../shared/base/admin-resource/create-edit-resource'; +import { AppService } from '../../../shared/client/v1/app.service'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { AutoscaleService } from '../../../shared/client/v1/autoscale.service'; +import { Autoscale } from '../../../shared/model/v1/autoscale'; +import { defaultAutoscale } from '../../../shared/default-models/autoscale.const'; + +@Component({ + selector: 'wayne-create-edit-autoscale', + templateUrl: './create-edit-autoscale.component.html', + styleUrls: ['./create-edit-autoscale.component.scss'] +}) +export class CreateEditAutoscaleComponent extends CreateEditResourceComponent { + + constructor(public resourceService: AutoscaleService, + public appService: AppService, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { + super(resourceService, appService, aceEditorService, messageHandlerService, Autoscale, defaultAutoscale, 'hpa'); + } + +} diff --git a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html new file mode 100644 index 000000000..c367cbf01 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html @@ -0,0 +1,62 @@ + + + + ID + + + + + 名称 + + + + + {{'TITLE.BELONG_APP' | translate}} + + + + + {{'TITLE.METADATA' | translate}} + + + + + {{'TITLE.DESCRIPTION' | translate}} + + + + + 创建者 + + + + + 创建时间 + + + + + + + + {{resource.id}} + {{resource.name}} + {{resource.app.name}} + +
+ {{resource.metaData}} +
+ + {{resource.description}} + {{resource.user}} + {{resource.createTime | date:'yyyy-MM-dd HH:mm'}} + + + + + diff --git a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.scss b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.spec.ts b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.spec.ts new file mode 100644 index 000000000..4fb3fc471 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ListAutoscaleComponent } from './list-autoscale.component'; + +describe('ListAutoscaleComponent', () => { + let component: ListAutoscaleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ListAutoscaleComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ListAutoscaleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.ts b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.ts new file mode 100644 index 000000000..35c7df6fc --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.ts @@ -0,0 +1,21 @@ +import { Component } from '@angular/core'; +import { ListResourceComponent } from '../../../shared/base/admin-resource/list-resource'; +import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'wayne-list-autoscale', + templateUrl: './list-autoscale.component.html', + styleUrls: ['./list-autoscale.component.scss'] +}) +export class ListAutoscaleComponent extends ListResourceComponent{ + + constructor(public breadcrumbService: BreadcrumbService, + public router: Router, + public aceEditorService: AceEditorService, + ) { + super(breadcrumbService, router, aceEditorService, 'hpa'); + } + +} diff --git a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html new file mode 100644 index 000000000..15db47a12 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html @@ -0,0 +1,65 @@ +
+
+
+

已删除 HPA 列表

+
+ + + + ID + + + + + 名称 + + + + + {{'TITLE.METADATA' | translate}} + + + + + {{'TITLE.DESCRIPTION' | translate}} + + + + + 创建者 + + + + + 创建时间 + + + + + + + + {{resource.id}} + {{resource.name}} + +
+ {{resource.metaData}} +
+ + {{resource.description}} + {{resource.user}} + {{resource.createTime | date:'yyyy-MM-dd HH:mm'}} + + + + + +
+
+ + diff --git a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.scss b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.spec.ts b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.spec.ts new file mode 100644 index 000000000..2088ebf87 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TrashAutoscaleComponent } from './trash-autoscale.component'; + +describe('TrashAutoscaleComponent', () => { + let component: TrashAutoscaleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TrashAutoscaleComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TrashAutoscaleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.ts b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.ts new file mode 100644 index 000000000..8dece1f92 --- /dev/null +++ b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.ts @@ -0,0 +1,23 @@ +import { Component } from '@angular/core'; +import { TrashResourceComponent } from '../../../shared/base/admin-resource/trash-resource'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { ConfirmationTargets } from '../../../shared/shared.const'; +import { AutoscaleService } from '../../../shared/client/v1/autoscale.service'; + +@Component({ + selector: 'wayne-trash-autoscale', + templateUrl: './trash-autoscale.component.html', + styleUrls: ['./trash-autoscale.component.scss'] +}) +export class TrashAutoscaleComponent extends TrashResourceComponent { + + constructor(public resourceService: AutoscaleService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public aceEditorService: AceEditorService) { + super( resourceService, messageHandlerService, deletionDialogService, aceEditorService, 'hpa', ConfirmationTargets.AUTOSCALE ); + + } +} diff --git a/src/frontend/src/app/shared/client/v1/autoscale.service.ts b/src/frontend/src/app/shared/client/v1/autoscale.service.ts index e94c3fac4..0d5579ad4 100644 --- a/src/frontend/src/app/shared/client/v1/autoscale.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscale.service.ts @@ -14,15 +14,15 @@ export class AutoscaleService { constructor(private http: HttpClient) { } - // getNames(appId?: number): Observable { - // let params = new HttpParams(); - // if (typeof(appId) === 'undefined') { - // appId = 0; - // } - // return this.http - // .get(`/api/v1/apps/${appId}/hpas/names`, {params: params}) - // .catch(error => Observable.throw(error)); - // } + getNames(appId?: number): Observable { + let params = new HttpParams(); + if (typeof(appId) === 'undefined') { + appId = 0; + } + return this.http + .get(`/api/v1/apps/${appId}/hpas/names`, {params: params}) + .catch(error => Observable.throw(error)); + } list(pageState: PageState, deleted?: string, appId?: string): Observable { let params = new HttpParams(); From 903e8dc3ef391453338f7e01372282ee816684c3 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 17:14:26 +0800 Subject: [PATCH 035/112] frontend:Add frontend page of HPA Admin Template --- src/frontend/src/app/admin/admin.module.ts | 10 +++- .../autoscaletpl/autoscaletpl.component.html | 14 +++++ .../autoscaletpl/autoscaletpl.component.scss | 0 .../autoscaletpl.component.spec.ts | 25 +++++++++ .../autoscaletpl/autoscaletpl.component.ts | 34 +++++++++++ .../create-edit-autoscaletpl.component.html | 36 ++++++++++++ .../create-edit-autoscaletpl.component.scss | 0 ...create-edit-autoscaletpl.component.spec.ts | 25 +++++++++ .../create-edit-autoscaletpl.component.ts | 29 ++++++++++ .../list-autoscaletpl.component.html | 47 ++++++++++++++++ .../list-autoscaletpl.component.scss | 0 .../list-autoscaletpl.component.spec.ts | 25 +++++++++ .../list-autoscaletpl.component.ts | 18 ++++++ .../trash-autoscaletpl.component.html | 56 +++++++++++++++++++ .../trash-autoscaletpl.component.scss | 0 .../trash-autoscaletpl.component.spec.ts | 25 +++++++++ .../trash-autoscaletpl.component.ts | 31 ++++++++++ 17 files changed, 374 insertions(+), 1 deletion(-) create mode 100644 src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html create mode 100644 src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.scss create mode 100644 src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html create mode 100644 src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.scss create mode 100644 src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html create mode 100644 src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.scss create mode 100644 src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html create mode 100644 src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.scss create mode 100644 src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.spec.ts create mode 100644 src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.ts diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index 2ad929201..ae5a3b9c3 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -39,6 +39,14 @@ import { IngressTplModule } from './ingresstpl/ingresstpl.module'; import { KubeDeploymentModule } from './kubernetes/deployment/kube-deployment.module'; import { TplDetailModule } from '../shared/tpl-detail/tpl-detail.module'; import { KubeNamespaceModule } from './kubernetes/namespace/kube-namespace.module'; +import { AutoscaleComponent } from './autoscale/autoscale.component'; +import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; +import { CreateEditAutoscaleComponent } from './autoscale/create-edit-autoscale/create-edit-autoscale.component'; +import { ListAutoscaleComponent } from './autoscale/list-autoscale/list-autoscale.component'; +import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autoscale.component'; +import { CreateEditAutoscaletplComponent } from './autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component'; +import { ListAutoscaletplComponent } from './autoscaletpl/list-autoscaletpl/list-autoscaletpl.component'; +import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; @NgModule({ imports: [ @@ -84,7 +92,7 @@ import { KubeNamespaceModule } from './kubernetes/namespace/kube-namespace.modul AdminAuthCheckGuard, AuthService ], - declarations: [AdminComponent] + declarations: [AdminComponent, AutoscaleComponent, AutoscaletplComponent, CreateEditAutoscaleComponent, ListAutoscaleComponent, TrashAutoscaleComponent, CreateEditAutoscaletplComponent, ListAutoscaletplComponent, TrashAutoscaletplComponent] }) export class AdminModule { } diff --git a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html new file mode 100644 index 000000000..717ca6fe4 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html @@ -0,0 +1,14 @@ +
+
+
+

HPA 模版列表

+
+
+
+ + +
+
+ +
+
diff --git a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.scss b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.spec.ts b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.spec.ts new file mode 100644 index 000000000..1c3620969 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AutoscaletplComponent } from './autoscaletpl.component'; + +describe('AutoscaletplComponent', () => { + let component: AutoscaletplComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AutoscaletplComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscaletplComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.ts b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.ts new file mode 100644 index 000000000..d087cbd47 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit, ViewChild} from '@angular/core'; +import { ResourceTemplateComponent } from '../../shared/base/admin-resource/resource-template'; +import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; +import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; +import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { ActivatedRoute } from '@angular/router'; +import { ConfirmationTargets } from '../../shared/shared.const'; +import { AutoscaleTplService } from '../../shared/client/v1/autoscaletpl.service'; +import { ListAutoscaletplComponent } from './list-autoscaletpl/list-autoscaletpl.component'; +import { CreateEditAutoscaletplComponent } from './create-edit-autoscaletpl/create-edit-autoscaletpl.component'; + +@Component({ + selector: 'wayne-autoscaletpl', + templateUrl: './autoscaletpl.component.html', + styleUrls: ['./autoscaletpl.component.scss'] +}) +export class AutoscaletplComponent extends ResourceTemplateComponent { + @ViewChild(ListAutoscaletplComponent) + listResourceTemplateComponent: ListAutoscaletplComponent; + @ViewChild(CreateEditAutoscaletplComponent) + createEditResourceTemplateComponent: CreateEditAutoscaletplComponent; + + constructor( + public breadcrumbService: BreadcrumbService, + public route: ActivatedRoute, + public resourceTemplateService: AutoscaleTplService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService + ) { + super(breadcrumbService, + route, resourceTemplateService, messageHandlerService, deletionDialogService, 'HPA 模板', 'hpa', ConfirmationTargets.AUTOSCALE_TPL); + } + +} diff --git a/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html new file mode 100644 index 000000000..21d67b972 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html @@ -0,0 +1,36 @@ + +

{{title}} + +

+
+
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+
+
+
+ + +
+ diff --git a/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.scss b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts new file mode 100644 index 000000000..66df71de4 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateEditAutoscaletplComponent } from './create-edit-autoscaletpl.component'; + +describe('CreateEditAutoscaletplComponent', () => { + let component: CreateEditAutoscaletplComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateEditAutoscaletplComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateEditAutoscaletplComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts new file mode 100644 index 000000000..c0b3b98d1 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts @@ -0,0 +1,29 @@ +import { Component } from '@angular/core'; +import { CreateEditResourceTemplateComponent } from '../../../shared/base/admin-resource/create-edit-resource-template'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { AutoscaleTplService } from '../../../shared/client/v1/autoscaletpl.service'; +import { AutoscaleService } from '../../../shared/client/v1/autoscale.service'; +import { defaultAutoscale } from '../../../shared/default-models/autoscale.const'; +import { AutoscaleTpl } from '../../../shared/model/v1/autoscaletpl'; + +@Component({ + selector: 'wayne-create-edit-autoscaletpl', + templateUrl: './create-edit-autoscaletpl.component.html', + styleUrls: ['./create-edit-autoscaletpl.component.scss'] +}) +export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplateComponent { + + constructor(public templateService: AutoscaleTplService, + public resourceService: AutoscaleService, + public messageHandlerService: MessageHandlerService, + public aceEditorService: AceEditorService + ) { + super(templateService, + resourceService, + messageHandlerService, + aceEditorService, AutoscaleTpl, + 'hpa', defaultAutoscale, + ); + } +} diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html new file mode 100644 index 000000000..04748032a --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html @@ -0,0 +1,47 @@ + + + + ID + + + + + 名称 + + + + + {{'TITLE.DESCRIPTION' | translate}} + + + + + 创建者 + + + + + 创建时间 + + + + + + + + {{template.id}} + {{template.name}} + {{template.description}} + {{template.user}} + {{template.createTime | date:'yyyy-MM-dd HH:mm'}} + + + + + + diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.scss b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.spec.ts b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.spec.ts new file mode 100644 index 000000000..1e1353b93 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ListAutoscaletplComponent } from './list-autoscaletpl.component'; + +describe('ListAutoscaletplComponent', () => { + let component: ListAutoscaletplComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ListAutoscaletplComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ListAutoscaletplComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.ts b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.ts new file mode 100644 index 000000000..9a3c94f01 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; +import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { Router } from '@angular/router'; +import { ListResourceTemplateComponent } from '../../../shared/base/admin-resource/list-resource-template'; + +@Component({ + selector: 'wayne-list-autoscaletpl', + templateUrl: './list-autoscaletpl.component.html', + styleUrls: ['./list-autoscaletpl.component.scss'] +}) +export class ListAutoscaletplComponent extends ListResourceTemplateComponent { + + constructor(public router: Router) { + super( router); + } + +} diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html new file mode 100644 index 000000000..1b887379f --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html @@ -0,0 +1,56 @@ +
+
+
+

已删除 HPA 模版列表

+
+ + + + ID + + + + + 名称 + + + + + {{'TITLE.DESCRIPTION' | translate}} + + + + + 创建者 + + + + + 创建时间 + + + + + + + + + {{tpl.id}} + {{tpl.name}} + {{tpl.description}} + {{tpl.user}} + {{tpl.createTime | date:'yyyy-MM-dd HH:mm'}} + + + + + +
+
+ + diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.scss b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.spec.ts b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.spec.ts new file mode 100644 index 000000000..aa22cd509 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TrashAutoscaletplComponent } from './trash-autoscaletpl.component'; + +describe('TrashAutoscaletplComponent', () => { + let component: TrashAutoscaletplComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TrashAutoscaletplComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TrashAutoscaletplComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.ts b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.ts new file mode 100644 index 000000000..91c447775 --- /dev/null +++ b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.ts @@ -0,0 +1,31 @@ +import { Component, OnInit } from '@angular/core'; +import { TrashResourceTemplateComponent } from '../../../shared/base/admin-resource/trash-resource-template'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; +import { ConfirmationTargets } from '../../../shared/shared.const'; +import { AutoscaleTplService } from '../../../shared/client/v1/autoscaletpl.service'; + +@Component({ + selector: 'wayne-trash-autoscaletpl', + templateUrl: './trash-autoscaletpl.component.html', + styleUrls: ['./trash-autoscaletpl.component.scss'] +}) +export class TrashAutoscaletplComponent extends TrashResourceTemplateComponent { + + constructor(public resourceTemplateService: AutoscaleTplService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService, + public aceEditorService: AceEditorService) { + super(resourceTemplateService, + messageHandlerService, + deletionDialogService, + aceEditorService, + 'HPA 模板', + 'hpa', + ConfirmationTargets.AUTOSCALE_TPL, + ); + + } + +} From ef08c715863d0a81742fc3e0d8ef80490342959f Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Fri, 25 Jan 2019 18:51:23 +0800 Subject: [PATCH 036/112] frontend: paginate fix --- .../list-apikey/list-apikey.component.html | 16 +++++---- .../app/list-app/list-app.component.html | 16 +++++---- .../app/trash-app/trash-app.component.html | 17 +++++----- .../admin/auditlog/auditlog.component.html | 16 +++++---- .../list-cluster/list-cluster.component.html | 16 +++++---- .../trash-cluster.component.html | 16 +++++---- .../list-config/list-config.component.html | 15 ++++---- .../list-configmap.component.html | 16 +++++---- .../trash-configmap.component.html | 16 +++++---- .../list-configmaptpl.component.html | 16 +++++---- .../trash-configmaptpl.component.html | 16 +++++---- .../list-cronjob/list-cronjob.component.html | 16 +++++---- .../trash-cronjob.component.html | 16 +++++---- .../list-cronjobtpl.component.html | 16 +++++---- .../trash-cronjobtpl.component.html | 16 +++++---- .../list-daemonset.component.html | 8 ++--- .../trash-daemonset.component.html | 16 +++++---- .../list-daemonsettpl.component.html | 15 ++++---- .../trash-daemonsettpl.component.html | 16 +++++---- .../list-deployment.component.html | 16 +++++---- .../trash-deployment.component.html | 16 +++++---- .../list-deploymenttpl.component.html | 16 +++++---- .../trash-deploymenttpl.component.html | 16 +++++---- .../list-group/list-group.component.html | 16 +++++---- .../list-ingress/list-ingress.component.html | 16 +++++---- .../trash-ingress.component.html | 16 +++++---- .../list-ingresstpl.component.html | 16 +++++---- .../trash-ingresstpl.component.html | 16 +++++---- .../list/kube-list-deployment.component.html | 15 ++++---- .../list-namespace.component.html | 15 ++++---- .../list-namespace.component.html | 16 +++++---- .../trash-namespace.component.html | 16 +++++---- .../list-notification.component.html | 16 +++++---- .../list-permission.component.html | 16 +++++---- .../list-persistentvolumeclaim.component.html | 16 +++++---- ...trash-persistentvolumeclaim.component.html | 16 +++++---- ...st-persistentvolumeclaimtpl.component.html | 16 +++++---- ...sh-persistentvolumeclaimtpl.component.html | 16 +++++---- .../list-secret/list-secret.component.html | 16 +++++---- .../trash-secret/trash-secret.component.html | 16 +++++---- .../list-secrettpl.component.html | 16 +++++---- .../trash-secrettpl.component.html | 16 +++++---- .../list-statefulset.component.html | 16 +++++---- .../trash-statefulset.component.html | 16 +++++---- .../list-statefulsettpl.component.html | 16 +++++---- .../trash-statefulsettpl.component.html | 16 +++++---- .../user/list-user/list-user.component.html | 16 +++++---- .../list-apikey/list-apikey.component.html | 16 +++++---- .../list-app-user.component.html | 16 +++++---- .../list-app-webhook.component.html | 16 +++++---- .../app/list-app/list-app.component.html | 16 +++++---- .../list-autoscale.component.html | 16 +++++---- .../publish-history.component.html | 16 +++++---- .../list-configmap.component.html | 16 +++++---- .../list-cronjob/list-cronjob.component.html | 18 +++++----- .../list-daemonset.component.html | 16 +++++---- .../list-deployment.component.html | 17 +++++----- .../list-ingress/list-ingress.component.html | 16 +++++---- .../list-apikey/list-apikey.component.html | 16 +++++---- .../list-namespace-user.component.html | 16 +++++---- .../list-namespace-webhook.component.html | 16 +++++---- .../list-persistentvolumeclaim.component.html | 18 +++++----- .../list-secret/list-secret.component.html | 16 +++++---- .../list-statefulset.component.html | 17 +++++----- .../shared/paginate/paginate.component.html | 34 +++++++++---------- src/frontend/src/component/pagination.scss | 3 ++ src/frontend/src/component/table.scss | 2 +- 67 files changed, 589 insertions(+), 469 deletions(-) diff --git a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html index 0472062e1..b7970b42d 100644 --- a/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html +++ b/src/frontend/src/app/admin/apikey/list-apikey/list-apikey.component.html @@ -48,12 +48,14 @@ {{apiKey.description}} - - + + + + diff --git a/src/frontend/src/app/admin/app/list-app/list-app.component.html b/src/frontend/src/app/admin/app/list-app/list-app.component.html index 7165d2fb5..215a62a00 100644 --- a/src/frontend/src/app/admin/app/list-app/list-app.component.html +++ b/src/frontend/src/app/admin/app/list-app/list-app.component.html @@ -54,11 +54,13 @@ - - + + + + diff --git a/src/frontend/src/app/admin/app/trash-app/trash-app.component.html b/src/frontend/src/app/admin/app/trash-app/trash-app.component.html index e58f71170..69e0e1f5f 100644 --- a/src/frontend/src/app/admin/app/trash-app/trash-app.component.html +++ b/src/frontend/src/app/admin/app/trash-app/trash-app.component.html @@ -51,14 +51,15 @@

已删除项目列表

{{app.user}} {{app.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + +
diff --git a/src/frontend/src/app/admin/auditlog/auditlog.component.html b/src/frontend/src/app/admin/auditlog/auditlog.component.html index 6e525a7af..a9cf19123 100644 --- a/src/frontend/src/app/admin/auditlog/auditlog.component.html +++ b/src/frontend/src/app/admin/auditlog/auditlog.component.html @@ -44,13 +44,15 @@

审计日志列表

{{al.createTime | date:'yyyy-MM-dd HH:mm:ss'}} {{al.message}} - - + + + +
diff --git a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.html b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.html index fb776df98..1f906784e 100644 --- a/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.html +++ b/src/frontend/src/app/admin/cluster/list-cluster/list-cluster.component.html @@ -69,11 +69,13 @@ - - + + + + diff --git a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.html b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.html index dd13782a0..d224d1be3 100644 --- a/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.html +++ b/src/frontend/src/app/admin/cluster/trash-cluster/trash-cluster.component.html @@ -47,13 +47,15 @@

已删除集群列表

{{cluster.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + +

diff --git a/src/frontend/src/app/admin/config/list-config/list-config.component.html b/src/frontend/src/app/admin/config/list-config/list-config.component.html index 3ffc31ddd..6d08431d6 100644 --- a/src/frontend/src/app/admin/config/list-config/list-config.component.html +++ b/src/frontend/src/app/admin/config/list-config/list-config.component.html @@ -23,11 +23,12 @@ {{config.name}} {{config.value}} - - - + + + + diff --git a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.html index b2054a547..042806347 100644 --- a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.html +++ b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.html @@ -54,11 +54,13 @@ {{configMap.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.html b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.html index d252aa253..63448e16d 100644 --- a/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.html +++ b/src/frontend/src/app/admin/configmap/trash-configmap/trash-configmap.component.html @@ -50,13 +50,15 @@

已删除配置集列表

{{configMap.user}} {{configMap.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + +
diff --git a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.html b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.html index 19775b282..291c49df8 100644 --- a/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.html +++ b/src/frontend/src/app/admin/configmaptpl/list-configmaptpl/list-configmaptpl.component.html @@ -36,11 +36,13 @@ {{configMapTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html index 96272f591..1adc2ea67 100644 --- a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html +++ b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html @@ -42,13 +42,15 @@

已删除配置集模版列表

{{configMapTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + +
diff --git a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.html b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.html index 766d215c4..9002efd6d 100644 --- a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.html @@ -53,11 +53,13 @@ {{cronjob.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.html b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.html index 6c2d9b3c5..28b69956c 100644 --- a/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/trash-cronjob/trash-cronjob.component.html @@ -50,13 +50,15 @@

{{'CRONJOB.DELETE_LIST' | translate}}

{{cronjob.user}} {{cronjob.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + +
diff --git a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.html index d2182a4c3..15435383b 100644 --- a/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/list-cronjobtpl/list-cronjobtpl.component.html @@ -46,11 +46,13 @@ {{cronjobTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.html index 39eadb700..6ca120e31 100644 --- a/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component.html @@ -42,13 +42,15 @@

{{'CRONJOB.DELETE_LIST' | translate}}

{{cronjobTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html index 7e393f5d3..8932ed5f3 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html @@ -51,8 +51,8 @@ {{daemonset.user}} {{daemonset.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + + diff --git a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html index abd9158c9..50248326e 100644 --- a/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/trash-daemonset/trash-daemonset.component.html @@ -51,13 +51,15 @@

{{'DAEMONSET_ADMIN.TRASH.DAEMONSET_DELETE_LIST' | trans {{daemonset.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.html index bd5b26d7d..264d48874 100644 --- a/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/list-daemonsettpl/list-daemonsettpl.component.html @@ -36,11 +36,12 @@ {{daemonsetTpl.user}} {{daemonsetTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + + diff --git a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html index 37d6affb2..9b3d859c8 100644 --- a/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html +++ b/src/frontend/src/app/admin/daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component.html @@ -51,13 +51,15 @@

{{'DAEMONSET_ADMIN.TPL.TRASH.DAEMONSET_TPL_DELETE_LIST' {{daemonsetTpl.user}} {{daemonsetTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.html b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.html index ea251e05f..a0e2da2a6 100644 --- a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.html +++ b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.html @@ -54,11 +54,13 @@ {{deployment.user}} {{deployment.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.html b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.html index 237ab874d..4b3b066cd 100644 --- a/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.html +++ b/src/frontend/src/app/admin/deployment/trash-deployment/trash-deployment.component.html @@ -51,13 +51,15 @@

{{'DEPLOYMENT_ADMIN.TRASH.DEPLOYMENT_DELETE_LIST' | tra {{deployment.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.html b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.html index ce02b3f8d..39f136736 100644 --- a/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.html +++ b/src/frontend/src/app/admin/deploymenttpl/list-deploymenttpl/list-deploymenttpl.component.html @@ -38,11 +38,13 @@ {{deploymentTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.html b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.html index 003a5805a..28e03c3ce 100644 --- a/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.html +++ b/src/frontend/src/app/admin/deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component.html @@ -42,13 +42,15 @@

{{'DEPLOYMENT_ADMIN.TMP.TRASH.DEPLOYMENT_DELETE_LIST' | {{deploymentTpl.user}} {{deploymentTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/group/list-group/list-group.component.html b/src/frontend/src/app/admin/group/list-group/list-group.component.html index 164d28699..4e5b35e1e 100644 --- a/src/frontend/src/app/admin/group/list-group/list-group.component.html +++ b/src/frontend/src/app/admin/group/list-group/list-group.component.html @@ -29,11 +29,13 @@ {{groupType[group.type].name}} {{group.comment}} - - + + + + diff --git a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.html b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.html index eefa0f66a..baa1f9315 100644 --- a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.html +++ b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.html @@ -52,11 +52,13 @@ {{ingress.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html index 965026d32..a7b490a91 100644 --- a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html +++ b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html @@ -51,13 +51,15 @@

已删除 Ingress 列表

{{ingress.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.html b/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.html index b97678be4..b17dd65b4 100644 --- a/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.html +++ b/src/frontend/src/app/admin/ingresstpl/list-ingresstpl/list-ingresstpl.component.html @@ -37,11 +37,13 @@ - - + + + + diff --git a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html index 9fa1a9721..93a85991e 100644 --- a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html +++ b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html @@ -42,13 +42,15 @@

已删除 Ingress 模版列表

{{ingressTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.html b/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.html index 46a6ba9d1..148c18a8d 100644 --- a/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.html +++ b/src/frontend/src/app/admin/kubernetes/deployment/list/kube-list-deployment.component.html @@ -51,11 +51,12 @@ {{deployment.objectMeta.creationTimestamp | relativeTime}} - - - + + + + diff --git a/src/frontend/src/app/admin/kubernetes/namespace/list-namespace/list-namespace.component.html b/src/frontend/src/app/admin/kubernetes/namespace/list-namespace/list-namespace.component.html index c54029793..9cc8a5ef2 100644 --- a/src/frontend/src/app/admin/kubernetes/namespace/list-namespace/list-namespace.component.html +++ b/src/frontend/src/app/admin/kubernetes/namespace/list-namespace/list-namespace.component.html @@ -24,11 +24,12 @@ {{ namespace.status }} {{namespace.objectMeta.creationTimestamp | relativeTime}} - - - + + + + diff --git a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.html b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.html index 464c8ddc0..2d83d685f 100644 --- a/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.html +++ b/src/frontend/src/app/admin/namespace/list-namespace/list-namespace.component.html @@ -48,11 +48,13 @@ {{ns.createTime | date:'yyyy-MM-dd HH:mm:ss'}} {{ns.updateTime | date:'yyyy-MM-dd HH:mm:ss'}} - - + + + + diff --git a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.html b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.html index aef916445..1f466f359 100644 --- a/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.html +++ b/src/frontend/src/app/admin/namespace/trash-namespace/trash-namespace.component.html @@ -41,13 +41,15 @@

已删除命名空间列表

{{ns.updateTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.html b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.html index c975b0841..2997633f0 100644 --- a/src/frontend/src/app/admin/notification/list-notification/list-notification.component.html +++ b/src/frontend/src/app/admin/notification/list-notification/list-notification.component.html @@ -45,13 +45,15 @@ {{n.createTime | date:'yyyy-MM-dd HH:mm:ss'}} - - + + + + diff --git a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html index 0fd47337a..e8f4a5369 100644 --- a/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html +++ b/src/frontend/src/app/admin/permission/list-permission/list-permission.component.html @@ -23,11 +23,13 @@ {{permission.name}} {{permission.comment}} - - + + + + diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html index 730a5a0ef..bdc878529 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html @@ -52,11 +52,13 @@ {{pvc.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.html b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.html index dbd7b6791..4cf2e5639 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component.html @@ -51,13 +51,15 @@

已删除PVC列表

{{pvc.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.html b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.html index a09588a74..30ea9b36d 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component.html @@ -37,11 +37,13 @@ - - + + + + diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.html b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.html index e5a6ba335..1ee4e3f41 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component.html @@ -42,13 +42,15 @@

已删除PVC模版列表

{{tpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html index dd1bc5014..029bc36af 100644 --- a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html +++ b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.html @@ -53,11 +53,13 @@ {{secret.user}} {{secret.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html index 1925ac2df..a68110774 100644 --- a/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html +++ b/src/frontend/src/app/admin/secret/trash-secret/trash-secret.component.html @@ -50,13 +50,15 @@

已删除加密文件列表

{{secret.user}} {{secret.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.html b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.html index d83c119ca..e42c590d0 100644 --- a/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.html +++ b/src/frontend/src/app/admin/secrettpl/list-secrettpl/list-secrettpl.component.html @@ -35,11 +35,13 @@ {{secrettpl.user}} {{secrettpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.html b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.html index eb91c24e9..f63b3a8b1 100644 --- a/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.html +++ b/src/frontend/src/app/admin/secrettpl/trash-secrettpl/trash-secrettpl.component.html @@ -41,13 +41,15 @@

已删除加密字典模板列表

{{secrettpl.user}} {{secrettpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html index fdd37a3cc..2187fee24 100644 --- a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html +++ b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html @@ -52,11 +52,13 @@ {{statefulset.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.html b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.html index bfb665c24..7500683c2 100644 --- a/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.html +++ b/src/frontend/src/app/admin/statefulset/trash-statefulset/trash-statefulset.component.html @@ -51,13 +51,15 @@

{{'STATEFULSET_ADMIN.TRASH.STATEFULSET_DELETE_LIST' | t {{statefulset.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.html b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.html index 08bebfd2c..cc192ff5d 100644 --- a/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.html +++ b/src/frontend/src/app/admin/statefulsettpl/list-statefulsettpl/list-statefulsettpl.component.html @@ -38,11 +38,13 @@ {{statefulsetTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.html b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.html index 2e559b1f3..4ecbc47f2 100644 --- a/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.html +++ b/src/frontend/src/app/admin/statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component.html @@ -42,13 +42,15 @@

已删除状态副本集模版列表

{{statefulsetTpl.user}} {{statefulsetTpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - + + + + diff --git a/src/frontend/src/app/admin/user/list-user/list-user.component.html b/src/frontend/src/app/admin/user/list-user/list-user.component.html index 33d97a136..206525c21 100644 --- a/src/frontend/src/app/admin/user/list-user/list-user.component.html +++ b/src/frontend/src/app/admin/user/list-user/list-user.component.html @@ -56,12 +56,14 @@ {{user.lastIp}} {{user.comment}} - - + + + + diff --git a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html index 7d738f34d..a13bc7846 100644 --- a/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html +++ b/src/frontend/src/app/portal/app-apikey/list-apikey/list-apikey.component.html @@ -42,12 +42,14 @@ - - + + + + diff --git a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.html b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.html index a807005c8..9db3773e2 100644 --- a/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.html +++ b/src/frontend/src/app/portal/app-user/list-app-user/list-app-user.component.html @@ -68,11 +68,13 @@ - - + + + + diff --git a/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.html b/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.html index 4ecc58b7c..f014584e2 100644 --- a/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.html +++ b/src/frontend/src/app/portal/app-webhook/list-app-webhook/list-app-webhook.component.html @@ -82,11 +82,13 @@ - - + + + + diff --git a/src/frontend/src/app/portal/app/list-app/list-app.component.html b/src/frontend/src/app/portal/app/list-app/list-app.component.html index e24aa674e..fd96c60b4 100644 --- a/src/frontend/src/app/portal/app/list-app/list-app.component.html +++ b/src/frontend/src/app/portal/app/list-app/list-app.component.html @@ -36,11 +36,13 @@ - - + + + + diff --git a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.html b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.html index da6b863f3..df10ff5a3 100644 --- a/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.html +++ b/src/frontend/src/app/portal/autoscale/list-autoscale/list-autoscale.component.html @@ -70,13 +70,15 @@ - - + + + + diff --git a/src/frontend/src/app/portal/common/publish-history/publish-history.component.html b/src/frontend/src/app/portal/common/publish-history/publish-history.component.html index 17be801de..8a05edcbd 100644 --- a/src/frontend/src/app/portal/common/publish-history/publish-history.component.html +++ b/src/frontend/src/app/portal/common/publish-history/publish-history.component.html @@ -36,13 +36,15 @@

{{'BUTTON.HISTORY' | translate}} - {{ resourceName }}{{history.cluster}} {{history.status == 1 ? 'success' : history.message}} - - + + + + diff --git a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html index 6b71c0b50..aae5a4303 100644 --- a/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html +++ b/src/frontend/src/app/portal/configmap/list-configmap/list-configmap.component.html @@ -81,13 +81,15 @@ - - + + + + diff --git a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html index 005127340..e1adad31b 100644 --- a/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html +++ b/src/frontend/src/app/portal/cronjob/list-cronjob/list-cronjob.component.html @@ -94,14 +94,16 @@ - - + + + + diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html index 50b1ceb05..8cf6b9585 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html @@ -96,13 +96,15 @@ - - + + + + diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html index 72d8fa569..e3663615e 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html @@ -97,14 +97,15 @@ - - - + + + + diff --git a/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.html b/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.html index ed03ddbfc..53489d4d9 100644 --- a/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.html +++ b/src/frontend/src/app/portal/ingress/list-ingress/list-ingress.component.html @@ -70,13 +70,15 @@ - - + + + + diff --git a/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.html b/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.html index 314b28016..bfdb32b95 100644 --- a/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.html +++ b/src/frontend/src/app/portal/namespace-apikey/list-apikey/list-apikey.component.html @@ -42,12 +42,14 @@ - - + + + + diff --git a/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.html b/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.html index eb86e25e5..b399f54bb 100644 --- a/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.html +++ b/src/frontend/src/app/portal/namespace-user/list-namespace-user/list-namespace-user.component.html @@ -51,11 +51,13 @@ - - + + + + diff --git a/src/frontend/src/app/portal/namespace-webhook/list-namespace-webhook/list-namespace-webhook.component.html b/src/frontend/src/app/portal/namespace-webhook/list-namespace-webhook/list-namespace-webhook.component.html index d4bfa77cb..56283ed76 100644 --- a/src/frontend/src/app/portal/namespace-webhook/list-namespace-webhook/list-namespace-webhook.component.html +++ b/src/frontend/src/app/portal/namespace-webhook/list-namespace-webhook/list-namespace-webhook.component.html @@ -83,11 +83,13 @@ - - + + + + diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html index 22717fbb5..eb9a4de4a 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html @@ -80,14 +80,16 @@ - - + + + + diff --git a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html index 6127f24f4..082af8597 100644 --- a/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html +++ b/src/frontend/src/app/portal/secret/list-secret/list-secret.component.html @@ -82,13 +82,15 @@ - - + + + + diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html index 21f030d85..35a1cf2be 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html @@ -95,14 +95,15 @@ - - - + + + + diff --git a/src/frontend/src/app/shared/paginate/paginate.component.html b/src/frontend/src/app/shared/paginate/paginate.component.html index e168ec0eb..975715d7a 100644 --- a/src/frontend/src/app/shared/paginate/paginate.component.html +++ b/src/frontend/src/app/shared/paginate/paginate.component.html @@ -1,18 +1,16 @@ - - - - {{pagesize}} - - - - - - {{i}} - - / {{lastPage}} {{'PAGE.PAGE' | translate}} - - - + + + {{pagesize}} + + + + + + {{i}} + + / {{lastPage}} {{'PAGE.PAGE' | translate}} + + diff --git a/src/frontend/src/component/pagination.scss b/src/frontend/src/component/pagination.scss index 5ca4f0361..803d8f847 100644 --- a/src/frontend/src/component/pagination.scss +++ b/src/frontend/src/component/pagination.scss @@ -19,3 +19,6 @@ ul.pagination-list { border-radius: 2px; color: #fff; } +.pagination-list{ + display: none !important; +} \ No newline at end of file diff --git a/src/frontend/src/component/table.scss b/src/frontend/src/component/table.scss index a7f89b624..ba18fff99 100644 --- a/src/frontend/src/component/table.scss +++ b/src/frontend/src/component/table.scss @@ -27,7 +27,7 @@ } } -.datagrid-body clr-dg-row:nth-child(even) { +.datagrid-table clr-dg-row:nth-child(odd) { background: rgba(232, 237, 246, .45); } From b6fcfb3d3d2d67e9e8141b00a5df34f0f19e6bf9 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 19:13:12 +0800 Subject: [PATCH 037/112] frontend:Add i18n for HPA --- .../src/app/admin/autoscale/autoscale.component.html | 4 ++-- .../create-edit-autoscale.component.html | 10 +++++----- .../list-autoscale/list-autoscale.component.html | 8 ++++---- .../list-autoscale/list-autoscale.component.ts | 2 +- .../trash-autoscale/trash-autoscale.component.html | 10 +++++----- .../app/admin/autoscaletpl/autoscaletpl.component.html | 4 ++-- .../app/admin/autoscaletpl/autoscaletpl.component.ts | 2 +- .../create-edit-autoscaletpl.component.html | 8 ++++---- .../list-autoscaletpl/list-autoscaletpl.component.html | 8 ++++---- .../trash-autoscaletpl.component.html | 8 ++++---- src/frontend/src/assets/i18n/zh-Hans.json | 9 +++++++++ 11 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.html b/src/frontend/src/app/admin/autoscale/autoscale.component.html index bbfa1cc18..7a4ced9c4 100644 --- a/src/frontend/src/app/admin/autoscale/autoscale.component.html +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.html @@ -1,11 +1,11 @@
-

HPA 列表

+

{{'HPA_ADMIN.HPA_LIST' | translate}}

- +
diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html index cec8a5edf..99378bc85 100644 --- a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.html @@ -24,17 +24,17 @@

{{title}}

pattern="[a-z]([-a-z0-9]*[a-z0-9])?" (keyup)='handleValidation()'> - 服务名称不符合规范，验证规则[a-z]([-a-z0-9]*[a-z0-9])? + {{'TIP.REGULAR_NAME' | translate}}
- +
- +
- +
- - + +
diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html index 04748032a..f0b8623ad 100644 --- a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html +++ b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html @@ -6,7 +6,7 @@ - 名称 + {{'TITLE.NAME' | translate}} @@ -16,18 +16,18 @@ - 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} - + {{template.id}} {{template.name}} diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html index 1b887379f..6863e09e5 100644 --- a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html +++ b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html @@ -1,7 +1,7 @@
-

已删除 HPA 模版列表

+

{{'HPA_ADMIN.HPA_TEMPLATE_DELETE_LIST' | translate}}

@@ -11,7 +11,7 @@

已删除 HPA 模版列表

 - 名称 + {{'TITLE.NAME' | translate}} @@ -21,12 +21,12 @@

已删除 HPA 模版列表

 - 创建者 + {{'TITLE.CREATE_USER' | translate}} - 创建时间 + {{'TITLE.CREATE_TIME' | translate}} diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 40ff62490..e48171899 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -90,6 +90,15 @@ "VIEW_STATUS": "查看 HPA 状态" } }, + "HPA_ADMIN": { + "RULE": "HPA 名称不符合规范，验证规则", + "CREATE_HPA": "创建 HPA", + "HPA_LIST": "HPA 列表", + "HPA_DELETE_LIST": "已删除 HPA 列表", + "CREATE_HPA_TEMPLATE": "创建 HPA 模板", + "HPA_TEMPLATE_LIST": "HPA 模板列表", + "HPA_TEMPLATE_DELETE_LIST": "已删除 HPA 模板列表" + }, "COPY": { "SEARCH_COMMAND": "复制查询命令", "SUCCESS": "复制成功" From 34145e65abe3473d9a06bb83d5220daf5ffba3e7 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 19:29:52 +0800 Subject: [PATCH 038/112] frontend:update frontend lib --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index 33779a137..9ab7fafc8 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 33779a137e2be48d202f627fcd9898bb1f544a41 +Subproject commit 9ab7fafc817b5d82fe3bb63e818434d91922aa8e From 3cfca1e8db635830e6ed82aaf6cc1eaf3ea1a8d0 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 25 Jan 2019 19:34:24 +0800 Subject: [PATCH 039/112] frontend:fix create HPA bug --- .../create-edit-autoscale/create-edit-autoscale.component.ts | 2 +- .../src/app/shared/base/admin-resource/create-edit-resource.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts index 69376a074..8ab631a99 100644 --- a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts @@ -18,7 +18,7 @@ export class CreateEditAutoscaleComponent extends CreateEditResourceComponent { public appService: AppService, public aceEditorService: AceEditorService, public messageHandlerService: MessageHandlerService) { - super(resourceService, appService, aceEditorService, messageHandlerService, Autoscale, defaultAutoscale, 'hpa'); + super(resourceService, appService, aceEditorService, messageHandlerService, Autoscale, 'hpa'); } } diff --git a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts index 3a0df5b07..52cde6378 100644 --- a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts @@ -35,7 +35,6 @@ export class CreateEditResourceComponent implements OnInit { public aceEditorService: AceEditorService, public messageHandlerService: MessageHandlerService, public resource: any, - public defaultKubeResource: any, public resourceType: string) { } @@ -68,7 +67,7 @@ export class CreateEditResourceComponent implements OnInit { } else { this.actionType = ActionType.ADD_NEW; this.title = `创建 {this.resourceType}`; - this.resource = JSON.parse(this.defaultKubeResource); + this.resource = {}; this.initJsonEditor(); } } From 7a076a3f3f9f764405ef888810ca6204ddec300d Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Mon, 28 Jan 2019 14:52:08 +0800 Subject: [PATCH 040/112] frontend: ui fix --- .../src/app/shared/auth-module/sign-in/sign-in.component.scss | 1 + .../src/app/shared/filter-box/filter-box.component.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.scss b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.scss index 04390eabb..b945c52dc 100644 --- a/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.scss +++ b/src/frontend/src/app/shared/auth-module/sign-in/sign-in.component.scss @@ -3,6 +3,7 @@ max-height: 453px; overflow: auto; margin-top: 10%; + margin-left: auto; margin-right: 15%; padding: 10px 50px 20px 50px; background-color: #fff; diff --git a/src/frontend/src/app/shared/filter-box/filter-box.component.scss b/src/frontend/src/app/shared/filter-box/filter-box.component.scss index 5935cbfe3..024920114 100644 --- a/src/frontend/src/app/shared/filter-box/filter-box.component.scss +++ b/src/frontend/src/app/shared/filter-box/filter-box.component.scss @@ -8,7 +8,7 @@ position: absolute; right: -200px; top: -12px; - z-index: 10; + z-index: 520; &:before { content: ''; From cdec9f420932caf6b91cb2b336e7579b87a0d16c Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Mon, 28 Jan 2019 15:15:35 +0800 Subject: [PATCH 041/112] frontend: adapt bootstrap ui --- .../app/admin/apikey/apikey.component.html | 8 +-- .../create-edit-apikey.component.html | 38 ++++++------ .../token-detail/token-detail.component.html | 2 +- .../src/app/admin/app/app.component.html | 8 +-- .../create-edit-app.component.html | 8 +-- .../app/trash-app/trash-app.component.html | 6 +- .../admin/auditlog/auditlog.component.html | 6 +- .../app/admin/cluster/cluster.component.html | 8 +-- .../create-edit-cluster.component.html | 12 ++-- .../trash-cluster.component.html | 6 +- .../app/admin/config/config.component.html | 8 +-- .../create-edit-config.component.html | 4 +- .../config-system.component.html | 6 +- .../admin/configmap/configmap.component.html | 8 +-- .../create-edit-configmap.component.html | 8 +-- .../trash-configmap.component.html | 6 +- .../configmaptpl/configmaptpl.component.html | 8 +-- .../create-edit-configmaptpl.component.html | 6 +- .../trash-configmaptpl.component.html | 6 +- .../create-edit-cronjob.component.html | 8 +-- .../app/admin/cronjob/cronjob.component.html | 8 +-- .../trash-cronjob.component.html | 6 +- .../create-edit-cronjobtpl.component.html | 6 +- .../cronjobtpl/cronjobtpl.component.html | 8 +-- .../trash-cronjobtpl.component.html | 6 +- .../create-edit-daemonset.component.html | 8 +-- .../admin/daemonset/daemonset.component.html | 8 +-- .../trash-daemonset.component.html | 6 +- .../create-edit-daemonsettpl.component.html | 6 +- .../daemonsettpl/daemonsettpl.component.html | 8 +-- .../trash-daemonsettpl.component.html | 6 +- .../create-edit-deployment.component.html | 8 +-- .../deployment/deployment.component.html | 8 +-- .../trash-deployment.component.html | 6 +- .../create-edit-deploymenttpl.component.html | 6 +- .../deploymenttpl.component.html | 8 +-- .../trash-deploymenttpl.component.html | 6 +- .../create-edit-group.component.html | 8 +-- .../src/app/admin/group/group.component.html | 8 +-- .../create-edit-ingress.component.html | 8 +-- .../app/admin/ingress/ingress.component.html | 8 +-- .../trash-ingress.component.html | 6 +- .../create-edit-ingresstpl.component.html | 6 +- .../ingresstpl/ingresstpl.component.html | 8 +-- .../trash-ingresstpl.component.html | 6 +- .../deployment/kube-deployment.component.html | 6 +- .../kube-migration-deployment.component.html | 4 +- .../namespace/kube-namespace.component.html | 4 +- .../kubernetes/node/nodes.component.html | 4 +- ...reate-edit-persistentvolume.component.html | 58 +++++++++---------- .../persistentvolume.component.html | 4 +- .../create-edit-namespace.component.html | 10 ++-- .../admin/namespace/namespace.component.html | 8 +-- .../trash-namespace.component.html | 6 +- .../create-notification.component.html | 4 +- .../notification/notification.component.html | 8 +-- .../create-edit-permission.component.html | 6 +- .../permission/permission.component.html | 8 +-- ...-edit-persistentvolumeclaim.component.html | 8 +-- .../persistentvolumeclaim.component.html | 8 +-- ...trash-persistentvolumeclaim.component.html | 6 +- ...it-persistentvolumeclaimtpl.component.html | 6 +- .../persistentvolumeclaimtpl.component.html | 8 +-- ...sh-persistentvolumeclaimtpl.component.html | 6 +- .../app/app-reportform.component.html | 6 +- .../reportform/deploy/deploy.component.html | 8 +-- .../overview/overview.component.html | 8 +-- .../admin/reportform/overview/overview.scss | 2 +- .../create-edit-secret.component.html | 8 +-- .../app/admin/secret/secret.component.html | 8 +-- .../trash-secret/trash-secret.component.html | 6 +- .../create-edit-secrettpl.component.html | 6 +- .../admin/secrettpl/secrettpl.component.html | 8 +-- .../trash-secrettpl.component.html | 6 +- .../create-edit-statefulset.component.html | 8 +-- .../statefulset/statefulset.component.html | 8 +-- .../trash-statefulset.component.html | 6 +- .../create-edit-statefulsettpl.component.html | 6 +- .../statefulsettpl.component.html | 8 +-- .../trash-statefulsettpl.component.html | 6 +- .../create-edit-user.component.html | 6 +- .../reset-password.component.html | 4 +- .../src/app/admin/user/user.component.html | 8 +-- .../portal/app-apikey/apikey.component.html | 6 +- .../create-edit-apikey.component.html | 26 ++++----- .../token-detail/token-detail.component.html | 2 +- .../portal/app-user/app-user.component.html | 6 +- .../create-edit-app-user.component.html | 4 +- .../app-webhook/app-webhook.component.html | 6 +- .../create-edit-app-webhook.component.html | 8 +-- .../src/app/portal/app/app.component.html | 6 +- .../create-edit-app.component.html | 6 +- .../app/detail-app/detail-app.component.html | 40 ++++++------- .../app/portal/app/detail-app/detail-app.scss | 2 +- .../create-edit-autoscale.component.html | 6 +- .../create-edit-autoscaletpl.component.html | 16 ++--- .../publish-tpl/publish-tpl.component.html | 4 +- .../autoscale/status/status.component.html | 24 ++++---- .../create-edit-configmap.component.html | 4 +- .../create-edit-configmaptpl.component.html | 10 ++-- .../publish-tpl/publish-tpl.component.html | 4 +- .../create-edit-cronjob.component.html | 6 +- .../create-edit-cronjobtpl.component.html | 42 +++++++------- .../app/portal/cronjob/cronjob.component.html | 2 +- .../publish-tpl/publish-tpl.component.html | 4 +- .../create-edit-daemonset.component.html | 6 +- .../create-edit-daemonsettpl.component.html | 50 ++++++++-------- .../publish-tpl/publish-tpl.component.html | 4 +- .../create-edit-deployment.component.html | 6 +- .../create-edit-deploymenttpl.component.html | 58 +++++++++---------- .../publish-tpl/publish-tpl.component.html | 4 +- .../src/app/portal/index/index.component.html | 8 +-- .../create-edit-ingress.component.html | 6 +- .../create-edit-ingresstpl.component.html | 28 ++++----- .../publish-tpl/publish-tpl.component.html | 4 +- .../ingress/status/status.component.html | 20 +++---- .../namespace-apikey/apikey.component.html | 6 +- .../create-edit-apikey.component.html | 26 ++++----- .../token-detail/token-detail.component.html | 2 +- .../history/history.component.html | 4 +- .../namespace-report.component.html | 6 +- .../overview/overview.component.html | 26 ++++----- .../overview/overview.component.scss | 2 +- .../resource/resource.component.html | 6 +- .../create-edit-namespace-user.component.html | 4 +- .../namespace-user.component.html | 6 +- ...eate-edit-namespace-webhook.component.html | 8 +-- .../namespace-webhook.component.html | 6 +- ...-edit-persistentvolumeclaim.component.html | 4 +- ...it-persistentvolumeclaimtpl.component.html | 20 +++---- .../create-snapshot.component.html | 2 +- .../publish-tpl/publish-tpl.component.html | 4 +- .../create-edit-secret.component.html | 4 +- .../create-edit-secrettpl.component.html | 10 ++-- .../publish-tpl/publish-tpl.component.html | 4 +- .../create-edit-statefulset.component.html | 6 +- .../create-edit-statefulsettpl.component.html | 50 ++++++++-------- .../publish-tpl/publish-tpl.component.html | 4 +- .../resource-limit.component.html | 10 ++-- .../dual-list-box.component.html | 16 ++--- src/frontend/src/component/table.scss | 2 +- 141 files changed, 655 insertions(+), 655 deletions(-) diff --git a/src/frontend/src/app/admin/apikey/apikey.component.html b/src/frontend/src/app/admin/apikey/apikey.component.html index 3a5e2c28c..7acf1bdf5 100644 --- a/src/frontend/src/app/admin/apikey/apikey.component.html +++ b/src/frontend/src/app/admin/apikey/apikey.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

APIKey列表

-
+

size="45"> -
-
+
+
-
+
{{title}}

size="45"> -
-
+
+
-
+
{{title}}

size="45"> -
-
+
+
-
+
diff --git a/src/frontend/src/app/admin/config/list-config-system/config-system.component.html b/src/frontend/src/app/admin/config/list-config-system/config-system.component.html index f80984d56..6609396d5 100644 --- a/src/frontend/src/app/admin/config/list-config-system/config-system.component.html +++ b/src/frontend/src/app/admin/config/list-config-system/config-system.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

系统配置信息

diff --git a/src/frontend/src/app/admin/configmap/configmap.component.html b/src/frontend/src/app/admin/configmap/configmap.component.html index d411ac0bc..f988abd2d 100644 --- a/src/frontend/src/app/admin/configmap/configmap.component.html +++ b/src/frontend/src/app/admin/configmap/configmap.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

配置集列表

-
+

- +
+ class="clr-col-md-3 form-group-label-override">{{'TITLE.DESCRIPTION' | translate}}
- +
diff --git a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html index 1adc2ea67..17f070057 100644 --- a/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html +++ b/src/frontend/src/app/admin/configmaptpl/trash-configmaptpl/trash-configmaptpl.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

已删除配置集模版列表

diff --git a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html index e1fba64b4..8bf8663a9 100644 --- a/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html +++ b/src/frontend/src/app/admin/cronjob/create-edit-cronjob/create-edit-cronjob.component.html @@ -4,7 +4,7 @@

{{title}}

- +
{{title}}

- +
+ class="clr-col-md-3 form-group-label-override">{{'TITLE.DESCRIPTION' | translate}}
- +
diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html index 5f5d5736d..2a646043e 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

{{'CRONJOB.LIST' | translate}}

-
+

- +
+ class="clr-col-md-3 form-group-label-override">{{'TITLE.DESCRIPTION' | translate}} diff --git a/src/frontend/src/app/admin/daemonset/daemonset.component.html b/src/frontend/src/app/admin/daemonset/daemonset.component.html index 4db2d07fd..b182efa4a 100644 --- a/src/frontend/src/app/admin/daemonset/daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/daemonset.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

{{'DAEMONSET_ADMIN.DAEMONSET_LIST' | translate}}

-
+
diff --git a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html index 93a85991e..698454a1e 100644 --- a/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html +++ b/src/frontend/src/app/admin/ingresstpl/trash-ingresstpl/trash-ingresstpl.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

已删除 Ingress 模版列表

diff --git a/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.html b/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.html index 72e113120..1eb754758 100644 --- a/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.html +++ b/src/frontend/src/app/admin/kubernetes/deployment/kube-deployment.component.html @@ -1,5 +1,5 @@ -
-
+
+

size="45"> -
-
+
+
-
+
{{title}}[{{cluster?.name}}]

size="45"> -
-
+
+
-
+
{{title}}[{{cluster?.name}}]

-
+ [formGroupName]="i" class="form-group clr-row"> +
-
+
-
+
@@ -85,25 +85,25 @@

{{title}}[{{cluster?.name}}]

-
-
+
+
-
+
-
+
Gi
-
-
+
+
-
- @@ -118,11 +118,11 @@

{{title}}[{{cluster?.name}}]

 -
diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html index 199312053..bc1f6521e 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.html b/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.html index c571f6eb9..f850b0f72 100644 --- a/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.html +++ b/src/frontend/src/app/admin/namespace/create-edit-namespace/create-edit-namespace.component.html @@ -6,7 +6,7 @@

{{nsTitle}}
- +
- + {{nsTitle}}

- +
{{nsTitle}}
- + {{nsTitle}}
+ class="clr-col-md-3 form-group-label-override">Secret -
-
+
+
+

命名空间列表

-
+
- - -
-
+

{{selectedText}}

Date: Mon, 28 Jan 2019 16:39:40 +0800 Subject: [PATCH 042/112] frontend: form checkbox adapt --- ...reate-edit-persistentvolume.component.html | 10 ------- ...it-persistentvolumeclaimtpl.component.html | 26 +++++-------------- src/frontend/src/styles.scss | 1 + 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html index 6978c21e3..e5b4a2693 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component.html @@ -103,9 +103,6 @@

{{title}}[{{cluster?.name}}]

- @@ -118,13 +115,6 @@

{{title}}[{{cluster?.name}}]

 -
diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html index 4b4f722a3..488a0fad7 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.html @@ -34,30 +34,16 @@

{{'PVC.CREATE_TMP' | translate}}

- - - + + - - + + - - + +
diff --git a/src/frontend/src/styles.scss b/src/frontend/src/styles.scss index 2c4ae9f0b..8f375e8a0 100644 --- a/src/frontend/src/styles.scss +++ b/src/frontend/src/styles.scss @@ -270,3 +270,4 @@ a { @import "./component/pagination"; @import "./component/dropdown"; @import "./component/hack"; +@import "./component/form.scss"; From e692afae8514dd6612799b06d3db211b8028bc5e Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Mon, 28 Jan 2019 16:44:13 +0800 Subject: [PATCH 043/112] frontend: add form scss --- src/frontend/src/component/form.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/frontend/src/component/form.scss diff --git a/src/frontend/src/component/form.scss b/src/frontend/src/component/form.scss new file mode 100644 index 000000000..81e463bb8 --- /dev/null +++ b/src/frontend/src/component/form.scss @@ -0,0 +1,12 @@ +.form .form-group.clr-row, form .form-group.clr-row { + padding-left: 0; + position: static; +} + +form .form-group > label:first-child.required:after, form .form-group > span:first-child.required:after, form .form-group.clr-row > [class*='clr-col-'] > label.required:after, form .form-group.clr-row > [class*='clr-col-'] > span.required:after, .form .form-group > label:first-child.required:after, .form .form-group > span:first-child.required:after, .form .form-group.clr-row > [class*='clr-col-'] > label.required:after, .form .form-group.clr-row > [class*='clr-col-'] > span.required:after { + content: '*'; + font-size: 0.58479532rem; + line-height: 0.5rem; + color: #c92100; + margin-left: 0.25rem; +} \ No newline at end of file From 0cd13f221e89683a5e6e111545f1bf8aa568a37f Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Mon, 28 Jan 2019 17:15:00 +0800 Subject: [PATCH 044/112] frontend:fix for tslint --- src/frontend/src/app/admin/admin-routing.module.ts | 2 +- src/frontend/src/app/admin/admin.module.ts | 4 +++- src/frontend/src/app/admin/autoscale/autoscale.component.ts | 2 +- src/frontend/src/app/shared/client/v1/autoscale.service.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 05145c835..94ed7fb60 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -67,7 +67,7 @@ import { KubeNamespaceComponent } from './kubernetes/namespace/kube-namespace.co import { AutoscaleComponent } from './autoscale/autoscale.component'; import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autoscale.component'; import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; -import {TrashAutoscaletplComponent} from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; +import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; const routes: Routes = [ diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index ae5a3b9c3..977dca498 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -92,7 +92,9 @@ import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/tr AdminAuthCheckGuard, AuthService ], - declarations: [AdminComponent, AutoscaleComponent, AutoscaletplComponent, CreateEditAutoscaleComponent, ListAutoscaleComponent, TrashAutoscaleComponent, CreateEditAutoscaletplComponent, ListAutoscaletplComponent, TrashAutoscaletplComponent] + declarations: [AdminComponent, AutoscaleComponent, AutoscaletplComponent, + CreateEditAutoscaleComponent, ListAutoscaleComponent, TrashAutoscaleComponent, + CreateEditAutoscaletplComponent, ListAutoscaletplComponent, TrashAutoscaletplComponent] }) export class AdminModule { } diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.ts b/src/frontend/src/app/admin/autoscale/autoscale.component.ts index 9eb57bee8..1584ac6f7 100644 --- a/src/frontend/src/app/admin/autoscale/autoscale.component.ts +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ResourceComponent } from '../../shared/base/admin-resource/resource'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { BreadcrumbService } from '../../shared/client/v1/breadcrumb.service'; diff --git a/src/frontend/src/app/shared/client/v1/autoscale.service.ts b/src/frontend/src/app/shared/client/v1/autoscale.service.ts index 0d5579ad4..7931e38ba 100644 --- a/src/frontend/src/app/shared/client/v1/autoscale.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscale.service.ts @@ -15,7 +15,7 @@ export class AutoscaleService { } getNames(appId?: number): Observable { - let params = new HttpParams(); + const params = new HttpParams(); if (typeof(appId) === 'undefined') { appId = 0; } From 1effe24de4012441f1d8957ebe48630ea13286d5 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 16:20:42 +0800 Subject: [PATCH 045/112] frontend: update frontend-plugin --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index e18125f2c..f451003e4 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit e18125f2c6a4b87deb1107dde75d46c3d8898ff7 +Subproject commit f451003e45d4cda8f47d5cf7e3750654688cd956 From fbe3d735c0d19248ac12938d6e3642b12ff0ab0f Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 17:28:00 +0800 Subject: [PATCH 046/112] frontend: hpa adapt --- .../admin/autoscale/autoscale.component.html | 8 +++---- .../list-autoscale.component.html | 17 +++++++------- .../trash-autoscale.component.html | 23 ++++++++++--------- .../autoscaletpl/autoscaletpl.component.html | 8 +++---- .../list-autoscaletpl.component.html | 18 +++++++-------- .../trash-autoscaletpl.component.html | 23 ++++++++++--------- .../admin-resource/list-resource-template.ts | 8 +++---- .../base/admin-resource/list-resource.ts | 8 +++---- .../base/admin-resource/resource-template.ts | 4 ++-- .../shared/base/admin-resource/resource.ts | 4 ++-- .../admin-resource/trash-resource-template.ts | 6 ++--- .../base/admin-resource/trash-resource.ts | 6 ++--- 12 files changed, 68 insertions(+), 65 deletions(-) diff --git a/src/frontend/src/app/admin/autoscale/autoscale.component.html b/src/frontend/src/app/admin/autoscale/autoscale.component.html index 7a4ced9c4..d25640d83 100644 --- a/src/frontend/src/app/admin/autoscale/autoscale.component.html +++ b/src/frontend/src/app/admin/autoscale/autoscale.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

{{'HPA_ADMIN.HPA_LIST' | translate}}

-
+
diff --git a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html index e80b2b467..64d417336 100644 --- a/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html +++ b/src/frontend/src/app/admin/autoscale/list-autoscale/list-autoscale.component.html @@ -51,12 +51,13 @@ {{resource.user}} {{resource.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + + diff --git a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html index 1bb82ba25..ace22a21a 100644 --- a/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html +++ b/src/frontend/src/app/admin/autoscale/trash-autoscale/trash-autoscale.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

{{'HPA_ADMIN.HPA_DELETE_LIST' | translate}}

@@ -50,14 +50,15 @@

{{'HPA_ADMIN.HPA_DELETE_LIST' | translate}}

{{resource.user}} {{resource.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + +
diff --git a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html index 7b38b145a..80d1a76db 100644 --- a/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html +++ b/src/frontend/src/app/admin/autoscaletpl/autoscaletpl.component.html @@ -1,9 +1,9 @@ -
-
-
+
+
+

{{'HPA_ADMIN.HPA_TEMPLATE_LIST' | translate}}

-
+
diff --git a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html index f0b8623ad..147cbc821 100644 --- a/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html +++ b/src/frontend/src/app/admin/autoscaletpl/list-autoscaletpl/list-autoscaletpl.component.html @@ -35,13 +35,13 @@ {{template.user}} {{template.createTime | date:'yyyy-MM-dd HH:mm'}} - - - - + + + + diff --git a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html index 6863e09e5..c32ba71ff 100644 --- a/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html +++ b/src/frontend/src/app/admin/autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

{{'HPA_ADMIN.HPA_TEMPLATE_DELETE_LIST' | translate}}

@@ -41,14 +41,15 @@

{{'HPA_ADMIN.HPA_TEMPLATE_DELETE_LIST' | translate}}{{tpl.user}} {{tpl.createTime | date:'yyyy-MM-dd HH:mm'}} - - - + + + +

diff --git a/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts index 70bf51f08..bc29d21f0 100644 --- a/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts +++ b/src/frontend/src/app/shared/base/admin-resource/list-resource-template.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../page/page-state'; export class ListResourceTemplateComponent implements OnInit { @@ -9,9 +9,9 @@ export class ListResourceTemplateComponent implements OnInit { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -29,7 +29,7 @@ export class ListResourceTemplateComponent implements OnInit { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/shared/base/admin-resource/list-resource.ts b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts index 74c5c0b07..cbb43fed7 100644 --- a/src/frontend/src/app/shared/base/admin-resource/list-resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts @@ -1,6 +1,6 @@ import { EventEmitter, Input, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { BreadcrumbService } from '../../../shared/client/v1/breadcrumb.service'; import { Page } from '../../page/page-state'; import { AceEditorService } from '../../ace-editor/ace-editor.service'; @@ -11,9 +11,9 @@ export class ListResourceComponent { @Input() page: Page; currentPage = 1; - state: State; + state: ClrDatagridStateInterface; - @Output() paginate = new EventEmitter(); + @Output() paginate = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() edit = new EventEmitter(); @@ -35,7 +35,7 @@ export class ListResourceComponent { this.paginate.emit(this.state); } - refresh(state: State) { + refresh(state: ClrDatagridStateInterface) { this.state = state; this.paginate.emit(state); } diff --git a/src/frontend/src/app/shared/base/admin-resource/resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts index 4569d26c8..616f3795f 100644 --- a/src/frontend/src/app/shared/base/admin-resource/resource-template.ts +++ b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts @@ -1,7 +1,7 @@ import { OnInit, OnDestroy, ViewChild } from '@angular/core'; import { BreadcrumbService } from '../../client/v1/breadcrumb.service'; import { Router, ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; @@ -69,7 +69,7 @@ export class ResourceTemplateComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/shared/base/admin-resource/resource.ts b/src/frontend/src/app/shared/base/admin-resource/resource.ts index 353c59c3a..5ad11c185 100644 --- a/src/frontend/src/app/shared/base/admin-resource/resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/resource.ts @@ -1,6 +1,6 @@ import { ViewChild, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { Subscription } from 'rxjs/Subscription'; import { PageState } from '../../page/page-state'; import { BreadcrumbService } from '../../client/v1/breadcrumb.service'; @@ -67,7 +67,7 @@ export class ResourceComponent implements OnInit, OnDestroy { } } - retrieve(state?: State): void { + retrieve(state?: ClrDatagridStateInterface): void { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } diff --git a/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts index ec5c77aba..8d4e9f491 100644 --- a/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts +++ b/src/frontend/src/app/shared/base/admin-resource/trash-resource-template.ts @@ -1,5 +1,5 @@ import { OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../message-handler/message-handler.service'; import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; @@ -14,7 +14,7 @@ export class TrashResourceTemplateComponent implements OnInit, OnDestroy { templates: any[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -61,7 +61,7 @@ export class TrashResourceTemplateComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); diff --git a/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts b/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts index 4caba82ad..9a98b153b 100644 --- a/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/trash-resource.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { State } from '@clr/angular'; +import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../message-handler/message-handler.service'; import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared.const'; @@ -14,7 +14,7 @@ export class TrashResourceComponent implements OnInit, OnDestroy { resources: any[]; pageState: PageState = new PageState(); currentPage = 1; - state: State; + state: ClrDatagridStateInterface; subscription: Subscription; @@ -59,7 +59,7 @@ export class TrashResourceComponent implements OnInit, OnDestroy { this.refresh(this.state); } - refresh(state?: State) { + refresh(state?: ClrDatagridStateInterface) { if (state) { this.state = state; this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); From d3951795686058f9943e7ff4f675e217c22c1665 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 17:55:58 +0800 Subject: [PATCH 047/112] frontend: add throwError from rxjs --- .../app/shared/client/v1/apikey.service.ts | 11 +++++---- .../app/shared/client/v1/app-user.service.ts | 11 +++++---- .../src/app/shared/client/v1/app.service.ts | 17 +++++++------- .../shared/client/v1/appstarred.service.ts | 5 ++-- .../app/shared/client/v1/auditlog.service.ts | 3 ++- .../src/app/shared/client/v1/auth.service.ts | 3 ++- .../app/shared/client/v1/autoscale.service.ts | 15 ++++++------ .../shared/client/v1/autoscaletpl.service.ts | 11 +++++---- .../client/v1/available-port.service.ts | 15 ++++++------ .../app/shared/client/v1/cluster.service.ts | 13 ++++++----- .../app/shared/client/v1/config.service.ts | 13 ++++++----- .../app/shared/client/v1/configmap.service.ts | 15 ++++++------ .../shared/client/v1/configmaptpl.service.ts | 11 +++++---- .../app/shared/client/v1/cronjob.service.ts | 15 ++++++------ .../shared/client/v1/cronjobtpl.service.ts | 11 +++++---- .../app/shared/client/v1/daemonset.service.ts | 15 ++++++------ .../shared/client/v1/daemonsettpl.service.ts | 11 +++++---- .../shared/client/v1/deployment.service.ts | 15 ++++++------ .../shared/client/v1/deploymenttpl.service.ts | 11 +++++---- .../app/shared/client/v1/edge-node.service.ts | 13 ++++++----- .../src/app/shared/client/v1/group.service.ts | 13 ++++++----- .../app/shared/client/v1/ingress.service.ts | 15 ++++++------ .../shared/client/v1/ingresstpl.service.ts | 11 +++++---- .../shared/client/v1/kubernetes/autoscale.ts | 7 +++--- .../app/shared/client/v1/kubernetes/common.ts | 13 ++++++----- .../shared/client/v1/kubernetes/configmap.ts | 7 +++--- .../shared/client/v1/kubernetes/cronjob.ts | 9 ++++---- .../shared/client/v1/kubernetes/daemonset.ts | 7 +++--- .../shared/client/v1/kubernetes/deployment.ts | 13 ++++++----- .../shared/client/v1/kubernetes/ingress.ts | 7 +++--- .../app/shared/client/v1/kubernetes/job.ts | 7 +++--- .../app/shared/client/v1/kubernetes/log.ts | 3 ++- .../shared/client/v1/kubernetes/namespace.ts | 17 +++++++------- .../app/shared/client/v1/kubernetes/node.ts | 11 +++++---- .../v1/kubernetes/persistentvolume-robin.ts | 5 ++-- .../client/v1/kubernetes/persistentvolume.ts | 11 +++++---- .../persistentvolumeclaims-robin.ts | 23 ++++++++++--------- .../v1/kubernetes/persistentvolumeclaims.ts | 7 +++--- .../app/shared/client/v1/kubernetes/pod.ts | 13 ++++++----- .../app/shared/client/v1/kubernetes/secret.ts | 7 +++--- .../client/v1/kubernetes/statefulset.ts | 7 +++--- .../client/v1/namespace-user.service.ts | 11 +++++---- .../app/shared/client/v1/namespace.service.ts | 15 ++++++------ .../shared/client/v1/notification.service.ts | 11 +++++---- .../shared/client/v1/permission.service.ts | 13 ++++++----- .../v1/persistentvolumeclaim.service.ts | 15 ++++++------ .../v1/persistentvolumeclaimtpl.service.ts | 13 ++++++----- .../app/shared/client/v1/public.service.ts | 3 ++- .../app/shared/client/v1/publish.service.ts | 5 ++-- .../shared/client/v1/publishstatus.service.ts | 5 ++-- .../app/shared/client/v1/secret.service.ts | 15 ++++++------ .../app/shared/client/v1/secrettpl.service.ts | 13 ++++++----- .../shared/client/v1/statefulset.service.ts | 15 ++++++------ .../client/v1/statefulsettpl.service.ts | 11 +++++---- .../app/shared/client/v1/used-port.service.ts | 9 ++++---- .../src/app/shared/client/v1/user.service.ts | 19 +++++++-------- 56 files changed, 338 insertions(+), 282 deletions(-) diff --git a/src/frontend/src/app/shared/client/v1/apikey.service.ts b/src/frontend/src/app/shared/client/v1/apikey.service.ts index 789fe46d8..9ead548aa 100644 --- a/src/frontend/src/app/shared/client/v1/apikey.service.ts +++ b/src/frontend/src/app/shared/client/v1/apikey.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { throwError } from 'rxjs'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; @@ -49,7 +50,7 @@ export class ApiKeyService { return this.http .get(this.buildAPIKeyUrl(namespaceId, appId), {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } buildAPIKeyUrl(namespaceId?: number, appId?: number): string { @@ -67,14 +68,14 @@ export class ApiKeyService { return this.http .post(this.buildAPIKeyUrl(namespaceId, appId), apiKey, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(apiKey: ApiKey, namespaceId?: number, appId?: number): Observable { return this.http .put(`${this.buildAPIKeyUrl(namespaceId, appId)}/${apiKey.id}`, apiKey, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, logical?: boolean, namespaceId?: number, appId?: number): Observable { @@ -88,12 +89,12 @@ export class ApiKeyService { return this.http .delete(`${this.buildAPIKeyUrl(namespaceId, appId)}/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, namespaceId?: number, appId?: number): Observable { return this.http.get(`${this.buildAPIKeyUrl(namespaceId, appId)}/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/app-user.service.ts b/src/frontend/src/app/shared/client/v1/app-user.service.ts index de0a6f765..f61781b99 100644 --- a/src/frontend/src/app/shared/client/v1/app-user.service.ts +++ b/src/frontend/src/app/shared/client/v1/app-user.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { throwError } from 'rxjs'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; @@ -58,31 +59,31 @@ export class AppUserService { } return this.http.get(`/api/v1/apps/${appId}/users`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(appUser: AppUser): Observable { return this.http.post(`/api/v1/apps/${appUser.app.id}/users`, appUser, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(appUser: AppUser): Observable { return this.http.put(`/api/v1/apps/${appUser.app.id}/users/${appUser.id}`, appUser, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number): Observable { const options: any = {}; return this.http.delete(`/api/v1/apps/${appId}/users/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http.get(`/api/v1/apps/${appId}/users/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/app.service.ts b/src/frontend/src/app/shared/client/v1/app.service.ts index e0d996b57..d6c7c9f8b 100644 --- a/src/frontend/src/app/shared/client/v1/app.service.ts +++ b/src/frontend/src/app/shared/client/v1/app.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { throwError } from 'rxjs'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; @@ -57,7 +58,7 @@ export class AppService { return this.http .get(`/api/v1/namespaces/${namespaceId}/apps`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listResourceCount(namespaceId?: number, appId?: number): Observable { @@ -73,7 +74,7 @@ export class AppService { return this.http .get(`/api/v1/namespaces/${namespaceId}/statistics`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNames(namespaceId?: number): Observable { @@ -83,21 +84,21 @@ export class AppService { return this.http .get(`/api/v1/namespaces/${namespaceId}/apps/names`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(app: App): Observable { return this.http .post(`/api/v1/namespaces/${app.namespace.id}/apps`, app, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(app: App): Observable { return this.http .put(`/api/v1/namespaces/${app.namespace.id}/apps/${app.id}`, app, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, namespaceId: number, logical?: boolean): Observable { @@ -111,18 +112,18 @@ export class AppService { return this.http .delete(`/api/v1/namespaces/${namespaceId}/apps/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, namespaceId: number): Observable { return this.http.get(`/api/v1/namespaces/${namespaceId}/apps/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getStatistics(): Observable { return this.http.get(`/api/v1/apps/statistics`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/appstarred.service.ts b/src/frontend/src/app/shared/client/v1/appstarred.service.ts index 5131c7f96..b38609a88 100644 --- a/src/frontend/src/app/shared/client/v1/appstarred.service.ts +++ b/src/frontend/src/app/shared/client/v1/appstarred.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { throwError } from 'rxjs'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; @@ -18,14 +19,14 @@ export class AppStarredService { return this.http .post(`/api/v1/apps/stars`, app, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByAppId(appId: number): Observable { return this.http .delete(`/api/v1/apps/stars/${appId}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/auditlog.service.ts b/src/frontend/src/app/shared/client/v1/auditlog.service.ts index 880027315..cb05eb113 100644 --- a/src/frontend/src/app/shared/client/v1/auditlog.service.ts +++ b/src/frontend/src/app/shared/client/v1/auditlog.service.ts @@ -3,6 +3,7 @@ import { Observable } from 'rxjs/Observable'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class AuditLogService { @@ -42,6 +43,6 @@ export class AuditLogService { return this.http .get('/api/v1/auditlogs', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/auth.service.ts b/src/frontend/src/app/shared/client/v1/auth.service.ts index 51cdf3861..512aca575 100644 --- a/src/frontend/src/app/shared/client/v1/auth.service.ts +++ b/src/frontend/src/app/shared/client/v1/auth.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class AuthoriseService { @@ -15,6 +16,6 @@ export class AuthoriseService { const encodedPassword = encodeURIComponent(password); return this.http .post(`/login/${type}?username=${encodedName}&password=${encodedPassword}`, null, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/autoscale.service.ts b/src/frontend/src/app/shared/client/v1/autoscale.service.ts index 7931e38ba..89c52dd4e 100644 --- a/src/frontend/src/app/shared/client/v1/autoscale.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscale.service.ts @@ -5,6 +5,7 @@ import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; import { Autoscale } from '../../model/v1/autoscale'; +import { throwError } from 'rxjs'; @Injectable() export class AutoscaleService { @@ -21,7 +22,7 @@ export class AutoscaleService { } return this.http .get(`/api/v1/apps/${appId}/hpas/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -62,25 +63,25 @@ export class AutoscaleService { } return this.http .get(`/api/v1/apps/${appId}/hpas`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(hpa: Autoscale): Observable { return this.http .post(`/api/v1/apps/${hpa.appId}/hpas`, hpa, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(hpa: Autoscale): Observable { return this.http .put(`/api/v1/apps/${hpa.appId}/hpas/${hpa.id}`, hpa, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/hpas/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -93,12 +94,12 @@ export class AutoscaleService { return this.http .delete(`/api/v1/apps/${appId}/hpas/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/hpas/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts b/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts index 1725cddab..05d40b7e3 100644 --- a/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/autoscaletpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { AutoscaleTpl } from '../../model/v1/autoscaletpl'; import { isNotEmpty } from '../../utils'; import { PageState } from '../../page/page-state'; +import { throwError } from 'rxjs'; @Injectable() export class AutoscaleTplService { @@ -52,19 +53,19 @@ export class AutoscaleTplService { return this.http .get(`/api/v1/apps/${appId}/hpas/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(autoscaletpl: AutoscaleTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/hpas/tpls`, autoscaletpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(autoscaletpl: AutoscaleTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/hpas/tpls/${autoscaletpl.id}`, autoscaletpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -77,12 +78,12 @@ export class AutoscaleTplService { return this.http .delete(`/api/v1/apps/${appId}/hpas/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/hpas/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/available-port.service.ts b/src/frontend/src/app/shared/client/v1/available-port.service.ts index 79295f2d0..f7585f8dd 100644 --- a/src/frontend/src/app/shared/client/v1/available-port.service.ts +++ b/src/frontend/src/app/shared/client/v1/available-port.service.ts @@ -7,6 +7,7 @@ import { AvailablePort } from '../../model/v1/available-port'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class AvailablePortService { @@ -20,7 +21,7 @@ export class AvailablePortService { return this.http .get(`/api/v1/services/availableports/lvs`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState): Observable { @@ -56,42 +57,42 @@ export class AvailablePortService { return this.http .get('/api/v1/services/availableports', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(availablePort: AvailablePort): Observable { return this.http .post(`/api/v1/services/availableports`, availablePort, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(availablePort: AvailablePort): Observable { return this.http .put(`/api/v1/services/availableports/${availablePort.id}`, availablePort, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number): Observable { return this.http .delete(`/api/v1/services/availableports/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number): Observable { return this.http .get(`/api/v1/services/availableports/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getByPort(port: number): Observable { return this.http .get(`/api/v1/services/availableports/port/${port}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/cluster.service.ts b/src/frontend/src/app/shared/client/v1/cluster.service.ts index 160dbf913..a416f5c8e 100644 --- a/src/frontend/src/app/shared/client/v1/cluster.service.ts +++ b/src/frontend/src/app/shared/client/v1/cluster.service.ts @@ -7,6 +7,7 @@ import { Cluster } from '../../model/v1/cluster'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class ClusterService { @@ -19,7 +20,7 @@ export class ClusterService { getNames(): Observable { return this.http .get('/api/v1/clusters/names') - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string): Observable { @@ -56,21 +57,21 @@ export class ClusterService { return this.http .get('/api/v1/clusters', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(cluster: Cluster): Observable { return this.http .post(`/api/v1/clusters`, cluster, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(cluster: Cluster): Observable { return this.http .put(`/api/v1/clusters/${cluster.name}`, cluster, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(name: string, logical?: boolean): Observable { @@ -84,14 +85,14 @@ export class ClusterService { return this.http .delete(`/api/v1/clusters/${name}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getByName(name: string): Observable { return this.http .get(`/api/v1/clusters/${name}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/config.service.ts b/src/frontend/src/app/shared/client/v1/config.service.ts index 0d1129b36..932a6b665 100644 --- a/src/frontend/src/app/shared/client/v1/config.service.ts +++ b/src/frontend/src/app/shared/client/v1/config.service.ts @@ -7,6 +7,7 @@ import { Config } from '../../model/v1/config'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class ConfigService { @@ -20,7 +21,7 @@ export class ConfigService { return this.http .get('/api/v1/configs/system') - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState): Observable { @@ -56,21 +57,21 @@ export class ConfigService { return this.http .get('/api/v1/configs', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(config: Config): Observable { return this.http .post(`/api/v1/configs`, config, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(config: Config): Observable { return this.http .put(`/api/v1/configs/${config.id}`, config, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number): Observable { @@ -79,14 +80,14 @@ export class ConfigService { return this.http .delete(`/api/v1/configs/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number): Observable { return this.http .get(`/api/v1/configs/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/configmap.service.ts b/src/frontend/src/app/shared/client/v1/configmap.service.ts index f0e6b72ba..1bbea915b 100644 --- a/src/frontend/src/app/shared/client/v1/configmap.service.ts +++ b/src/frontend/src/app/shared/client/v1/configmap.service.ts @@ -8,6 +8,7 @@ import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class ConfigMapService { @@ -25,7 +26,7 @@ export class ConfigMapService { return this.http .get(`/api/v1/apps/${appId}/configmaps/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -66,28 +67,28 @@ export class ConfigMapService { return this.http .get(`/api/v1/apps/${appId}/configmaps`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(configMap: ConfigMap): Observable { return this.http .post(`/api/v1/apps/${configMap.appId}/configmaps`, configMap, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(configMap: ConfigMap): Observable { return this.http .put(`/api/v1/apps/${configMap.appId}/configmaps/${configMap.id}`, configMap, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/configmaps/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -101,13 +102,13 @@ export class ConfigMapService { return this.http .delete(`/api/v1/apps/${appId}/configmaps/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/configmaps/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts b/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts index eb2b9b25c..8a645ed23 100644 --- a/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/configmaptpl.service.ts @@ -7,6 +7,7 @@ import { ConfigMapTpl } from '../../model/v1/configmaptpl'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class ConfigMapTplService { @@ -53,21 +54,21 @@ export class ConfigMapTplService { return this.http .get(`/api/v1/apps/${appId}/configmaps/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(configMapTpl: ConfigMapTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/configmaps/tpls`, configMapTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(configMapTpl: ConfigMapTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/configmaps/tpls/${configMapTpl.id}`, configMapTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -80,13 +81,13 @@ export class ConfigMapTplService { return this.http .delete(`/api/v1/apps/${appId}/configmaps/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/configmaps/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/cronjob.service.ts b/src/frontend/src/app/shared/client/v1/cronjob.service.ts index 11ee324f5..1f38602a8 100644 --- a/src/frontend/src/app/shared/client/v1/cronjob.service.ts +++ b/src/frontend/src/app/shared/client/v1/cronjob.service.ts @@ -8,6 +8,7 @@ import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class CronjobService { @@ -25,7 +26,7 @@ export class CronjobService { return this.http .get(`/api/v1/apps/${appId}/cronjobs/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -68,28 +69,28 @@ export class CronjobService { return this.http .get(`/api/v1/apps/${appId}/cronjobs`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(cronjob: Cronjob): Observable { return this.http .post(`/api/v1/apps/${cronjob.appId}/cronjobs`, cronjob, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(cronjob: Cronjob): Observable { return this.http .put(`/api/v1/apps/${cronjob.appId}/cronjobs/${cronjob.id}`, cronjob, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/cronjobs/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -103,13 +104,13 @@ export class CronjobService { return this.http .delete(`/api/v1/apps/${appId}/cronjobs/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/cronjobs/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts b/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts index bdf9bc2fd..ac2185c3b 100644 --- a/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/cronjobtpl.service.ts @@ -7,6 +7,7 @@ import { CronjobTpl } from '../../model/v1/cronjobtpl'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class CronjobTplService { @@ -53,21 +54,21 @@ export class CronjobTplService { return this.http .get(`/api/v1/apps/${appId}/cronjobs/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(cronjobTpl: CronjobTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/cronjobs/tpls`, cronjobTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(cronjobTpl: CronjobTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/cronjobs/tpls/${cronjobTpl.id}`, cronjobTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -81,13 +82,13 @@ export class CronjobTplService { return this.http .delete(`/api/v1/apps/${appId}/cronjobs/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/cronjobs/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/daemonset.service.ts b/src/frontend/src/app/shared/client/v1/daemonset.service.ts index 2f39d0272..846b84238 100644 --- a/src/frontend/src/app/shared/client/v1/daemonset.service.ts +++ b/src/frontend/src/app/shared/client/v1/daemonset.service.ts @@ -8,6 +8,7 @@ import { isNotEmpty } from '../../utils'; import { DaemonSet } from '../../model/v1/daemonset'; import { OrderItem } from '../../model/v1/order'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class DaemonSetService { @@ -25,7 +26,7 @@ export class DaemonSetService { return this.http .get(`/api/v1/apps/${appId}/daemonsets/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listPage(pageState: PageState, appId?: number, deleted?: string): Observable { @@ -68,28 +69,28 @@ export class DaemonSetService { return this.http .get(`/api/v1/apps/${appId}/daemonsets`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(obj: DaemonSet): Observable { return this.http .post(`/api/v1/apps/${obj.appId}/daemonsets`, obj) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(obj: DaemonSet): Observable { return this.http .put(`/api/v1/apps/${obj.appId}/daemonsets/${obj.id}`, obj, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/daemonsets/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -103,13 +104,13 @@ export class DaemonSetService { return this.http .delete(`/api/v1/apps/${appId}/daemonsets/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/daemonsets/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts b/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts index 6f7786c49..c104e43fc 100644 --- a/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/daemonsettpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { DaemonSetTemplate } from '../../model/v1/daemonsettpl'; +import { throwError } from 'rxjs'; @Injectable() export class DaemonSetTplService { @@ -52,21 +53,21 @@ export class DaemonSetTplService { return this.http .get(`/api/v1/apps/${appId}/daemonsets/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(tpl: DaemonSetTemplate, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/daemonsets/tpls`, tpl) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(tpl: DaemonSetTemplate, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/daemonsets/tpls/${tpl.id}`, tpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -80,14 +81,14 @@ export class DaemonSetTplService { return this.http .delete(`/api/v1/apps/${appId}/daemonsets/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/daemonsets/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/deployment.service.ts b/src/frontend/src/app/shared/client/v1/deployment.service.ts index aeae973b6..20a055495 100644 --- a/src/frontend/src/app/shared/client/v1/deployment.service.ts +++ b/src/frontend/src/app/shared/client/v1/deployment.service.ts @@ -8,6 +8,7 @@ import { Deployment } from '../../model/v1/deployment'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; +import { throwError } from 'rxjs'; @Injectable() export class DeploymentService { @@ -25,7 +26,7 @@ export class DeploymentService { return this.http .get(`/api/v1/apps/${appId}/deployments/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -68,28 +69,28 @@ export class DeploymentService { return this.http .get(`/api/v1/apps/${appId}/deployments`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(deployment: Deployment): Observable { return this.http .post(`/api/v1/apps/${deployment.appId}/deployments`, deployment) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(deployment: Deployment): Observable { return this.http .put(`/api/v1/apps/${deployment.appId}/deployments/${deployment.id}`, deployment, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/deployments/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -103,13 +104,13 @@ export class DeploymentService { return this.http .delete(`/api/v1/apps/${appId}/deployments/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/deployments/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts index 41b1ab6fb..2bfbb319b 100644 --- a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { DeploymentTpl } from '../../model/v1/deploymenttpl'; +import { throwError } from 'rxjs'; @Injectable() export class DeploymentTplService { @@ -56,21 +57,21 @@ export class DeploymentTplService { return this.http .get(`/api/v1/apps/${appId}/deployments/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(tpl: DeploymentTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/deployments/tpls`, tpl) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(tpl: DeploymentTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/deployments/tpls/${tpl.id}`, tpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -84,14 +85,14 @@ export class DeploymentTplService { return this.http .delete(`/api/v1/apps/${appId}/deployments/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/deployments/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/edge-node.service.ts b/src/frontend/src/app/shared/client/v1/edge-node.service.ts index 7107f5116..64202e323 100644 --- a/src/frontend/src/app/shared/client/v1/edge-node.service.ts +++ b/src/frontend/src/app/shared/client/v1/edge-node.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { EdgeNode } from '../../model/v1/edge-node'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class EdgeNodeService { @@ -20,7 +21,7 @@ export class EdgeNodeService { return this.http .get(`/api/v1/services/edgenodes/cluster/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState): Observable { @@ -56,35 +57,35 @@ export class EdgeNodeService { return this.http .get('/api/v1/services/edgenodes', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(edgeNode: EdgeNode): Observable { return this.http .post(`/api/v1/services/edgenodes`, edgeNode, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(edgeNode: EdgeNode): Observable { return this.http .put(`/api/v1/services/edgenodes/${edgeNode.id}`, edgeNode, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number): Observable { return this.http .delete(`/api/v1/services/edgenodes/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number): Observable { return this.http .get(`/api/v1/services/edgenodes/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/group.service.ts b/src/frontend/src/app/shared/client/v1/group.service.ts index 0185a13f4..1817238eb 100644 --- a/src/frontend/src/app/shared/client/v1/group.service.ts +++ b/src/frontend/src/app/shared/client/v1/group.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { Group } from '../../model/v1/group'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class GroupService { @@ -52,21 +53,21 @@ export class GroupService { return this.http .get('/api/v1/groups', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createGroup(group: Group): Observable { return this.http .post(`/api/v1/groups`, group, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateGroup(group: Group): Observable { return this.http .put(`/api/v1/groups/${group.id}`, group, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteGroup(groupId: number): Observable { @@ -74,19 +75,19 @@ export class GroupService { return this.http .delete(`/api/v1/groups/${groupId}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getGroup(groupId: number): Observable { return this.http .get(`/api/v1/groups/${groupId}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } initGroup(): Observable { return this.http.get(`/api/v1/groups/init`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/ingress.service.ts b/src/frontend/src/app/shared/client/v1/ingress.service.ts index bfd6fce86..8c0105f5b 100644 --- a/src/frontend/src/app/shared/client/v1/ingress.service.ts +++ b/src/frontend/src/app/shared/client/v1/ingress.service.ts @@ -5,6 +5,7 @@ import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; import { Ingress } from '../../model/v1/ingress'; +import { throwError } from 'rxjs'; @Injectable() export class IngressService { @@ -21,7 +22,7 @@ export class IngressService { } return this.http .get(`/api/v1/apps/${appId}/ingresses/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -62,25 +63,25 @@ export class IngressService { } return this.http .get(`/api/v1/apps/${appId}/ingresses`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(ingress: Ingress): Observable { return this.http .post(`/api/v1/apps/${ingress.appId}/ingresses`, ingress, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(ingress: Ingress): Observable { return this.http .put(`/api/v1/apps/${ingress.appId}/ingresses/${ingress.id}`, ingress, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/ingresses/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -93,12 +94,12 @@ export class IngressService { return this.http .delete(`/api/v1/apps/${appId}/ingresses/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/ingresses/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts b/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts index 7bac51268..1ce2e8017 100644 --- a/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/ingresstpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { IngressTpl } from '../../model/v1/ingresstpl'; import { isNotEmpty } from '../../utils'; import { PageState } from '../../page/page-state'; +import { throwError } from 'rxjs'; @Injectable() export class IngressTplService { @@ -52,19 +53,19 @@ export class IngressTplService { return this.http .get(`/api/v1/apps/${appId}/ingresses/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(ingressTpl: IngressTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/ingresses/tpls`, ingressTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(ingressTpl: IngressTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/ingresses/tpls/${ingressTpl.id}`, ingressTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -77,12 +78,12 @@ export class IngressTplService { return this.http .delete(`/api/v1/apps/${appId}/ingresses/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/ingresses/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/autoscale.ts b/src/frontend/src/app/shared/client/v1/kubernetes/autoscale.ts index d0c5e0cbb..e86c7a905 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/autoscale.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/autoscale.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class AutoscaleClient { @@ -10,20 +11,20 @@ export class AutoscaleClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/hpas/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/hpas/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/hpas/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts index 2ed8b9f6f..d562bd975 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts @@ -5,6 +5,7 @@ import { KubeResourcesName } from '../../../shared.const'; import { PageState } from '../../../page/page-state'; import { BaseClient } from './base-client'; import { KubeDeployment } from '../../../model/v1/kubernetes/deployment'; +import { throwError } from 'rxjs'; @Injectable() export class KubernetesClient { @@ -18,7 +19,7 @@ export class KubernetesClient { return this.http .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNames(cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { @@ -27,7 +28,7 @@ export class KubernetesClient { } return this.http .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/names`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } ListPage(pageState: PageState, cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { @@ -37,7 +38,7 @@ export class KubernetesClient { } return this.http .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(cluster: string, kind: KubeResourcesName, namespace: string, obj: any, appId?: string): Observable { @@ -46,19 +47,19 @@ export class KubernetesClient { } return this.http .post(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`, obj) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(cluster: string, kind: KubeResourcesName, namespace: string, name: string, obj: KubeDeployment, appId?: string): Observable { return this.http .put(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`, obj) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } delete(cluster: string, kind: KubeResourcesName, namespace: string, name: string, appId?: string): Observable { return this.http .delete(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/configmap.ts b/src/frontend/src/app/shared/client/v1/kubernetes/configmap.ts index 5d38cb9f9..ba1f9a64e 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/configmap.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/configmap.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class ConfigMapClient { @@ -10,19 +11,19 @@ export class ConfigMapClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/configmaps/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/configmaps/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/configmaps/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/cronjob.ts b/src/frontend/src/app/shared/client/v1/kubernetes/cronjob.ts index 7b342be99..0dc6cd9bc 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/cronjob.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/cronjob.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class CronjobClient { @@ -10,25 +11,25 @@ export class CronjobClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/cronjobs/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } suspend(appId: number, cluster: string, resourceId: number, tplId: number): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/cronjobs/${resourceId}/tpls/${tplId}/clusters/${cluster}/suspend`, null) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/cronjobs/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/cronjobs/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/daemonset.ts b/src/frontend/src/app/shared/client/v1/kubernetes/daemonset.ts index 6a6d92942..062eb776b 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/daemonset.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/daemonset.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class DaemonSetClient { @@ -10,18 +11,18 @@ export class DaemonSetClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/daemonsets/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/daemonsets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/daemonsets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts index 2e6068885..de5680ec5 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/deployment.ts @@ -4,6 +4,7 @@ import { HttpClient } from '@angular/common/http'; import { PageState } from '../../../page/page-state'; import { BaseClient } from './base-client'; import { KubeDeployment, ObjectMeta } from '../../../model/v1/kubernetes/deployment'; +import { throwError } from 'rxjs'; @Injectable() export class DeploymentClient { @@ -18,36 +19,36 @@ export class DeploymentClient { return this.http .get(`/api/v1/kubernetes/apps/${appId}/deployments/namespaces/${namespace}/clusters/${cluster}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/deployments/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getDetail(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/deployments/${name}/detail/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/deployments/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(appId: number, cluster: string, namespace: string, name: string, obj: KubeDeployment): Observable { return this.http .put(`/api/v1/kubernetes/apps/${appId}/deployments/${name}/namespaces/${namespace}/clusters/${cluster}`, obj) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/deployments/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts b/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts index 1afeacbb9..000749785 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/ingress.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class IngressClient { @@ -10,20 +11,20 @@ export class IngressClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/ingresses/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/ingresses/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/ingresses/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/job.ts b/src/frontend/src/app/shared/client/v1/kubernetes/job.ts index 38226baa3..5a9413a0e 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/job.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/job.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class JobClient { @@ -10,18 +11,18 @@ export class JobClient { listAllClusterByCronjobName(appId: number, namespace: string, cronjobName: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/jobs/listAllClusterByCronjob/${cronjobName}/namespaces/${namespace}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listByCronjobName(appId: number, cluster: string, namespace: string, cronjobName: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/jobs/listByCronjob/${cronjobName}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } PodsEvent(appId: number, cluster: string, namespace: string, jobName: string, cronjobName: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/jobs/getPodsEvent/${jobName}/${cronjobName}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts index e0d2cf043..3df34561c 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class LogClient { @@ -13,6 +14,6 @@ export class LogClient { return this.http .get(`/api/v1/kubernetes/apps/${appId}/podlogs/${pod}/containers/${container}/ namespaces/${namespace}/clusters/${cluster}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts index 6bee83b6c..04e5f3cbf 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/namespace.ts @@ -4,6 +4,7 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { KubeNamespace } from '../../../model/v1/kubernetes/namespace'; import { PageState } from '../../../page/page-state'; import { BaseClient } from './base-client'; +import { throwError } from 'rxjs'; @Injectable() export class NamespaceClient { @@ -13,32 +14,32 @@ export class NamespaceClient { getNames(cluster: string): Observable { return this.http .get(`/api/v1/kubernetes/namespaces/clusters/${cluster}/names`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listPage(pageState: PageState, cluster: string): Observable { const params = BaseClient.buildParam(pageState); return this.http .get(`/api/v1/kubernetes/namespaces/clusters/${cluster}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNamespaceDetail(cluster: string, namespace: string): Observable { return this.http .get(`/api/v1/kubernetes/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(ns: KubeNamespace, cluster: string): Observable { return this.http .put(`/api/v1/kubernetes/namespaces/${ns.metadata.name}/clusters/${cluster}`, ns) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(name: string, cluster: string): Observable { return this.http .post(`/api/v1/kubernetes/namespaces/${name}/clusters/${cluster}`, {}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } @@ -49,7 +50,7 @@ export class NamespaceClient { } return this.http .get(`/api/v1/kubernetes/namespaces/${namespaceId}/resources`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getResource(namespaceId: number, appName?: string): Observable { @@ -59,7 +60,7 @@ export class NamespaceClient { } return this.http .get(`/api/v1/kubernetes/namespaces/${namespaceId}/statistics`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getHistory(namespaceId: number, appName?: string): Observable { @@ -69,6 +70,6 @@ export class NamespaceClient { } return this.http .get(`/api/v1/namespaces/${namespaceId}/history`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/node.ts b/src/frontend/src/app/shared/client/v1/kubernetes/node.ts index 89f7f4952..8d9a0e107 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/node.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/node.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { KubeNode } from '../../../model/v1/kubernetes/node'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class NodeClient { @@ -11,29 +12,29 @@ export class NodeClient { getStatistics(): Observable { return this.http .get(`/api/v1/kubernetes/nodes/statistics`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(cluster: string): Observable { return this.http .get(`/api/v1/kubernetes/nodes/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(node: KubeNode, cluster: string): Observable { return this.http .put(`/api/v1/kubernetes/nodes/${node.metadata.name}/clusters/${cluster}`, node) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(name: string, cluster: string): Observable { return this.http .delete(`/api/v1/kubernetes/nodes/${name}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getByName(name: string, cluster: string): Observable { return this.http.get(`/api/v1/kubernetes/nodes/${name}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume-robin.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume-robin.ts index ba961dacb..27de1404d 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume-robin.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume-robin.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; import { PersistentVolume } from '../../../model/v1/kubernetes/persistentvolume'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeRobinClient { @@ -11,13 +12,13 @@ export class PersistentVolumeRobinClient { listRbdImages(cluster: string): Observable { return this.http .get(`/api/v1/kubernetes/persistentvolumes/robin/rbd.images/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createRbdImage(pv: PersistentVolume, cluster: string): Observable { return this.http .post(`/api/v1/kubernetes/persistentvolumes/robin/rbd.images/clusters/${cluster}`, pv) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume.ts index 822978579..615ba3ee2 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolume.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; import { PersistentVolume } from '../../../model/v1/kubernetes/persistentvolume'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeClient { @@ -11,30 +12,30 @@ export class PersistentVolumeClient { list(cluster: string): Observable { return this.http .get(`/api/v1/kubernetes/persistentvolumes/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(pv: PersistentVolume, cluster: string): Observable { return this.http .post(`/api/v1/kubernetes/persistentvolumes/clusters/${cluster}`, pv) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(pv: PersistentVolume, cluster: string): Observable { return this.http .put(`/api/v1/kubernetes/persistentvolumes/${pv.metadata.name}/clusters/${cluster}`, pv) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(name: string, cluster: string): Observable { return this.http .delete(`/api/v1/kubernetes/persistentvolumes/${name}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(name: number, cluster: string): Observable { return this.http.get(`/api/v1/kubernetes/persistentvolumes/${name}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts index b91d3e995..c44ce6aa4 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeClaimRobinClient { @@ -10,43 +11,43 @@ export class PersistentVolumeClaimRobinClient { getStatus(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/status/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } activeRbdImage(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`, null) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } inActiveRbdImage(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } offlineRbdImageUser(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } loginInfo(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } verify(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/verify/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { @@ -54,28 +55,28 @@ export class PersistentVolumeClaimRobinClient { .post( `/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin /${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteAllSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims /robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } rollBackSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims.ts index 40824d2fd..a8490bcb4 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeClaimClient { @@ -10,19 +11,19 @@ export class PersistentVolumeClaimClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/pod.ts b/src/frontend/src/app/shared/client/v1/kubernetes/pod.ts index 4dd5ccd01..674044ca2 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/pod.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/pod.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class PodClient { @@ -12,7 +13,7 @@ export class PodClient { params = params.set('deployment', deployment); return this.http .get(`/api/v1/kubernetes/apps/${appId}/pods/namespaces/${namespace}/clusters/${cluster}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listByResouce(appId: number, cluster: string, namespace: string, resouceType: string, name: string): Observable { @@ -20,25 +21,25 @@ export class PodClient { params = params.set(resouceType, name); return this.http .get(`/api/v1/kubernetes/apps/${appId}/pods/namespaces/${namespace}/clusters/${cluster}`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, pod: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/pods/${pod}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/pods/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getStatistics(): Observable { return this.http .get(`/api/v1/kubernetes/pods/statistics`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createTerminal(appId: number, cluster: string, namespace: string, pod: string, container: string, cmd?: string): Observable { @@ -47,7 +48,7 @@ export class PodClient { params = params.set('cmd', cmd); return this.http .post(`/api/v1/kubernetes/apps/${appId}/pods/${pod}/terminal/namespaces/${namespace}/clusters/${cluster}`, null, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/secret.ts b/src/frontend/src/app/shared/client/v1/kubernetes/secret.ts index 27c9c1f60..669757049 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/secret.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/secret.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class SecretClient { @@ -10,19 +11,19 @@ export class SecretClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/secrets/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/secrets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/secrets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/statefulset.ts b/src/frontend/src/app/shared/client/v1/kubernetes/statefulset.ts index 0fbcd0cd0..d8962b3c8 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/statefulset.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/statefulset.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() export class StatefulsetClient { @@ -10,18 +11,18 @@ export class StatefulsetClient { deploy(appId: number, cluster: string, resourceId: number, tplId: number, template: any): Observable { return this.http .post(`/api/v1/kubernetes/apps/${appId}/statefulsets/${resourceId}/tpls/${tplId}/clusters/${cluster}`, template) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } get(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .get(`/api/v1/kubernetes/apps/${appId}/statefulsets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByName(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http .delete(`/api/v1/kubernetes/apps/${appId}/statefulsets/${name}/namespaces/${namespace}/clusters/${cluster}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/namespace-user.service.ts b/src/frontend/src/app/shared/client/v1/namespace-user.service.ts index 9c369a8d0..17568e9d4 100644 --- a/src/frontend/src/app/shared/client/v1/namespace-user.service.ts +++ b/src/frontend/src/app/shared/client/v1/namespace-user.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { NamespaceUser } from '../../model/v1/namespace-user'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class NamespaceUserService { @@ -67,31 +68,31 @@ export class NamespaceUserService { return this.http.get(`/api/v1/namespaces/${namespaceId}/users`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(namespaceUser: NamespaceUser): Observable { return this.http.post(`/api/v1/namespaces/${namespaceUser.namespace.id}/users`, namespaceUser, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(namespaceUser: NamespaceUser): Observable { return this.http.put(`/api/v1/namespaces/${namespaceUser.namespace.id}/users/${namespaceUser.id}`, namespaceUser, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, namespaceId: number): Observable { const options: any = {}; return this.http.delete(`/api/v1/namespaces/${namespaceId}/users/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, namespaceId: string): Observable { return this.http.get(`/api/v1/namespaces/${namespaceId}/users/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/namespace.service.ts b/src/frontend/src/app/shared/client/v1/namespace.service.ts index 1e5afd379..d583af3ef 100644 --- a/src/frontend/src/app/shared/client/v1/namespace.service.ts +++ b/src/frontend/src/app/shared/client/v1/namespace.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { Namespace } from '../../model/v1/namespace'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class NamespaceService { @@ -49,28 +50,28 @@ export class NamespaceService { return this.http .get('/api/v1/namespaces', {params: params}) // - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNames(): Observable { return this.http .get('/api/v1/namespaces/names') - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createNamespace(ns: Namespace): Observable { return this.http .post(`/api/v1/namespaces`, ns, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateNamespace(ns: Namespace): Observable { return this.http .put(`/api/v1/namespaces/${ns.id}`, ns, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteNamespace(nsId: number, logical?: boolean): Observable { @@ -83,19 +84,19 @@ export class NamespaceService { return this.http .delete(`/api/v1/namespaces/${nsId}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNamespace(nsId: number): Observable { return this.http .get(`/api/v1/namespaces/${nsId}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } initDefault(): Observable { return this.http.get(`/api/v1/namespaces/init`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/notification.service.ts b/src/frontend/src/app/shared/client/v1/notification.service.ts index 0aff1e0f9..80122dfbf 100644 --- a/src/frontend/src/app/shared/client/v1/notification.service.ts +++ b/src/frontend/src/app/shared/client/v1/notification.service.ts @@ -3,6 +3,7 @@ import { Observable } from 'rxjs/Observable'; import { PageState } from '../../page/page-state'; import { HttpClient, HttpParams } from '@angular/common/http'; import { Notification } from '../../model/v1/notification'; +import { throwError } from 'rxjs'; @Injectable() export class NotificationService { @@ -18,14 +19,14 @@ export class NotificationService { return this.http .get(`/api/v1/notifications`, {params: params}) // - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } publish(id): Observable { return this.http .put(`/api/v1/notifications?id=` + id, {}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } subscribe(pageState: PageState): Observable { @@ -37,21 +38,21 @@ export class NotificationService { return this.http .get(`/api/v1/notifications/subscribe`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } read(id): Observable { return this.http .put(`/api/v1/notifications/subscribe?id=` + id, {}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(notify: Notification): Observable { return this.http .post(`/api/v1/notifications`, notify) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/permission.service.ts b/src/frontend/src/app/shared/client/v1/permission.service.ts index 60826db6a..873ae836d 100644 --- a/src/frontend/src/app/shared/client/v1/permission.service.ts +++ b/src/frontend/src/app/shared/client/v1/permission.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { Permission } from '../../model/v1/permission'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class PermissionService { @@ -47,21 +48,21 @@ export class PermissionService { return this.http .get('/api/v1/permissions', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createPermission(permission: Permission): Observable { return this.http .post(`/api/v1/permissions`, permission, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updatePermission(permission: Permission): Observable { return this.http .put(`/api/v1/permissions/${permission.id}`, permission, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deletePermission(permissionId: number): Observable { @@ -69,20 +70,20 @@ export class PermissionService { return this.http .delete(`/api/v1/permissions/${permissionId}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getPermission(permissionId: number): Observable { return this.http .get(`/api/v1/permissions/${permissionId}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } initDict(): Observable { return this.http .get(`/api/v1/permissions/init`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts index b5d3bfe22..e42b03049 100644 --- a/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts +++ b/src/frontend/src/app/shared/client/v1/persistentvolumeclaim.service.ts @@ -8,6 +8,7 @@ import { PersistentVolumeClaim } from '../../model/v1/persistentvolumeclaim'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeClaimService { @@ -29,7 +30,7 @@ export class PersistentVolumeClaimService { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -70,28 +71,28 @@ export class PersistentVolumeClaimService { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(pvc: PersistentVolumeClaim): Observable { return this.http .post(`/api/v1/apps/${pvc.appId}/persistentvolumeclaims`, pvc, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(pvc: PersistentVolumeClaim): Observable { return this.http .put(`/api/v1/apps/${pvc.appId}/persistentvolumeclaims/${pvc.id}`, pvc, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/persistentvolumeclaims/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -105,13 +106,13 @@ export class PersistentVolumeClaimService { return this.http .delete(`/api/v1/apps/${appId}/persistentvolumeclaims/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts b/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts index 83c9c5d28..178e06301 100644 --- a/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/persistentvolumeclaimtpl.service.ts @@ -8,6 +8,7 @@ import 'rxjs/add/observable/throw'; import { PersistentVolumeClaimTpl } from '../../model/v1/persistentvolumeclaimtpl'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class PersistentVolumeClaimTplService { @@ -69,7 +70,7 @@ export class PersistentVolumeClaimTplService { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listPage(pageState: PageState, appId: number): Observable { @@ -108,21 +109,21 @@ export class PersistentVolumeClaimTplService { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(pvcTpl: PersistentVolumeClaimTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls`, pvcTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(pvcTpl: PersistentVolumeClaimTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls/${pvcTpl.id}`, pvcTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -136,13 +137,13 @@ export class PersistentVolumeClaimTplService { return this.http .delete(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/persistentvolumeclaims/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/public.service.ts b/src/frontend/src/app/shared/client/v1/public.service.ts index 51a770930..922ebd676 100644 --- a/src/frontend/src/app/shared/client/v1/public.service.ts +++ b/src/frontend/src/app/shared/client/v1/public.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { throwError } from 'rxjs'; @Injectable() @@ -23,6 +24,6 @@ export class PublicService { return this.http .post(`/api/v1/public/shell/token`, urlSearchParams, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/publish.service.ts b/src/frontend/src/app/shared/client/v1/publish.service.ts index 5c1edeb91..b4839862a 100644 --- a/src/frontend/src/app/shared/client/v1/publish.service.ts +++ b/src/frontend/src/app/shared/client/v1/publish.service.ts @@ -6,6 +6,7 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class PublishService { @@ -52,7 +53,7 @@ export class PublishService { return this.http .get('/api/v1/publish/histories', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listStatus(type?: number, resourceId?: number): Observable { @@ -70,7 +71,7 @@ export class PublishService { return this.http .get('/api/v1/publish/statistics', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/publishstatus.service.ts b/src/frontend/src/app/shared/client/v1/publishstatus.service.ts index b7386ba1c..9fb604829 100644 --- a/src/frontend/src/app/shared/client/v1/publishstatus.service.ts +++ b/src/frontend/src/app/shared/client/v1/publishstatus.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; +import { throwError } from 'rxjs'; @Injectable() export class PublishStatusService { @@ -20,14 +21,14 @@ export class PublishStatusService { return this.http .get('/api/v1/publishstatus', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number): Observable { return this.http .delete(`/api/v1/publishstatus/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/secret.service.ts b/src/frontend/src/app/shared/client/v1/secret.service.ts index be1d8c253..1cd1bb815 100644 --- a/src/frontend/src/app/shared/client/v1/secret.service.ts +++ b/src/frontend/src/app/shared/client/v1/secret.service.ts @@ -8,6 +8,7 @@ import { Secret } from '../../model/v1/secret'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { OrderItem } from '../../model/v1/order'; +import { throwError } from 'rxjs'; @Injectable() export class SecretService { @@ -25,7 +26,7 @@ export class SecretService { return this.http .get(`/api/v1/apps/${appId}/secrets/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } list(pageState: PageState, deleted?: string, appId?: string): Observable { @@ -67,28 +68,28 @@ export class SecretService { return this.http .get(`/api/v1/apps/${appId}/secrets`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(secret: Secret): Observable { return this.http .post(`/api/v1/apps/${secret.appId}/secrets`, secret, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(secret: Secret): Observable { return this.http .put(`/api/v1/apps/${secret.appId}/secrets/${secret.id}`, secret, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/secrets/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } @@ -103,13 +104,13 @@ export class SecretService { return this.http .delete(`/api/v1/apps/${appId}/secrets/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/secrets/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/secrettpl.service.ts b/src/frontend/src/app/shared/client/v1/secrettpl.service.ts index 3fa04449d..73f4a6e30 100644 --- a/src/frontend/src/app/shared/client/v1/secrettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/secrettpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { SecretTpl } from '../../model/v1/secrettpl'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class SecretTplService { @@ -23,7 +24,7 @@ export class SecretTplService { return this.http .get(`/api/v1/apps/${appId}/secrets/tpls/names`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listPage(pageState: PageState, appId?: number, secretId?: string, needStatus?: string): Observable { @@ -63,21 +64,21 @@ export class SecretTplService { return this.http .get(`/api/v1/apps/${appId}/secrets/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(secretTpl: SecretTpl, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/secrets/tpls`, secretTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(secretTpl: SecretTpl, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/secrets/tpls/${secretTpl.id}`, secretTpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -91,13 +92,13 @@ export class SecretTplService { return this.http .delete(`/api/v1/apps/${appId}/secrets/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/secrets/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/statefulset.service.ts b/src/frontend/src/app/shared/client/v1/statefulset.service.ts index 210f5ba76..06d8e4c26 100644 --- a/src/frontend/src/app/shared/client/v1/statefulset.service.ts +++ b/src/frontend/src/app/shared/client/v1/statefulset.service.ts @@ -8,6 +8,7 @@ import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { Statefulset } from 'app/shared/model/v1/statefulset'; import { OrderItem } from '../../model/v1/order'; +import { throwError } from 'rxjs'; @Injectable() export class StatefulsetService { @@ -25,7 +26,7 @@ export class StatefulsetService { return this.http .get(`/api/v1/apps/${appId}/statefulsets/names`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } listPage(pageState: PageState, appId: number, deleted?: string): Observable { @@ -68,28 +69,28 @@ export class StatefulsetService { return this.http .get(`/api/v1/apps/${appId}/statefulsets`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(obj: Statefulset): Observable { return this.http .post(`/api/v1/apps/${obj.appId}/statefulsets`, obj) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(obj: Statefulset): Observable { return this.http .put(`/api/v1/apps/${obj.appId}/statefulsets/${obj.id}`, obj, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateOrder(appId: number, orderList: Array): Observable { return this.http .put(`/api/v1/apps/${appId}/statefulsets/updateorders`, orderList, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -103,13 +104,13 @@ export class StatefulsetService { return this.http .delete(`/api/v1/apps/${appId}/statefulsets/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/statefulsets/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts b/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts index 868420626..85c4d9249 100644 --- a/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/statefulsettpl.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; import { StatefulsetTemplate } from '../../model/v1/statefulsettpl'; +import { throwError } from 'rxjs'; @Injectable() export class StatefulsetTplService { @@ -52,21 +53,21 @@ export class StatefulsetTplService { return this.http .get(`/api/v1/apps/${appId}/statefulsets/tpls`, {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } create(tpl: StatefulsetTemplate, appId: number): Observable { return this.http .post(`/api/v1/apps/${appId}/statefulsets/tpls`, tpl) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } update(tpl: StatefulsetTemplate, appId: number): Observable { return this.http .put(`/api/v1/apps/${appId}/statefulsets/tpls/${tpl.id}`, tpl, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, appId: number, logical?: boolean): Observable { @@ -80,14 +81,14 @@ export class StatefulsetTplService { return this.http .delete(`/api/v1/apps/${appId}/statefulsets/tpls/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number, appId: number): Observable { return this.http .get(`/api/v1/apps/${appId}/statefulsets/tpls/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/used-port.service.ts b/src/frontend/src/app/shared/client/v1/used-port.service.ts index 7056f1bf3..fc99e67f2 100644 --- a/src/frontend/src/app/shared/client/v1/used-port.service.ts +++ b/src/frontend/src/app/shared/client/v1/used-port.service.ts @@ -6,6 +6,7 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class UsedPortService { @@ -48,7 +49,7 @@ export class UsedPortService { return this.http .get('/api/v1/services/usedports', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteById(id: number, logical?: boolean): Observable { @@ -62,7 +63,7 @@ export class UsedPortService { return this.http .delete(`/api/v1/services/usedports/${id}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteByServiceId(serviceId: number): Observable { @@ -73,14 +74,14 @@ export class UsedPortService { return this.http .delete(`/api/v1/services/usedports`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getById(id: number): Observable { return this.http .get(`/api/v1/services/usedports/${id}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } diff --git a/src/frontend/src/app/shared/client/v1/user.service.ts b/src/frontend/src/app/shared/client/v1/user.service.ts index 8ff68746d..b2785d4d3 100644 --- a/src/frontend/src/app/shared/client/v1/user.service.ts +++ b/src/frontend/src/app/shared/client/v1/user.service.ts @@ -7,6 +7,7 @@ import 'rxjs/add/observable/throw'; import { User } from '../../model/v1/user'; import { PageState } from '../../page/page-state'; import { isNotEmpty } from '../../utils'; +import { throwError } from 'rxjs'; @Injectable() export class UserService { @@ -47,41 +48,41 @@ export class UserService { return this.http .get('/api/v1/users', {params: params}) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } createUser(user: User): Observable { return this.http .post(`/api/v1/users`, user, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getNames(): Observable { return this.http.get('/api/v1/users/names') - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateUser(user: User): Observable { return this.http .put(`/api/v1/users/${user.id}`, user, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } updateUserAdmin(user: User): Observable { return this.http .put(`/api/v1/users/${user.id}/admin`, user, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } resetPassword(user: User): Observable { return this.http .put(`/api/v1/users/${user.id}/resetpassword`, user, this.options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } deleteUser(userId: number): Observable { @@ -89,21 +90,21 @@ export class UserService { return this.http .delete(`/api/v1/users/${userId}`, options) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getUser(userId: number): Observable { return this.http .get(`/api/v1/users/${userId}`) - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } getStatistics(): Observable { return this.http .get('/api/v1/users/statistics') - .catch(error => Observable.throw(error)); + .catch(error => throwError(error)); } } From 70571991abfbf84a6d5e441c7b2dfa3b36c5aae8 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 18:27:21 +0800 Subject: [PATCH 048/112] frontend: change DOCUMENT import way --- src/frontend/src/app/portal/app/app.component.ts | 11 ++--------- .../create-edit-configmaptpl.component.ts | 4 ++-- .../create-edit-cronjobtpl.component.ts | 4 ++-- .../create-edit-daemonsettpl.component.ts | 4 ++-- .../create-edit-deploymenttpl.component.ts | 4 ++-- .../create-edit-persistentvolumeclaimtpl.component.ts | 4 ++-- .../create-edit-secrettpl.component.ts | 4 ++-- .../create-edit-statefulsettpl.component.ts | 4 ++-- src/frontend/src/app/shared/client/v1/copy.service.ts | 2 +- .../src/app/shared/client/v1/select-copy.service.ts | 3 ++- .../src/app/shared/client/v1/tab-drag.service.ts | 3 ++- .../src/app/shared/filter-box/filter-box.component.ts | 3 ++- .../app/shared/float-window/float-window.component.ts | 3 ++- .../src/app/shared/navigation/navigation.component.ts | 3 ++- 14 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/frontend/src/app/portal/app/app.component.ts b/src/frontend/src/app/portal/app/app.component.ts index 640422330..bf7f6ce2f 100644 --- a/src/frontend/src/app/portal/app/app.component.ts +++ b/src/frontend/src/app/portal/app/app.component.ts @@ -17,10 +17,10 @@ import { ActivatedRoute } from '@angular/router'; import { NamespaceClient } from '../../shared/client/v1/kubernetes/namespace'; import { StorageService } from '../../shared/client/v1/storage.service'; import { RedDot } from '../../shared/model/v1/red-dot'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { animate, style, transition, trigger } from '@angular/animations'; import { TranslateService } from '@ngx-translate/core'; - +import { DOCUMENT } from '@angular/common'; class ClusterCard { name: string; state: boolean; @@ -213,13 +213,6 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { } } - // 处理回车事件也可以搜索 - keyDownFunction(event: KeyboardEvent) { - if (event.keyCode === 13) { - this.searchApp(); - } - } - searchApp() { this.retrieve(); } diff --git a/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts b/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts index 938908f4e..1f5915904 100644 --- a/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts +++ b/src/frontend/src/app/portal/configmap/create-edit-configmaptpl/create-edit-configmaptpl.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { Location } from '@angular/common'; +import { Location, DOCUMENT } from '@angular/common'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; @@ -7,7 +7,7 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; import { combineLatest } from 'rxjs'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { ConfigMapTpl } from '../../../shared/model/v1/configmaptpl'; import { App } from '../../../shared/model/v1/app'; import { ConfigMap } from '../../../shared/model/v1/configmap'; diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts index a09a52f3a..46363e044 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { Location } from '@angular/common'; +import { DOCUMENT, Location } from '@angular/common'; import { FormBuilder, NgForm } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { @@ -16,7 +16,7 @@ import { SecretEnvSource, SecretKeySelector, } from '../../../shared/model/v1/kubernetes/cronjob'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import 'rxjs/add/observable/combineLatest'; import { ActivatedRoute, Router } from '@angular/router'; import { CronjobTpl } from '../../../shared/model/v1/cronjobtpl'; diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts index 1990be475..c3d7ade90 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts @@ -1,8 +1,8 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { Location } from '@angular/common'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { DOCUMENT, Location } from '@angular/common'; +import { EventManager } from '@angular/platform-browser'; import { FormBuilder, NgForm } from '@angular/forms'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { diff --git a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts index 75e6d3c90..8361fe27b 100644 --- a/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts +++ b/src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts @@ -1,9 +1,9 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { Location } from '@angular/common'; +import { DOCUMENT, Location } from '@angular/common'; import { FormBuilder, NgForm } from '@angular/forms'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfigMapEnvSource, diff --git a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts index b057adad2..43c3e700c 100644 --- a/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/portal/persistentvolumeclaim/create-edit-persistentvolumeclaimtpl/create-edit-persistentvolumeclaimtpl.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { Location } from '@angular/common'; +import { DOCUMENT, Location } from '@angular/common'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; @@ -7,7 +7,7 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; import { combineLatest } from 'rxjs'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { App } from '../../../shared/model/v1/app'; import { AppService } from '../../../shared/client/v1/app.service'; import { CacheService } from '../../../shared/auth/cache.service'; diff --git a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts index fa2e0d1ee..b756b52d8 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts +++ b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { Location } from '@angular/common'; +import { DOCUMENT, Location } from '@angular/common'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; @@ -7,7 +7,7 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h import { ActionType, appLabelKey, namespaceLabelKey } from '../../../shared/shared.const'; import { ActivatedRoute, Router } from '@angular/router'; import { combineLatest } from 'rxjs'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { SecretTpl } from '../../../shared/model/v1/secrettpl'; import { App } from '../../../shared/model/v1/app'; import { Secret } from '../../../shared/model/v1/secret'; diff --git a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts index a6b7a95e8..554398b8d 100644 --- a/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts +++ b/src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts @@ -1,9 +1,9 @@ import { AfterViewInit, Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { Location } from '@angular/common'; +import { DOCUMENT, Location } from '@angular/common'; import { FormBuilder, NgForm } from '@angular/forms'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { ConfigMapEnvSource, diff --git a/src/frontend/src/app/shared/client/v1/copy.service.ts b/src/frontend/src/app/shared/client/v1/copy.service.ts index 85363e107..67ebf460f 100644 --- a/src/frontend/src/app/shared/client/v1/copy.service.ts +++ b/src/frontend/src/app/shared/client/v1/copy.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; -import { DOCUMENT } from '@angular/platform-browser'; +import { DOCUMENT } from '@angular/common'; import { MessageHandlerService } from '../../message-handler/message-handler.service'; @Injectable() diff --git a/src/frontend/src/app/shared/client/v1/select-copy.service.ts b/src/frontend/src/app/shared/client/v1/select-copy.service.ts index 8a5a36729..b933b5202 100644 --- a/src/frontend/src/app/shared/client/v1/select-copy.service.ts +++ b/src/frontend/src/app/shared/client/v1/select-copy.service.ts @@ -1,5 +1,6 @@ import { AfterViewInit, Inject, Injectable, OnDestroy, Renderer2, RendererFactory2 } from '@angular/core'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { DOCUMENT } from '@angular/common'; +import { EventManager } from '@angular/platform-browser'; import { CopyService } from './copy.service'; @Injectable() diff --git a/src/frontend/src/app/shared/client/v1/tab-drag.service.ts b/src/frontend/src/app/shared/client/v1/tab-drag.service.ts index 4b6bbf998..201a66f3f 100644 --- a/src/frontend/src/app/shared/client/v1/tab-drag.service.ts +++ b/src/frontend/src/app/shared/client/v1/tab-drag.service.ts @@ -1,7 +1,8 @@ import { Inject, Injectable, OnDestroy, Renderer2, RendererFactory2 } from '@angular/core'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { Subject } from 'rxjs'; import { TipService } from './tip.service'; +import { DOCUMENT } from '@angular/common'; /** * angular 自己的组件高度都为0，所以只能在实际dom上添加draggable; diff --git a/src/frontend/src/app/shared/filter-box/filter-box.component.ts b/src/frontend/src/app/shared/filter-box/filter-box.component.ts index 2d9113c0d..69db90b1a 100644 --- a/src/frontend/src/app/shared/filter-box/filter-box.component.ts +++ b/src/frontend/src/app/shared/filter-box/filter-box.component.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; +import { DOCUMENT } from '@angular/common'; @Component({ selector: 'wayne-filter-box', diff --git a/src/frontend/src/app/shared/float-window/float-window.component.ts b/src/frontend/src/app/shared/float-window/float-window.component.ts index fbb4bf4fd..db7120c16 100644 --- a/src/frontend/src/app/shared/float-window/float-window.component.ts +++ b/src/frontend/src/app/shared/float-window/float-window.component.ts @@ -1,7 +1,8 @@ import { Component, ContentChildren, ElementRef, HostListener, Inject, Input, QueryList } from '@angular/core'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { FloatWindowItemComponent } from './float-window-item/float-window-item.component'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; +import { DOCUMENT } from '@angular/common'; @Component({ selector: 'wayne-float-window', diff --git a/src/frontend/src/app/shared/navigation/navigation.component.ts b/src/frontend/src/app/shared/navigation/navigation.component.ts index da59ea27f..6e56445a1 100644 --- a/src/frontend/src/app/shared/navigation/navigation.component.ts +++ b/src/frontend/src/app/shared/navigation/navigation.component.ts @@ -1,6 +1,7 @@ import { AfterViewInit, Component, Inject, Input, OnDestroy, OnInit } from '@angular/core'; -import { DOCUMENT, EventManager } from '@angular/platform-browser'; +import { EventManager } from '@angular/platform-browser'; import { NodeOffset } from './nodeOffset'; +import { DOCUMENT } from '@angular/common'; @Component({ selector: 'wayne-navigation', From 0dd196207e6d7f433f4d577b692abd8d33950856 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 18:44:37 +0800 Subject: [PATCH 049/112] frontend: fix param annot --- .../src/app/portal/pod-terminal/pod-terminal.component.ts | 2 +- .../src/app/shared/dual-list-box/dual-list-box.component.ts | 6 ++---- .../src/app/shared/navigation/navigation.component.ts | 2 +- src/frontend/src/app/shared/utils.ts | 3 --- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts index 8bd26bee4..d517ceffd 100644 --- a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts +++ b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts @@ -205,7 +205,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { ngOnDestroy(): void { if (this.xterm) { - this.xterm.destroy(); + this.xterm.dispose(); } if (this.socket) { this.socket.close(); diff --git a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts index 003b535bd..e4a1d7812 100644 --- a/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts +++ b/src/frontend/src/app/shared/dual-list-box/dual-list-box.component.ts @@ -213,7 +213,6 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { /** * Move single item from available to selected - * @param item */ moveAvailableItemToSelected(item: IListBoxItem): void { @@ -230,7 +229,6 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { /** * Move single item from selected to available - * @param item */ moveSelectedItemToAvailable(item: IListBoxItem): void { @@ -248,8 +246,8 @@ export class DualListBoxComponent implements OnInit, ControlValueAccessor { /** * Function to pass to ngFor to improve performance, tracks items * by the value field - * @param index - * @param item + * @param index number + * @param item object * @returns any */ trackByValue(index: number, item: {}): string { diff --git a/src/frontend/src/app/shared/navigation/navigation.component.ts b/src/frontend/src/app/shared/navigation/navigation.component.ts index 6e56445a1..364dbdf35 100644 --- a/src/frontend/src/app/shared/navigation/navigation.component.ts +++ b/src/frontend/src/app/shared/navigation/navigation.component.ts @@ -223,7 +223,7 @@ export class NavigationComponent implements OnInit, AfterViewInit, OnDestroy { } /** - * @param 获取element相对于body的偏移量 + * @return 获取element相对于body的偏移量 */ getOffset(element: any | null): number { diff --git a/src/frontend/src/app/shared/utils.ts b/src/frontend/src/app/shared/utils.ts index 561e0e761..7134d24ec 100644 --- a/src/frontend/src/app/shared/utils.ts +++ b/src/frontend/src/app/shared/utils.ts @@ -25,7 +25,6 @@ export const isArrayEmpty = function (obj: any): boolean { /** * Simple object check. - * @param item * @returns boolean */ export function isObject(item) { @@ -35,8 +34,6 @@ export function isObject(item) { /** * Deep merge two objects. * refer to https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge - * @param target - * @param ...sources */ export function mergeDeep(target, ...sources) { if (!sources.length) { From 300ffa7c65a7c83b0ab46ea7cd922840f4d84d69 Mon Sep 17 00:00:00 2001 From: BennieMeng Date: Wed, 30 Jan 2019 19:04:09 +0800 Subject: [PATCH 050/112] frontend: update frontend-plugin --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index f451003e4..4075d3ee0 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit f451003e45d4cda8f47d5cf7e3750654688cd956 +Subproject commit 4075d3ee03bb08515a3e8f1e819d7002cc9890e3 From 04cce427f0426a5320b18548b18631666d0c809e Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 11:14:49 +0800 Subject: [PATCH 051/112] frontend: move sidenav to wayne repo --- src/frontend/lib | 2 +- src/frontend/src/app/admin/admin.module.ts | 4 +- .../app/admin/sidenav/sidenav.component.html | 613 ++++++++++++++++++ .../app/admin/sidenav/sidenav.component.scss | 30 + .../app/admin/sidenav/sidenav.component.ts | 18 + .../src/app/admin/sidenav/sidenav.module.ts | 17 + 6 files changed, 682 insertions(+), 2 deletions(-) create mode 100644 src/frontend/src/app/admin/sidenav/sidenav.component.html create mode 100644 src/frontend/src/app/admin/sidenav/sidenav.component.scss create mode 100644 src/frontend/src/app/admin/sidenav/sidenav.component.ts create mode 100644 src/frontend/src/app/admin/sidenav/sidenav.module.ts diff --git a/src/frontend/lib b/src/frontend/lib index 4075d3ee0..021d2e82b 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 4075d3ee03bb08515a3e8f1e819d7002cc9890e3 +Subproject commit 021d2e82bf454c7f2488dbbd54d8420eea62247f diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index 977dca498..4517be742 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -47,6 +47,7 @@ import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autos import { CreateEditAutoscaletplComponent } from './autoscaletpl/create-edit-autoscaletpl/create-edit-autoscaletpl.component'; import { ListAutoscaletplComponent } from './autoscaletpl/list-autoscaletpl/list-autoscaletpl.component'; import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; +import { SidenavModule } from './sidenav/sidenav.module'; @NgModule({ imports: [ @@ -86,7 +87,8 @@ import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/tr IngressModule, IngressTplModule, KubeDeploymentModule, - TplDetailModule + TplDetailModule, + SidenavModule ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html new file mode 100644 index 000000000..6f1202992 --- /dev/null +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -0,0 +1,613 @@ + + + + {{ "MENU.PLATFORM_OVERVIEW" | translate }} + +
+ + + Kubernetes + + + + Dashboard + + + + Namespace + + + + Node + + + + Deployment + + + + PersistentVolume + + + +
+ + + + {{ "MENU.SYSTEM_STATISTICS" | translate }} + + + {{ "MENU.PROJECT_REPORT" | translate }} + + + + + {{ "MENU.RELEASE_STATISTICS" | translate }} + + + + + + + {{ "MENU.CONFIGURATION" | translate }} + + + {{"MENU.SYSTEM_CONFIGURATION" | translate }} + + + + + {{"MENU.DATABASE_CONFIGURATION" | translate }} + + + + + + + {{"MENU.PERMISSION" | translate }} + + + {{"MENU.USER_LIST" | translate }} + + + {{"MENU.ROLE_LIST" | translate }} + + + {{"MENU.PERMISSION_LIST" | translate }} + + + {{"MENU.API_KEYS" | translate }} + + + +
+ + + + {{"MENU.CLUSTER" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + + + + + {{"MENU.NAMESPACE" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + + + + + {{"MENU.APP" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + +
+ + + + {{"MENU.DEPLOYMENT" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + + + + {{"MENU.STATEFULSET" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + {{"MENU.DAEMONSET" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + + {{"MENU.CRONJOB" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + +
+ + + + {{'MENU.AUTO_POD_SCALE' | translate}} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + + + +
+ + + + {{"MENU.SERVICE" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + 边缘节点相关 + + + 边缘节点配置 + + + 可用端口配置 + + + 已分配端口 + + + + + + Ingress + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + +
+ + + + {{"MENU.CONFIGMAP" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + + {{"MENU.SECRET" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + + + + + {{"MENU.PVC" | translate }} + + + {{"MENU.LIST" | translate }} + + + {{"MENU.RECYCLED" | translate }} + + + {{"MENU.TEMPLATE_LIST" | translate }} + + + {{"MENU.TEMPLATE_RECYCLED" | translate }} + + + +
+ + + + {{"MENU.NOTIFICATION_AUDIT" | translate }} + + + + {{"MENU.NOTIFICATION" | translate }} + + + + {{"MENU.AUDIT_LOD" | translate }} + + + + + diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.scss b/src/frontend/src/app/admin/sidenav/sidenav.component.scss new file mode 100644 index 000000000..39748668f --- /dev/null +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.scss @@ -0,0 +1,30 @@ +.clr-vertical-nav { + $scroll-bar-width: 8px; + $scroll-margin-width: 2px; + $scrollbar-bg: #373b41; + $scrollbar-color: #adbbc4; + + &.has-nav-groups.has-icons.is-collapsed { + width: 2.3rem; + } + + ::ng-deep { + .nav-content { + &::-webkit-scrollbar { + width: $scroll-bar-width; + } + + &::-webkit-scrollbar-track { + background: $scrollbar-bg; + } + + &::-webkit-scrollbar-thumb { + border-radius: ($scroll-bar-width + $scroll-margin-width) / 2; + width: $scroll-bar-width; + background-color: $scrollbar-color; + background-clip: padding-box; + border: $scroll-margin-width solid transparent; + } + } + } +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.ts b/src/frontend/src/app/admin/sidenav/sidenav.component.ts new file mode 100644 index 000000000..bc3794a66 --- /dev/null +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import { AuthService } from '../../shared/auth/auth.service'; + +@Component({ + selector: 'wayne-sidenav', + templateUrl: './sidenav.component.html', + styleUrls: ['./sidenav.component.scss'] +}) + +export class SidenavComponent implements OnInit { + + constructor(public authService: AuthService) { + } + + ngOnInit() { + } + +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.module.ts b/src/frontend/src/app/admin/sidenav/sidenav.module.ts new file mode 100644 index 000000000..f20c79093 --- /dev/null +++ b/src/frontend/src/app/admin/sidenav/sidenav.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { SidenavComponent } from './sidenav.component'; +import { SharedModule } from '../../shared/shared.module'; + +@NgModule({ + imports: [ + SharedModule, + RouterModule + ], + providers: [], + exports: [SidenavComponent], + declarations: [SidenavComponent] +}) + +export class SidenavModule { +} From 2a917e1b689a6e78e4247ac4cb745f9126eb72bd Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 15:04:14 +0800 Subject: [PATCH 052/112] frontend: fix create hpa error --- .../create-edit-autoscale.component.ts | 3 +-- .../shared/base/admin-resource/create-edit-resource.ts | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts index 8ab631a99..bcab08e99 100644 --- a/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts +++ b/src/frontend/src/app/admin/autoscale/create-edit-autoscale/create-edit-autoscale.component.ts @@ -5,7 +5,6 @@ import { MessageHandlerService } from '../../../shared/message-handler/message-h import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AutoscaleService } from '../../../shared/client/v1/autoscale.service'; import { Autoscale } from '../../../shared/model/v1/autoscale'; -import { defaultAutoscale } from '../../../shared/default-models/autoscale.const'; @Component({ selector: 'wayne-create-edit-autoscale', @@ -18,7 +17,7 @@ export class CreateEditAutoscaleComponent extends CreateEditResourceComponent { public appService: AppService, public aceEditorService: AceEditorService, public messageHandlerService: MessageHandlerService) { - super(resourceService, appService, aceEditorService, messageHandlerService, Autoscale, 'hpa'); + super(resourceService, appService, aceEditorService, messageHandlerService, Autoscale, 'HPA'); } } diff --git a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts index 52cde6378..fee6a86f6 100644 --- a/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/create-edit-resource.ts @@ -1,4 +1,4 @@ -import { EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import { NgForm } from '@angular/forms'; @@ -22,7 +22,7 @@ export class CreateEditResourceComponent implements OnInit { aceBox: any; checkOnGoing = false; - isSubmitOnGoing = false; + isSubmitOnGoing = false; isNameValid = true; title: string; @@ -53,7 +53,7 @@ export class CreateEditResourceComponent implements OnInit { this.modalOpened = true; if (id) { this.actionType = ActionType.EDIT; - this.title = `编辑 {this.resourceType}`; + this.title = `编辑 ${this.resourceType}`; this.resourceService.getById(id, 0).subscribe( status => { this.resource = status.data; @@ -66,8 +66,9 @@ export class CreateEditResourceComponent implements OnInit { }); } else { this.actionType = ActionType.ADD_NEW; - this.title = `创建 {this.resourceType}`; + this.title = `创建 ${this.resourceType}`; this.resource = {}; + this.resource.metaDataObj = {}; this.initJsonEditor(); } } From 4d4b12e0febfa0ca0edc9d4d234b305a519bd044 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 15:50:17 +0800 Subject: [PATCH 053/112] frontend: app list add filter param --- .../src/app/admin/app/app.component.ts | 13 ++----- .../app/list-app/list-app.component.html | 3 +- .../admin/app/list-app/list-app.component.ts | 37 +------------------ .../src/app/shared/client/v1/app.service.ts | 2 +- 4 files changed, 6 insertions(+), 49 deletions(-) diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index f36656767..b7f6702cf 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -26,7 +26,6 @@ export class AppComponent implements OnInit, OnDestroy { createEditApp: CreateEditAppComponent; namespaceId: string; - idFilterInit = ''; changedApps: App[]; pageState: PageState = new PageState(); subscription: Subscription; @@ -57,15 +56,6 @@ export class AppComponent implements OnInit, OnDestroy { } ngOnInit() { - this.route.params.subscribe(params => { - this.namespaceId = params['nid']; - if (typeof (this.namespaceId) === 'undefined') { - this.namespaceId = ''; - } - if (typeof (params['aid']) !== 'undefined') { - this.idFilterInit = params['aid']; - } - }); } ngOnDestroy(): void { @@ -80,6 +70,9 @@ export class AppComponent implements OnInit, OnDestroy { } this.pageState.params['deleted'] = false; this.pageState.params['relate'] = 'namespace'; + if (this.route.snapshot.queryParams) { + this.pageState.filters = this.route.snapshot.queryParams; + } this.appService.listPage(this.pageState, this.namespaceId) .subscribe( response => { diff --git a/src/frontend/src/app/admin/app/list-app/list-app.component.html b/src/frontend/src/app/admin/app/list-app/list-app.component.html index 215a62a00..a23e55bac 100644 --- a/src/frontend/src/app/admin/app/list-app/list-app.component.html +++ b/src/frontend/src/app/admin/app/list-app/list-app.component.html @@ -40,8 +40,7 @@ {{app.id}} - {{app.name}} + {{app.name}}
{{app.metaData}} diff --git a/src/frontend/src/app/admin/app/list-app/list-app.component.ts b/src/frontend/src/app/admin/app/list-app/list-app.component.ts index ecad2dd17..8a2497877 100644 --- a/src/frontend/src/app/admin/app/list-app/list-app.component.ts +++ b/src/frontend/src/app/admin/app/list-app/list-app.component.ts @@ -26,13 +26,7 @@ export class ListAppComponent implements OnInit { constructor( private breadcrumbService: BreadcrumbService, private router: Router, - private aceEditorService: AceEditorService - ) { - breadcrumbService.hideRoute('/admin/app/user'); - breadcrumbService.hideRoute('/admin/app/deployment'); - breadcrumbService.hideRoute('/admin/app/secret'); - breadcrumbService.hideRoute('/admin/app/configmap'); - breadcrumbService.hideRoute('/admin/app/service'); + private aceEditorService: AceEditorService) { } ngOnInit(): void { @@ -58,35 +52,6 @@ export class ListAppComponent implements OnInit { this.edit.emit(app); } - goToLink(app: App, gate: string) { - let linkUrl = new Array(); - switch (gate) { - case 'deploy': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/app/deployment/[0-9]*', '[' + app.name + ']部署列表'); - linkUrl = ['admin', 'app', 'deployment', app.id]; - break; - case 'user': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/app/user/[0-9]*', '[' + app.name + ']用户列表'); - linkUrl = ['admin', 'app', 'user', app.id]; - break; - case 'service': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/app/service/[0-9]*', '[' + app.name + ']服务列表'); - linkUrl = ['admin', 'app', 'service', app.id]; - break; - case 'secret': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/app/secret/[0-9]*', '[' + app.name + ']加密字典列表'); - linkUrl = ['admin', 'app', 'secret', app.id]; - break; - case 'configmap': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/app/configmap/[0-9]*', '[' + app.name + ']配置集列表'); - linkUrl = ['admin', 'app', 'configmap', app.id]; - break; - default: - break; - } - this.router.navigate(linkUrl); - } - detailMetaDataTpl(tpl: string) { this.aceEditorService.announceMessage(AceEditorMsg.Instance(tpl, false, '元数据查看')); } diff --git a/src/frontend/src/app/shared/client/v1/app.service.ts b/src/frontend/src/app/shared/client/v1/app.service.ts index d6c7c9f8b..a09bdafd3 100644 --- a/src/frontend/src/app/shared/client/v1/app.service.ts +++ b/src/frontend/src/app/shared/client/v1/app.service.ts @@ -36,7 +36,7 @@ export class AppService { Object.getOwnPropertyNames(pageState.filters).map(key => { const value = pageState.filters[key]; if (isNotEmpty(value)) { - if (key === 'deleted' || key === 'id') { + if (key === 'deleted' || key === 'id' || key.endsWith('__exact')) { filterList.push(`${key}=${value}`); } else { filterList.push(`${key}__contains=${value}`); From c4ada0f3a2c6d41ae9604acd314249728ff4b104 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 15:50:36 +0800 Subject: [PATCH 054/112] frontend: remove app route link --- src/frontend/src/app/admin/admin-routing.module.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 94ed7fb60..ad018c4f6 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -91,27 +91,19 @@ const routes: Routes = [ {path: 'cluster/trash', component: TrashClusterComponent}, {path: 'app', component: AppComponent}, {path: 'app/trash', component: TrashAppComponent}, - {path: 'app/deployment/:aid', component: DeploymentComponent}, - {path: 'app/secret/:aid', component: SecretComponent}, - {path: 'app/configmap/:aid', component: ConfigMapComponent}, - {path: 'app/cronjob/:aid', component: CronjobComponent}, {path: 'deployment', component: DeploymentComponent}, - {path: 'deployment/app/:aid', component: AppComponent}, {path: 'deployment/trash', component: TrashDeploymentComponent}, {path: 'deployment/relate-tpl/:did', component: DeploymentTplComponent}, {path: 'deployment/tpl', component: DeploymentTplComponent}, {path: 'deployment/tpl/trash', component: TrashDeploymentTplComponent}, {path: 'namespace', component: NamespaceComponent}, {path: 'namespace/trash', component: TrashNamespaceComponent}, - {path: 'namespace/app/:nid', component: AppComponent}, {path: 'configmap', component: ConfigMapComponent}, - {path: 'configmap/app/:aid', component: AppComponent}, {path: 'configmap/trash', component: TrashConfigMapComponent}, {path: 'configmap/relate-tpl/:cid', component: ConfigMapTplComponent}, {path: 'configmap/tpl', component: ConfigMapTplComponent}, {path: 'configmap/tpl/trash', component: TrashConfigMapTplComponent}, {path: 'cronjob', component: CronjobComponent}, - {path: 'cronjob/app/:aid', component: AppComponent}, {path: 'cronjob/trash', component: TrashCronjobComponent}, {path: 'cronjob/relate-tpl/:cid', component: CronjobTplComponent}, {path: 'cronjob/tpl', component: CronjobTplComponent}, @@ -121,7 +113,6 @@ const routes: Routes = [ {path: 'system/group', component: GroupComponent}, {path: 'system/permission', component: PermissionComponent}, {path: 'secret', component: SecretComponent}, - {path: 'secret/app/:aid', component: AppComponent}, {path: 'secret/trash', component: TrashSecretComponent}, {path: 'secret/relate-tpl/:sid', component: SecretTplComponent}, {path: 'secret/tpl', component: SecretTplComponent}, @@ -154,13 +145,11 @@ const routes: Routes = [ {path: 'ingress/tpl', component: IngressTplComponent}, {path: 'ingress/tpl/trash', component: TrashIngressTplComponent}, {path: 'ingress/relate-tpl/:gid', component: IngressTplComponent}, - {path: 'ingress/app/:aid', component: AppComponent}, {path: 'hpa', component: AutoscaleComponent}, {path: 'hpa/trash', component: TrashAutoscaleComponent}, {path: 'hpa/tpl', component: AutoscaletplComponent}, {path: 'hpa/tpl/trash', component: TrashAutoscaletplComponent}, {path: 'hpa/relate-tpl/:gid', component: AutoscaletplComponent}, - {path: 'hpa/app/:aid', component: AppComponent}, {path: 'kubernetes/deployment', component: KubeDeploymentComponent}, {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent}, {path: 'kubernetes/namespace', component: KubeNamespaceComponent}, From f51229adfd5d53c190a004ada032e0746f236b73 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 16:23:28 +0800 Subject: [PATCH 055/112] frontend: admin deployment add route link --- .../list-deployment/list-deployment.component.ts | 10 ++++------ .../app/admin/deploymenttpl/deploymenttpl.component.ts | 3 +++ .../src/app/shared/client/v1/deploymenttpl.service.ts | 6 +----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts index e87f71138..78abdff20 100644 --- a/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/admin/deployment/list-deployment/list-deployment.component.ts @@ -56,20 +56,18 @@ export class ListDeploymentComponent implements OnInit { } goToLink(deployment: Deployment, gate: string) { - let linkUrl = new Array(); + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/deployment/relate-tpl/[0-9]*', '[' + deployment.name + ']模板列表'); - linkUrl = ['admin', 'deployment', 'relate-tpl', deployment.id]; + linkUrl = `/admin/deployment/tpl?deploymentId=${deployment.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/deployment/app/[0-9]*', '[' + deployment.app.name + ']项目详情'); - linkUrl = ['admin', 'deployment', 'app', deployment.app.id]; + linkUrl = `admin/app?id=${deployment.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } detailMetaDataTpl(tpl: string) { diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts index 496048053..d72acd628 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts @@ -73,6 +73,9 @@ export class DeploymentTplComponent implements OnInit, OnDestroy { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + this.pageState.filters = this.route.snapshot.queryParams; + } this.deploymentTplService.listPage(this.pageState, 0, this.deploymentId) .subscribe( response => { diff --git a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts index 2bfbb319b..7fb02b786 100644 --- a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts @@ -40,11 +40,7 @@ export class DeploymentTplService { Object.getOwnPropertyNames(pageState.filters).map(key => { const value = pageState.filters[key]; if (isNotEmpty(value)) { - if (key === 'deleted' || key === 'id') { - filterList.push(`${key}=${value}`); - } else { - filterList.push(`${key}__contains=${value}`); - } + filterList.push(`${key}=${value}`); } }); if (filterList.length) { From 0a651f05f86215dd7f3db08b6e63ebcf4026e482 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:07:38 +0800 Subject: [PATCH 056/112] frontend: configmap add route link --- .../list-configmap/list-configmap.component.ts | 12 +++++------- .../app/admin/configmaptpl/configmaptpl.component.ts | 9 +++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts index e32f1e1d9..1e10e2595 100644 --- a/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts +++ b/src/frontend/src/app/admin/configmap/list-configmap/list-configmap.component.ts @@ -57,21 +57,19 @@ export class ListConfigMapComponent implements OnInit { this.edit.emit(configMap); } - goToLink(configmap: ConfigMap, gate: string) { - let linkUrl = new Array(); + goToLink(obj: ConfigMap, gate: string) { + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/configmap/relate-tpl/[0-9]*', '[' + configmap.name + ']模板列表'); - linkUrl = ['admin', 'configmap', 'relate-tpl', configmap.id]; + linkUrl = `/admin/configmap/tpl?configMapId=${obj.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/configmap/app/[0-9]*', '[' + configmap.app.name + ']项目详情'); - linkUrl = ['admin', 'configmap', 'app', configmap.app.id]; + linkUrl = `admin/app?id=${obj.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } detailMetaDataTpl(tpl: string) { diff --git a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts index 9ea27749a..b7fa32316 100644 --- a/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts +++ b/src/frontend/src/app/admin/configmaptpl/configmaptpl.component.ts @@ -11,6 +11,7 @@ import { ListConfigMapTplComponent } from './list-configmaptpl/list-configmaptpl import { ConfigMapTpl } from '../../shared/model/v1/configmaptpl'; import { ConfigMapTplService } from '../../shared/client/v1/configmaptpl.service'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-configmaptpl', @@ -73,6 +74,14 @@ export class ConfigMapTplComponent implements OnInit, OnDestroy { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.configMapTplService.listPage(this.pageState, 0, this.configmapId) .subscribe( response => { From af03a4289d206b88bf403f1e180575b52f67e29d Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:07:55 +0800 Subject: [PATCH 057/112] frontend: pvc add route link --- .../list-persistentvolumeclaim.component.html | 6 ++++-- .../list-persistentvolumeclaim.component.ts | 20 ++++++++++++++++++- .../persistentvolumeclaimtpl.component.ts | 9 +++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html index bdc878529..5031072ce 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html +++ b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.html @@ -40,8 +40,10 @@ {{pvc.id}} - {{pvc.name}} - {{pvc.app.name}} + {{pvc.name}} + {{pvc.app.name}}
{{pvc.metaData}} diff --git a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts index a10b8e5fd..b4902517b 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaim/list-persistentvolumeclaim/list-persistentvolumeclaim.component.ts @@ -4,6 +4,8 @@ import { PersistentVolumeClaim } from '../../../shared/model/v1/persistentvolume import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; +import { Statefulset } from '../../../shared/model/v1/statefulset'; +import { Router } from '@angular/router'; @Component({ selector: 'list-persistentvolumeclaim', @@ -22,7 +24,8 @@ export class ListPersistentVolumeClaimComponent implements OnInit { @Output() edit = new EventEmitter(); - constructor(private aceEditorService: AceEditorService) { + constructor(private aceEditorService: AceEditorService, + private router: Router) { } ngOnInit(): void { @@ -44,6 +47,21 @@ export class ListPersistentVolumeClaimComponent implements OnInit { this.delete.emit(pvc); } + goToLink(obj: Statefulset, gate: string) { + let linkUrl = ''; + switch (gate) { + case 'tpl': + linkUrl = `/admin/persistentvolumeclaim/tpl?persistentVolumeClaimId=${obj.id}`; + break; + case 'app': + linkUrl = `admin/app?id=${obj.app.id}`; + break; + default: + break; + } + this.router.navigateByUrl(linkUrl); + } + editPvc(pvc: PersistentVolumeClaim) { this.edit.emit(pvc); } diff --git a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts index b9e666988..8a6bfb902 100644 --- a/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts +++ b/src/frontend/src/app/admin/persistentvolumeclaimtpl/persistentvolumeclaimtpl.component.ts @@ -13,6 +13,7 @@ import { PersistentVolumeClaimTplService } from '../../shared/client/v1/persiste import { ListPersistentVolumeClaimTplComponent } from './list-persistentvolumeclaimtpl/list-persistentvolumeclaimtpl.component'; import { PersistentVolumeClaimTpl } from '../../shared/model/v1/persistentvolumeclaimtpl'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-persistentvolumeclaimtpl', @@ -75,6 +76,14 @@ export class PersistentVolumeClaimTplComponent implements OnInit, OnDestroy { if (state) { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.pvcTplService.list(this.pageState, 0, 'false', this.pvcId) .subscribe( response => { From d18b7000ef5ed664b2720abffb8236cfacc01885 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:08:18 +0800 Subject: [PATCH 058/112] frontend: ingress add route link --- .../list-ingress/list-ingress.component.ts | 12 +++++------- .../admin/ingresstpl/ingresstpl.component.ts | 9 +++++++++ .../shared/base/admin-resource/list-resource.ts | 10 ++++------ .../base/admin-resource/resource-template.ts | 17 ++++++++++++----- .../app/shared/base/admin-resource/resource.ts | 2 -- .../shared/client/v1/deploymenttpl.service.ts | 6 +++++- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts index b08d7339a..0e2be2e37 100644 --- a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts +++ b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts @@ -56,21 +56,19 @@ export class ListIngressComponent implements OnInit { this.edit.emit(ingress); } - goToLink(ingress: Ingress, gate: string) { - let linkUrl = new Array(); + goToLink(obj: Ingress, gate: string) { + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/ingress/relate-tpl/[0-9]*', '[' + ingress.name + ']模板列表'); - linkUrl = ['admin', 'ingress', 'relate-tpl', ingress.id]; + linkUrl = `/admin/ingress/tpl?ingressId=${obj.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/ingress/app/[0-9]*', '[' + ingress.app.name + ']项目详情'); - linkUrl = ['admin', 'ingress', 'app', ingress.app.id]; + linkUrl = `admin/app?id=${obj.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } detailMetaDataTpl(tpl: string) { diff --git a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts index 437abeba6..a4bb5cb58 100644 --- a/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts +++ b/src/frontend/src/app/admin/ingresstpl/ingresstpl.component.ts @@ -12,6 +12,7 @@ import { CreateEditIngressTplComponent } from './create-edit-ingresstpl/create-e import { IngressTplService } from '../../shared/client/v1/ingresstpl.service'; import { IngressTpl } from '../../shared/model/v1/ingresstpl'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-ingresstpl', @@ -79,6 +80,14 @@ export class IngressTplComponent implements OnInit, OnDestroy { PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.ingressTplService.listPage(this.pageState, 0, this.ingressId) .subscribe( response => { diff --git a/src/frontend/src/app/shared/base/admin-resource/list-resource.ts b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts index cbb43fed7..542f0e12b 100644 --- a/src/frontend/src/app/shared/base/admin-resource/list-resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/list-resource.ts @@ -49,20 +49,18 @@ export class ListResourceComponent { } goToLink(resource: any, gate: string) { - let linkUrl = new Array(); + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex(`/admin/${this.resourceType}/relate-tpl/[0-9]*`, '[' + resource.name + ']模板列表'); - linkUrl = ['admin', this.resourceType, 'relate-tpl', resource.id]; + linkUrl = `/admin/${this.resourceType}/tpl?${this.resourceType}Id=${resource.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex(`/admin/${this.resourceType}/app/[0-9]*`, '[' + resource.app.name + ']项目详情'); - linkUrl = ['admin', this.resourceType, 'app', resource.app.id]; + linkUrl = `admin/app?id=${resource.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } viewMetaDataTemplate(tpl: string) { diff --git a/src/frontend/src/app/shared/base/admin-resource/resource-template.ts b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts index 616f3795f..657ee8afa 100644 --- a/src/frontend/src/app/shared/base/admin-resource/resource-template.ts +++ b/src/frontend/src/app/shared/base/admin-resource/resource-template.ts @@ -1,6 +1,6 @@ -import { OnInit, OnDestroy, ViewChild } from '@angular/core'; +import { OnDestroy, OnInit } from '@angular/core'; import { BreadcrumbService } from '../../client/v1/breadcrumb.service'; -import { Router, ActivatedRoute } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { ClrDatagridStateInterface } from '@clr/angular'; import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; @@ -10,6 +10,7 @@ import { MessageHandlerService } from '../../message-handler/message-handler.ser import { PageState } from '../../page/page-state'; import { CreateEditResourceTemplateComponent } from './create-edit-resource-template'; import { ListResourceTemplateComponent } from './list-resource-template'; +import { isNotEmpty } from '../../utils'; export class ResourceTemplateComponent implements OnInit, OnDestroy { // @ViewChild(CreateEditResourceTemplateComponent) @@ -33,8 +34,6 @@ export class ResourceTemplateComponent implements OnInit, OnDestroy { public componentName: string, public resourceType: string, public confirmationTargets: ConfirmationTargets) { - breadcrumbService.addFriendlyNameForRoute(`/admin/${this.resourceType}/tpl`, this.componentName + '列表'); - breadcrumbService.addFriendlyNameForRoute(`/admin/${this.resourceType}/tpl/trash`, '已删除' + this.componentName + '列表'); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && @@ -57,7 +56,7 @@ export class ResourceTemplateComponent implements OnInit, OnDestroy { ngOnInit() { this.route.params.subscribe(params => { this.resourceId = params['gid']; - if (typeof(this.resourceId) === 'undefined') { + if (typeof (this.resourceId) === 'undefined') { this.resourceId = ''; } }); @@ -75,6 +74,14 @@ export class ResourceTemplateComponent implements OnInit, OnDestroy { PageState.fromState(state, {pageSize: 10, totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.resourceTemplateService.listPage(this.pageState, 0, this.resourceId) .subscribe( response => { diff --git a/src/frontend/src/app/shared/base/admin-resource/resource.ts b/src/frontend/src/app/shared/base/admin-resource/resource.ts index 5ad11c185..e01b1d74e 100644 --- a/src/frontend/src/app/shared/base/admin-resource/resource.ts +++ b/src/frontend/src/app/shared/base/admin-resource/resource.ts @@ -31,8 +31,6 @@ export class ResourceComponent implements OnInit, OnDestroy { public deletionDialogService: ConfirmationDialogService, public componentName: string, public confirmationTarget: ConfirmationTargets) { - breadcrumbService.addFriendlyNameForRoute(`/admin/${this.componentName}`, this.componentName + '列表'); - breadcrumbService.addFriendlyNameForRoute(`/admin/${this.componentName}/trash`, '已删除' + this.componentName + '列表'); this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && diff --git a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts index 7fb02b786..2bfbb319b 100644 --- a/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts +++ b/src/frontend/src/app/shared/client/v1/deploymenttpl.service.ts @@ -40,7 +40,11 @@ export class DeploymentTplService { Object.getOwnPropertyNames(pageState.filters).map(key => { const value = pageState.filters[key]; if (isNotEmpty(value)) { - filterList.push(`${key}=${value}`); + if (key === 'deleted' || key === 'id') { + filterList.push(`${key}=${value}`); + } else { + filterList.push(`${key}__contains=${value}`); + } } }); if (filterList.length) { From 8529c4a47405b03a24a5051565fa5a092acdba9f Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:08:38 +0800 Subject: [PATCH 059/112] frontend: cronjob add route link --- .../cronjob/list-cronjob/list-cronjob.component.ts | 12 +++++------- .../app/admin/cronjobtpl/cronjobtpl.component.html | 2 +- .../src/app/admin/cronjobtpl/cronjobtpl.component.ts | 9 +++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts index ad8581307..ea14c7970 100644 --- a/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts +++ b/src/frontend/src/app/admin/cronjob/list-cronjob/list-cronjob.component.ts @@ -57,21 +57,19 @@ export class ListCronjobComponent implements OnInit { this.edit.emit(cronjob); } - goToLink(cronjob: Cronjob, gate: string) { - let linkUrl = new Array(); + goToLink(obj: Cronjob, gate: string) { + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/cronjob/relate-tpl/[0-9]*', '[' + cronjob.name + ']模板列表'); - linkUrl = ['admin', 'cronjob', 'relate-tpl', cronjob.id]; + linkUrl = `/admin/cronjob/tpl?cronjobId=${obj.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/cronjob/app/[0-9]*', '[' + cronjob.app.name + ']项目详情'); - linkUrl = ['admin', 'cronjob', 'app', cronjob.app.id]; + linkUrl = `admin/app?id=${obj.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } detailMetaDataTpl(tpl: string) { diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html index 2a646043e..3d79049f0 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.html @@ -1,7 +1,7 @@
-

{{'CRONJOB.LIST' | translate}}

+

{{'CRONJOB_ADMIN.TPL.LIST' | translate}}

diff --git a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts index 6b9bfdddc..dfeef470b 100644 --- a/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts +++ b/src/frontend/src/app/admin/cronjobtpl/cronjobtpl.component.ts @@ -11,6 +11,7 @@ import { ListCronjobTplComponent } from './list-cronjobtpl/list-cronjobtpl.compo import { CronjobTpl } from '../../shared/model/v1/cronjobtpl'; import { CronjobTplService } from '../../shared/client/v1/cronjobtpl.service'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-cronjobtpl', @@ -78,6 +79,14 @@ export class CronjobTplComponent implements OnInit, OnDestroy { }); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.cronjobTplService.listPage(this.pageState, 0, this.cronjobId) .subscribe( response => { From f408cb0c90d2d708a0bf63bc6559a0411e44241f Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:08:59 +0800 Subject: [PATCH 060/112] frontend: daemonset add route link --- .../list-daemonset/list-daemonset.component.html | 6 ++++-- .../list-daemonset/list-daemonset.component.ts | 16 ++++++++++++++++ .../admin/daemonsettpl/daemonsettpl.component.ts | 9 +++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html index 8932ed5f3..eab6dfda4 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.html @@ -40,8 +40,10 @@ {{daemonset.id}} - {{daemonset.name}} - {{daemonset.app.name}} + {{daemonset.name}} + {{daemonset.app.name}}
{{daemonset.metaData}} diff --git a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts index 895ec0418..6c65e7661 100644 --- a/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/admin/daemonset/list-daemonset/list-daemonset.component.ts @@ -6,6 +6,7 @@ import { DaemonSet } from '../../../shared/model/v1/daemonset'; import { Page } from '../../../shared/page/page-state'; import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service'; import { AceEditorMsg } from '../../../shared/ace-editor/ace-editor'; +import { Statefulset } from '../../../shared/model/v1/statefulset'; @Component({ selector: 'list-daemonset', @@ -54,6 +55,21 @@ export class ListDaemonsetComponent implements OnInit { this.edit.emit(daemonset); } + goToLink(obj: Statefulset, gate: string) { + let linkUrl = ''; + switch (gate) { + case 'tpl': + linkUrl = `/admin/daemonset/tpl?daemonSetId=${obj.id}`; + break; + case 'app': + linkUrl = `admin/app?id=${obj.app.id}`; + break; + default: + break; + } + this.router.navigateByUrl(linkUrl); + } + detailMetaDataTpl(tpl: string) { this.aceEditorService.announceMessage(AceEditorMsg.Instance(tpl, false, '元数据查看')); } diff --git a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts index 7cf3021f2..5e813d2ae 100644 --- a/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts +++ b/src/frontend/src/app/admin/daemonsettpl/daemonsettpl.component.ts @@ -11,6 +11,7 @@ import { ListDaemonsettplComponent } from './list-daemonsettpl/list-daemonsettpl import { CreateEditDaemonsettplComponent } from './create-edit-daemonsettpl/create-edit-daemonsettpl.component'; import { DaemonSetTplService } from '../../shared/client/v1/daemonsettpl.service'; import { DaemonSetTemplate } from '../../shared/model/v1/daemonsettpl'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-daemonsettpl', @@ -77,6 +78,14 @@ export class DaemonsettplComponent implements OnInit, OnDestroy { }); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.daemonsetTplService.listPage(this.pageState, this.daemonsetId) .subscribe( response => { From 532be9a2e62cae95fed47b7fa76ddf62cde685fe Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:09:15 +0800 Subject: [PATCH 061/112] frontend: secret add route link --- .../secret/list-secret/list-secret.component.ts | 12 +++++------- .../src/app/admin/secrettpl/secrettpl.component.ts | 9 +++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts index 8694cfb6f..00ab81675 100644 --- a/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts +++ b/src/frontend/src/app/admin/secret/list-secret/list-secret.component.ts @@ -59,21 +59,19 @@ export class ListSecretComponent implements OnInit { this.edit.emit(secret); } - goToLink(secret: Secret, gate: string) { - let linkUrl = new Array(); + goToLink(obj: Secret, gate: string) { + let linkUrl = ''; switch (gate) { case 'tpl': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/secret/relate-tpl/[0-9]*', '[' + secret.name + ']模板列表'); - linkUrl = ['admin', 'secret', 'relate-tpl', secret.id]; + linkUrl = `/admin/secret/tpl?secretMapId=${obj.id}`; break; case 'app': - this.breadcrumbService.addFriendlyNameForRouteRegex('/admin/secret/app/[0-9]*', '[' + secret.app.name + ']项目详情'); - linkUrl = ['admin', 'secret', 'app', secret.app.id]; + linkUrl = `admin/app?id=${obj.app.id}`; break; default: break; } - this.router.navigate(linkUrl); + this.router.navigateByUrl(linkUrl); } detailMetaDataTpl(tpl: string) { diff --git a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts index a88e2ff32..c0d745eea 100644 --- a/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts +++ b/src/frontend/src/app/admin/secrettpl/secrettpl.component.ts @@ -11,6 +11,7 @@ import { MessageHandlerService } from '../../shared/message-handler/message-hand import { SecretTpl } from '../../shared/model/v1/secrettpl'; import { SecretTplService } from '../../shared/client/v1/secrettpl.service'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-secrettpl', @@ -74,6 +75,14 @@ export class SecretTplComponent implements OnInit, OnDestroy { this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.secrettplService.listPage(this.pageState, 0, this.secretId) .subscribe( response => { From 105876857b5365d47fecf5df859472a212ce757a Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:09:35 +0800 Subject: [PATCH 062/112] frontend: statefulset add route link --- .../list-statefulset.component.html | 7 +++++-- .../list-statefulset.component.ts | 15 +++++++++++++++ .../statefulsettpl/statefulsettpl.component.ts | 9 +++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html index 2187fee24..7d7b9adee 100644 --- a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html +++ b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.html @@ -40,8 +40,11 @@ {{statefulset.id}} - {{statefulset.name}} - {{statefulset.app.name}} + + {{statefulset.name}} + {{statefulset.app.name}}
{{statefulset.metaData}} diff --git a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts index 7831f68cd..e9240ee2e 100644 --- a/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/admin/statefulset/list-statefulset/list-statefulset.component.ts @@ -52,6 +52,21 @@ export class ListStatefulsetComponent implements OnInit { this.delete.emit(statefulset); } + goToLink(obj: Statefulset, gate: string) { + let linkUrl = ''; + switch (gate) { + case 'tpl': + linkUrl = `/admin/statefulset/tpl?statefulsetId=${obj.id}`; + break; + case 'app': + linkUrl = `admin/app?id=${obj.app.id}`; + break; + default: + break; + } + this.router.navigateByUrl(linkUrl); + } + editStatefulset(statefulset: Statefulset) { this.edit.emit(statefulset); } diff --git a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts index 02499cea2..55d8a8f70 100644 --- a/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts +++ b/src/frontend/src/app/admin/statefulsettpl/statefulsettpl.component.ts @@ -11,6 +11,7 @@ import { ListStatefulsettplComponent } from './list-statefulsettpl/list-stateful import { CreateEditStatefulsettplComponent } from './create-edit-statefulsettpl/create-edit-statefulsettpl.component'; import { StatefulsetTplService } from '../../shared/client/v1/statefulsettpl.service'; import { StatefulsetTemplate } from '../../shared/model/v1/statefulsettpl'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-statefulsettpl', @@ -77,6 +78,14 @@ export class StatefulsettplComponent implements OnInit, OnDestroy { }); } this.pageState.params['deleted'] = false; + if (this.route.snapshot.queryParams) { + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); + } this.statefulsetTplService.listPage(this.pageState, this.statefulsetId) .subscribe( response => { From 22cac77dec4a9abd6707db9b340f282c85ef981b Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:10:06 +0800 Subject: [PATCH 063/112] frontend: app add route link --- src/frontend/src/app/admin/app/app.component.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/app/admin/app/app.component.ts b/src/frontend/src/app/admin/app/app.component.ts index b7f6702cf..97632df58 100644 --- a/src/frontend/src/app/admin/app/app.component.ts +++ b/src/frontend/src/app/admin/app/app.component.ts @@ -13,6 +13,7 @@ import { App } from '../../shared/model/v1/app'; import { AppService } from '../../shared/client/v1/app.service'; import { NamespaceService } from '../../shared/client/v1/namespace.service'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-app', @@ -71,7 +72,12 @@ export class AppComponent implements OnInit, OnDestroy { this.pageState.params['deleted'] = false; this.pageState.params['relate'] = 'namespace'; if (this.route.snapshot.queryParams) { - this.pageState.filters = this.route.snapshot.queryParams; + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); } this.appService.listPage(this.pageState, this.namespaceId) .subscribe( From a860802b5cbc9b40cb31a9dbfe6b10277413eef9 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:11:23 +0800 Subject: [PATCH 064/112] frontend: update admin route link breadcrumb --- src/frontend/src/app/admin/admin-routing.module.ts | 6 ------ src/frontend/src/app/admin/admin.component.ts | 12 ++++++++++++ .../admin/deploymenttpl/deploymenttpl.component.ts | 8 +++++++- src/frontend/src/assets/i18n/zh-Hans.json | 4 +++- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index ad018c4f6..a0c038fe3 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -93,19 +93,16 @@ const routes: Routes = [ {path: 'app/trash', component: TrashAppComponent}, {path: 'deployment', component: DeploymentComponent}, {path: 'deployment/trash', component: TrashDeploymentComponent}, - {path: 'deployment/relate-tpl/:did', component: DeploymentTplComponent}, {path: 'deployment/tpl', component: DeploymentTplComponent}, {path: 'deployment/tpl/trash', component: TrashDeploymentTplComponent}, {path: 'namespace', component: NamespaceComponent}, {path: 'namespace/trash', component: TrashNamespaceComponent}, {path: 'configmap', component: ConfigMapComponent}, {path: 'configmap/trash', component: TrashConfigMapComponent}, - {path: 'configmap/relate-tpl/:cid', component: ConfigMapTplComponent}, {path: 'configmap/tpl', component: ConfigMapTplComponent}, {path: 'configmap/tpl/trash', component: TrashConfigMapTplComponent}, {path: 'cronjob', component: CronjobComponent}, {path: 'cronjob/trash', component: TrashCronjobComponent}, - {path: 'cronjob/relate-tpl/:cid', component: CronjobTplComponent}, {path: 'cronjob/tpl', component: CronjobTplComponent}, {path: 'cronjob/tpl/trash', component: TrashCronjobTplComponent}, {path: 'system/user', component: UserComponent}, @@ -114,7 +111,6 @@ const routes: Routes = [ {path: 'system/permission', component: PermissionComponent}, {path: 'secret', component: SecretComponent}, {path: 'secret/trash', component: TrashSecretComponent}, - {path: 'secret/relate-tpl/:sid', component: SecretTplComponent}, {path: 'secret/tpl', component: SecretTplComponent}, {path: 'secret/tpl/trash', component: TrashSecretTplComponent}, {path: 'persistentvolumeclaim', component: PersistentVolumeClaimComponent}, @@ -144,12 +140,10 @@ const routes: Routes = [ {path: 'ingress/trash', component: TrashIngressComponent}, {path: 'ingress/tpl', component: IngressTplComponent}, {path: 'ingress/tpl/trash', component: TrashIngressTplComponent}, - {path: 'ingress/relate-tpl/:gid', component: IngressTplComponent}, {path: 'hpa', component: AutoscaleComponent}, {path: 'hpa/trash', component: TrashAutoscaleComponent}, {path: 'hpa/tpl', component: AutoscaletplComponent}, {path: 'hpa/tpl/trash', component: TrashAutoscaletplComponent}, - {path: 'hpa/relate-tpl/:gid', component: AutoscaletplComponent}, {path: 'kubernetes/deployment', component: KubeDeploymentComponent}, {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent}, {path: 'kubernetes/namespace', component: KubeNamespaceComponent}, diff --git a/src/frontend/src/app/admin/admin.component.ts b/src/frontend/src/app/admin/admin.component.ts index 20d380389..d82a16a86 100644 --- a/src/frontend/src/app/admin/admin.component.ts +++ b/src/frontend/src/app/admin/admin.component.ts @@ -165,6 +165,18 @@ export class AdminComponent implements OnInit { '/admin/persistentvolumeclaim/tpl/trash': { i18nKey: 'MENU.TEMPLATE_RECYCLED', }, + '/admin/hpa': { + i18nKey: 'MENU.HPA_LIST', + }, + '/admin/hpa/trash': { + i18nKey: 'MENU.RECYCLED', + }, + '/admin/hpa/tpl': { + i18nKey: 'MENU.TEMPLATE_LIST', + }, + '/admin/hpa/tpl/trash': { + i18nKey: 'MENU.TEMPLATE_RECYCLED', + }, '/admin/notification': { i18nKey: 'MENU.NOTIFICATION', }, diff --git a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts index d72acd628..59d0a4733 100644 --- a/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts +++ b/src/frontend/src/app/admin/deploymenttpl/deploymenttpl.component.ts @@ -11,6 +11,7 @@ import { CreateEditDeploymentTplComponent } from './create-edit-deploymenttpl/cr import { DeploymentTpl } from '../../shared/model/v1/deploymenttpl'; import { DeploymentTplService } from '../../shared/client/v1/deploymenttpl.service'; import { PageState } from '../../shared/page/page-state'; +import { isNotEmpty } from '../../shared/utils'; @Component({ selector: 'wayne-deploymenttpl', @@ -74,7 +75,12 @@ export class DeploymentTplComponent implements OnInit, OnDestroy { } this.pageState.params['deleted'] = false; if (this.route.snapshot.queryParams) { - this.pageState.filters = this.route.snapshot.queryParams; + Object.getOwnPropertyNames(this.route.snapshot.queryParams).map(key => { + const value = this.route.snapshot.queryParams[key]; + if (isNotEmpty(value)) { + this.pageState.filters[key] = value; + } + }); } this.deploymentTplService.listPage(this.pageState, 0, this.deploymentId) .subscribe( diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 69674c5e9..1ee44c8d8 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -133,6 +133,7 @@ "CRONJOB_ADMIN": { "CRONJOB_CREATE": "创建计划任务", "TPL": { + "LIST": "计划任务模版列表", "CREATE": { "CONFIGMAP": "配置集", "TEMPLATE": "模版" @@ -243,7 +244,7 @@ "DEPARTMENT": "部门概览", "DEPLOYMENT": "部署", "DEPLOYMENT_LIST": "部署列表", - "AUTO_POD_SCALE": "自动水平调度", + "AUTO_POD_SCALE": "自动水平伸缩", "K8S": "Kubernetes", "LIST": "列表", "MEMBER": "成员列表", @@ -261,6 +262,7 @@ "PV": "持久化存储", "PVC": "PVC", "PVC_LIST": "PVC 列表", + "HPA_LIST": "自动水平伸缩列表", "RECYCLED": "回收站", "RELEASE_RECORD": "上线记录", "RELEASE_STATISTICS": "上线统计", From 0ca32f62d87131eb4716c847153221223de8d3dc Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 31 Jan 2019 18:22:56 +0800 Subject: [PATCH 065/112] frontend: remove app idFilterInit var --- src/frontend/src/app/admin/app/app.component.html | 1 - src/frontend/src/app/admin/app/list-app/list-app.component.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/frontend/src/app/admin/app/app.component.html b/src/frontend/src/app/admin/app/app.component.html index 2167b301f..87f810711 100644 --- a/src/frontend/src/app/admin/app/app.component.html +++ b/src/frontend/src/app/admin/app/app.component.html @@ -14,7 +14,6 @@

项目列表

Date: Fri, 1 Feb 2019 10:41:09 +0800 Subject: [PATCH 066/112] frontend: service add route link --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index 021d2e82b..07737302e 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 021d2e82bf454c7f2488dbbd54d8420eea62247f +Subproject commit 07737302ef25c36206a1868e4047a536de2c6ac7 From 7ea104d1b4aa145e9d035de33ccc66b7c0cbe1d0 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:06:54 +0800 Subject: [PATCH 067/112] backend: add kubernetes resource param builder --- src/backend/controllers/base/parambuilder.go | 79 +++++++++++++------ .../controllers/kubernetes/proxy/proxy.go | 12 ++- 2 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/backend/controllers/base/parambuilder.go b/src/backend/controllers/base/parambuilder.go index 4703ec1bd..2a3cff96b 100644 --- a/src/backend/controllers/base/parambuilder.go +++ b/src/backend/controllers/base/parambuilder.go @@ -13,28 +13,8 @@ type ParamBuilderController struct { ResultHandlerController } -// TODO: 需要重构成独立的Controller，参考Django的generic views设计 func (c *ParamBuilderController) BuildQueryParam() *common.QueryParam { - pageNo := c.Input().Get("pageNo") - pageSize := c.Input().Get("pageSize") - if pageNo == "" { - pageNo = strconv.Itoa(defaultPageNo) - } - - if pageSize == "" { - pageSize = strconv.Itoa(defaultPageSize) - } - - no, err := strconv.ParseInt(pageNo, 10, 64) - // pageNo must bigger than zero. - if err != nil || no < 1 { - c.AbortBadRequest("Invalid pageNo in query.") - } - // pageSize must bigger than zero. - size, err := strconv.ParseInt(pageSize, 10, 64) - if err != nil || size < 1 { - c.AbortBadRequest("Invalid pageSize in query.") - } + no, size := c.buildPageParam() qmap := map[string]interface{}{} deletedStr := c.Input().Get("deleted") @@ -73,12 +53,61 @@ func (c *ParamBuilderController) BuildQueryParam() *common.QueryParam { relate = c.Input().Get("relate") } - return &common.QueryParam{PageNo: no, + return &common.QueryParam{ + PageNo: no, + PageSize: size, + Query: qmap, + Sortby: snaker.CamelToSnake(c.Input().Get("sortby")), + Relate: relate} +} + +func (c *ParamBuilderController) BuildKubernetesQueryParam() *common.QueryParam { + no, size := c.buildPageParam() + + qmap := map[string]interface{}{} + + filter := c.Input().Get("filter") + if filter != "" { + filters := strings.Split(filter, ",") + for _, param := range filters { + params := strings.Split(param, "=") + if len(params) != 2 { + continue + } + qmap[params[0]] = params[1] + } + } + + return &common.QueryParam{ + PageNo: no, PageSize: size, Query: qmap, - Sortby: snaker.CamelToSnake(c.Input().Get("sortby")), - Relate: relate, - LabelSelector: c.Input().Get("filter")} + Sortby: c.Input().Get("sortby"), + LabelSelector: c.Input().Get("labelSelector")} +} + +func (c *ParamBuilderController) buildPageParam() (no int64, size int64) { + pageNo := c.Input().Get("pageNo") + pageSize := c.Input().Get("pageSize") + if pageNo == "" { + pageNo = strconv.Itoa(defaultPageNo) + } + + if pageSize == "" { + pageSize = strconv.Itoa(defaultPageSize) + } + + no, err := strconv.ParseInt(pageNo, 10, 64) + // pageNo must bigger than zero. + if err != nil || no < 1 { + c.AbortBadRequest("Invalid pageNo in query.") + } + // pageSize must bigger than zero. + size, err = strconv.ParseInt(pageSize, 10, 64) + if err != nil || size < 1 { + c.AbortBadRequest("Invalid pageSize in query.") + } + return } func (c *ParamBuilderController) GetIDFromURL() int64 { diff --git a/src/backend/controllers/kubernetes/proxy/proxy.go b/src/backend/controllers/kubernetes/proxy/proxy.go index 5e3965476..813f24ae1 100644 --- a/src/backend/controllers/kubernetes/proxy/proxy.go +++ b/src/backend/controllers/kubernetes/proxy/proxy.go @@ -100,7 +100,7 @@ func (c *KubeProxyController) GetNames() { // @Success 200 {object} success // @router / [get] func (c *KubeProxyController) List() { - param := c.BuildQueryParam() + param := c.BuildKubernetesQueryParam() cluster := c.Ctx.Input.Param(":cluster") namespace := c.Ctx.Input.Param(":namespace") kind := c.Ctx.Input.Param(":kind") @@ -179,7 +179,6 @@ func (c *KubeProxyController) Update() { // @Param kind path string true "the resource kind" // @Param namespace path string true "the namespace want to delete" // @Param name path string true "the name want to delete" -// @Param deleteOptions body string false "the kubernetes delete options" // @Success 200 {string} delete success! // @router /:name [delete] func (c *KubeProxyController) Delete() { @@ -187,13 +186,12 @@ func (c *KubeProxyController) Delete() { namespace := c.Ctx.Input.Param(":namespace") name := c.Ctx.Input.Param(":name") kind := c.Ctx.Input.Param(":kind") - var deleteOptions meta_v1.DeleteOptions - err := json.Unmarshal(c.Ctx.Input.RequestBody, &deleteOptions) - if err != nil { - c.AbortBadRequestFormat("deleteOptions") + defaultPropagationPolicy := meta_v1.DeletePropagationBackground + defaultDeleteOptions := meta_v1.DeleteOptions{ + PropagationPolicy: &defaultPropagationPolicy, } kubeClient := c.KubeClient(cluster) - err = kubeClient.Delete(kind, namespace, name, &deleteOptions) + err := kubeClient.Delete(kind, namespace, name, &defaultDeleteOptions) if err != nil { logs.Error("Delete kubernetes resource (%s:%s:%s) from cluster (%s) error. %v", kind, namespace, name, cluster, err) c.HandleError(err) From 6ada8fd0f08c1b34cad43492b9dd2a6a6d497b7b Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:07:30 +0800 Subject: [PATCH 068/112] backend: kubernetes resource list and get names add sort by name --- src/backend/resources/proxy/proxy.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/backend/resources/proxy/proxy.go b/src/backend/resources/proxy/proxy.go index 414eb7913..2ad855250 100644 --- a/src/backend/resources/proxy/proxy.go +++ b/src/backend/resources/proxy/proxy.go @@ -1,6 +1,8 @@ package proxy import ( + "sort" + "k8s.io/apimachinery/pkg/util/json" "github.com/Qihoo360/wayne/src/backend/client" @@ -28,6 +30,10 @@ func GetPage(kubeClient client.ResourceHandler, kind string, namespace string, q commonObjs = append(commonObjs, commonObj) } + sort.Slice(commonObjs, func(i, j int) bool { + return commonObjs[j].GetProperty(dataselector.NameProperty).Compare(commonObjs[i].GetProperty(dataselector.NameProperty)) == 1 + }) + return dataselector.DataSelectPage(commonObjs, q), nil } @@ -36,6 +42,7 @@ func GetNames(kubeClient client.ResourceHandler, kind string, namespace string) if err != nil { return nil, err } + commonObjs := make([]response.NamesObject, 0) for _, obj := range objs { objByte, err := json.Marshal(obj) @@ -52,5 +59,9 @@ func GetNames(kubeClient client.ResourceHandler, kind string, namespace string) }) } + sort.Slice(commonObjs, func(i, j int) bool { + return commonObjs[i].Name < commonObjs[j].Name + }) + return commonObjs, nil } From 37a9176ad389df6b88daedf200cda99e89d870bc Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:09:04 +0800 Subject: [PATCH 069/112] frontend: update kubernetes proxy client --- .../app/shared/client/v1/kubernetes/common.ts | 65 ----------- .../shared/client/v1/kubernetes/kubernetes.ts | 105 ++++++++++++++++++ 2 files changed, 105 insertions(+), 65 deletions(-) delete mode 100644 src/frontend/src/app/shared/client/v1/kubernetes/common.ts create mode 100644 src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts b/src/frontend/src/app/shared/client/v1/kubernetes/common.ts deleted file mode 100644 index d562bd975..000000000 --- a/src/frontend/src/app/shared/client/v1/kubernetes/common.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { HttpClient } from '@angular/common/http'; -import { KubeResourcesName } from '../../../shared.const'; -import { PageState } from '../../../page/page-state'; -import { BaseClient } from './base-client'; -import { KubeDeployment } from '../../../model/v1/kubernetes/deployment'; -import { throwError } from 'rxjs'; - -@Injectable() -export class KubernetesClient { - constructor(private http: HttpClient) { - } - - get(cluster: string, kind: KubeResourcesName, namespace: string, name: string, appId?: string): Observable { - if ((typeof (appId) === 'undefined') || (!appId)) { - appId = '0'; - } - - return this.http - .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`) - .catch(error => throwError(error)); - } - - getNames(cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { - if ((typeof (appId) === 'undefined') || (!appId)) { - appId = '0'; - } - return this.http - .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/names`) - .catch(error => throwError(error)); - } - - ListPage(pageState: PageState, cluster: string, kind: KubeResourcesName, namespace: string, appId?: string): Observable { - const params = BaseClient.buildParam(pageState); - if ((typeof (appId) === 'undefined') || (!appId)) { - appId = '0'; - } - return this.http - .get(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`, {params: params}) - .catch(error => throwError(error)); - } - - create(cluster: string, kind: KubeResourcesName, namespace: string, obj: any, appId?: string): Observable { - if ((typeof (appId) === 'undefined') || (!appId)) { - appId = '0'; - } - return this.http - .post(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`, obj) - .catch(error => throwError(error)); - } - - update(cluster: string, kind: KubeResourcesName, namespace: string, name: string, obj: KubeDeployment, appId?: string): Observable { - return this.http - .put(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`, obj) - .catch(error => throwError(error)); - } - - delete(cluster: string, kind: KubeResourcesName, namespace: string, name: string, appId?: string): Observable { - return this.http - .delete(`/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`) - .catch(error => throwError(error)); - } - -} diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts b/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts new file mode 100644 index 000000000..3fed397c1 --- /dev/null +++ b/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts @@ -0,0 +1,105 @@ +// Kubernetes common client +// for all kubernetes resource proxy +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { KubeResourcesName } from '../../../shared.const'; +import { PageState } from '../../../page/page-state'; +import { BaseClient } from './base-client'; +import { throwError } from 'rxjs'; + +@Injectable() +export class KubernetesClient { + constructor(private http: HttpClient) { + } + + get(cluster: string, kind: KubeResourcesName, name: string, namespace?: string, appId?: string): Observable { + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}/${name}`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`; + } + + return this.http + .get(link) + .catch(error => throwError(error)); + } + + getNames(cluster: string, kind: KubeResourcesName, namespace?: string, appId?: string): Observable { + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}/names`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/names`; + } + return this.http + .get(link) + .catch(error => throwError(error)); + } + + listPage(pageState: PageState, cluster: string, kind: KubeResourcesName, namespace?: string, appId?: string): Observable { + const params = BaseClient.buildParam(pageState); + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`; + } + + return this.http + .get(link, {params: params}) + .catch(error => throwError(error)); + } + + create(obj: any, cluster: string, kind: KubeResourcesName, namespace?: string, appId?: string): Observable { + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}`; + } + + return this.http + .post(link, obj) + .catch(error => throwError(error)); + } + + update(obj: any, cluster: string, kind: KubeResourcesName, name: string, namespace?: string, appId?: string): Observable { + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}/${name}`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`; + } + + return this.http + .put(link, obj) + .catch(error => throwError(error)); + } + + delete(cluster: string, kind: KubeResourcesName, name: string, namespace?: string, appId?: string): Observable { + if ((typeof (appId) === 'undefined') || (!appId)) { + appId = '0'; + } + + let link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/${kind}/${name}`; + if (namespace) { + link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`; + } + + return this.http + .delete(link) + .catch(error => throwError(error)); + } + +} From bee9a4df2ecfaf24f1c3000397656876b4ef1d00 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:09:31 +0800 Subject: [PATCH 070/112] frontend: add kubernetes pod object --- .../app/shared/model/v1/kubernetes/kubepod.ts | 3383 +++++++++++++++++ src/frontend/src/app/shared/shared.const.ts | 4 +- 2 files changed, 3386 insertions(+), 1 deletion(-) create mode 100644 src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts b/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts new file mode 100644 index 000000000..5aee548de --- /dev/null +++ b/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts @@ -0,0 +1,3383 @@ +/* Do not change, this code is generated from Golang structs */ + + +export class ContainerStateTerminated { + exitCode: number; + signal: number; + reason: string; + message: string; + startedAt: Time; + finishedAt: Time; + containerID: string; + + constructor(init?: ContainerStateTerminated) { + if (!init) { + return; + } + if (init.exitCode) { + this.exitCode = init.exitCode; + } + if (init.signal) { + this.signal = init.signal; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.message) { + this.message = init.message; + } + if (init.startedAt) { + this.startedAt = init.startedAt; + } + if (init.finishedAt) { + this.finishedAt = init.finishedAt; + } + if (init.containerID) { + this.containerID = init.containerID; + } + } + + + static emptyObject(): ContainerStateTerminated { + const result = new ContainerStateTerminated(); + result.startedAt = Time.emptyObject(); + result.finishedAt = Time.emptyObject(); + return result; + } + +} + +export class ContainerStateRunning { + startedAt: Time; + + constructor(init?: ContainerStateRunning) { + if (!init) { + return; + } + if (init.startedAt) { + this.startedAt = init.startedAt; + } + } + + + static emptyObject(): ContainerStateRunning { + const result = new ContainerStateRunning(); + result.startedAt = Time.emptyObject(); + return result; + } + +} + +export class ContainerStateWaiting { + reason: string; + message: string; + + constructor(init?: ContainerStateWaiting) { + if (!init) { + return; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.message) { + this.message = init.message; + } + } + + + static emptyObject(): ContainerStateWaiting { + const result = new ContainerStateWaiting(); + return result; + } + +} + +export class ContainerState { + waiting?: ContainerStateWaiting; + running?: ContainerStateRunning; + terminated?: ContainerStateTerminated; + + constructor(init?: ContainerState) { + if (!init) { + return; + } + if (init.waiting) { + this.waiting = init.waiting; + } + if (init.running) { + this.running = init.running; + } + if (init.terminated) { + this.terminated = init.terminated; + } + } + + + static emptyObject(): ContainerState { + const result = new ContainerState(); + result.waiting = ContainerStateWaiting.emptyObject(); + result.running = ContainerStateRunning.emptyObject(); + result.terminated = ContainerStateTerminated.emptyObject(); + return result; + } + +} + +export class ContainerStatus { + name: string; + state: ContainerState; + lastState: ContainerState; + ready: boolean; + restartCount: number; + image: string; + imageID: string; + containerID: string; + + constructor(init?: ContainerStatus) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.state) { + this.state = init.state; + } + if (init.lastState) { + this.lastState = init.lastState; + } + if (init.ready) { + this.ready = init.ready; + } + if (init.restartCount) { + this.restartCount = init.restartCount; + } + if (init.image) { + this.image = init.image; + } + if (init.imageID) { + this.imageID = init.imageID; + } + if (init.containerID) { + this.containerID = init.containerID; + } + } + + + static emptyObject(): ContainerStatus { + const result = new ContainerStatus(); + result.state = ContainerState.emptyObject(); + result.lastState = ContainerState.emptyObject(); + return result; + } + +} + + + +export class PodCondition { + type: string; + status: string; + lastProbeTime: Time; + lastTransitionTime: Time; + reason: string; + message: string; + + constructor(init?: PodCondition) { + if (!init) { + return; + } + if (init.type) { + this.type = init.type; + } + if (init.status) { + this.status = init.status; + } + if (init.lastProbeTime) { + this.lastProbeTime = init.lastProbeTime; + } + if (init.lastTransitionTime) { + this.lastTransitionTime = init.lastTransitionTime; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.message) { + this.message = init.message; + } + } + + + static emptyObject(): PodCondition { + const result = new PodCondition(); + result.lastProbeTime = Time.emptyObject(); + result.lastTransitionTime = Time.emptyObject(); + return result; + } + +} + +export class PodStatus { + phase: string; + conditions: PodCondition[]; + message: string; + reason: string; + nominatedNodeName: string; + hostIP: string; + podIP: string; + startTime?: Time; + initContainerStatuses: ContainerStatus[]; + containerStatuses: ContainerStatus[]; + qosClass: string; + + constructor(init?: PodStatus) { + if (!init) { + return; + } + if (init.phase) { + this.phase = init.phase; + } + if (init.conditions) { + this.conditions = init.conditions; + } + if (init.message) { + this.message = init.message; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.nominatedNodeName) { + this.nominatedNodeName = init.nominatedNodeName; + } + if (init.hostIP) { + this.hostIP = init.hostIP; + } + if (init.podIP) { + this.podIP = init.podIP; + } + if (init.startTime) { + this.startTime = init.startTime; + } + if (init.initContainerStatuses) { + this.initContainerStatuses = init.initContainerStatuses; + } + if (init.containerStatuses) { + this.containerStatuses = init.containerStatuses; + } + if (init.qosClass) { + this.qosClass = init.qosClass; + } + } + + + static emptyObject(): PodStatus { + const result = new PodStatus(); + result.conditions = []; + result.startTime = Time.emptyObject(); + result.initContainerStatuses = []; + result.containerStatuses = []; + return result; + } + +} + +export class PodDNSConfigOption { + name: string; + value?: string; + + constructor(init?: PodDNSConfigOption) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.value) { + this.value = init.value; + } + } + + + static emptyObject(): PodDNSConfigOption { + const result = new PodDNSConfigOption(); + return result; + } + +} + +export class PodDNSConfig { + nameservers: string[]; + searches: string[]; + options: PodDNSConfigOption[]; + + constructor(init?: PodDNSConfig) { + if (!init) { + return; + } + if (init.nameservers) { + this.nameservers = init.nameservers; + } + if (init.searches) { + this.searches = init.searches; + } + if (init.options) { + this.options = init.options; + } + } + + + static emptyObject(): PodDNSConfig { + const result = new PodDNSConfig(); + result.nameservers = []; + result.searches = []; + result.options = []; + return result; + } + +} + +export class HostAlias { + ip: string; + hostnames: string[]; + + constructor(init?: HostAlias) { + if (!init) { + return; + } + if (init.ip) { + this.ip = init.ip; + } + if (init.hostnames) { + this.hostnames = init.hostnames; + } + } + + + static emptyObject(): HostAlias { + const result = new HostAlias(); + result.hostnames = []; + return result; + } + +} + +export class Toleration { + key: string; + operator: string; + value: string; + effect: string; + tolerationSeconds?: number; + + constructor(init?: Toleration) { + if (!init) { + return; + } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.value) { + this.value = init.value; + } + if (init.effect) { + this.effect = init.effect; + } + if (init.tolerationSeconds) { + this.tolerationSeconds = init.tolerationSeconds; + } + } + + + static emptyObject(): Toleration { + const result = new Toleration(); + return result; + } + +} + + +export class PodAntiAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; + + constructor(init?: PodAntiAffinity) { + if (!init) { + return; + } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } + } + + + static emptyObject(): PodAntiAffinity { + const result = new PodAntiAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; + return result; + } + +} + +export class WeightedPodAffinityTerm { + weight: number; + podAffinityTerm: PodAffinityTerm; + + constructor(init?: WeightedPodAffinityTerm) { + if (!init) { + return; + } + if (init.weight) { + this.weight = init.weight; + } + if (init.podAffinityTerm) { + this.podAffinityTerm = init.podAffinityTerm; + } + } + + + static emptyObject(): WeightedPodAffinityTerm { + const result = new WeightedPodAffinityTerm(); + result.podAffinityTerm = PodAffinityTerm.emptyObject(); + return result; + } + +} + +export class LabelSelectorRequirement { + key: string; + operator: string; + values: string[]; + + constructor(init?: LabelSelectorRequirement) { + if (!init) { + return; + } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.values) { + this.values = init.values; + } + } + + + static emptyObject(): LabelSelectorRequirement { + const result = new LabelSelectorRequirement(); + result.values = []; + return result; + } + +} + +export class LabelSelector { + matchLabels?: { [key: string]: string }; + matchExpressions: LabelSelectorRequirement[]; + + constructor(init?: LabelSelector) { + if (!init) { + return; + } + if (init.matchLabels) { + this.matchLabels = init.matchLabels; + } + if (init.matchExpressions) { + this.matchExpressions = init.matchExpressions; + } + } + + + static emptyObject(): LabelSelector { + const result = new LabelSelector(); + result.matchLabels = null; + result.matchExpressions = []; + return result; + } + +} + +export class PodAffinityTerm { + labelSelector?: LabelSelector; + namespaces: string[]; + topologyKey: string; + + constructor(init?: PodAffinityTerm) { + if (!init) { + return; + } + if (init.labelSelector) { + this.labelSelector = init.labelSelector; + } + if (init.namespaces) { + this.namespaces = init.namespaces; + } + if (init.topologyKey) { + this.topologyKey = init.topologyKey; + } + } + + + static emptyObject(): PodAffinityTerm { + const result = new PodAffinityTerm(); + result.labelSelector = LabelSelector.emptyObject(); + result.namespaces = []; + return result; + } + +} + +export class PodAffinity { + requiredDuringSchedulingIgnoredDuringExecution: PodAffinityTerm[]; + preferredDuringSchedulingIgnoredDuringExecution: WeightedPodAffinityTerm[]; + + constructor(init?: PodAffinity) { + if (!init) { + return; + } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } + } + + + static emptyObject(): PodAffinity { + const result = new PodAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = []; + result.preferredDuringSchedulingIgnoredDuringExecution = []; + return result; + } + +} + +export class PreferredSchedulingTerm { + weight: number; + preference: NodeSelectorTerm; + + constructor(init?: PreferredSchedulingTerm) { + if (!init) { + return; + } + if (init.weight) { + this.weight = init.weight; + } + if (init.preference) { + this.preference = init.preference; + } + } + + + static emptyObject(): PreferredSchedulingTerm { + const result = new PreferredSchedulingTerm(); + result.preference = NodeSelectorTerm.emptyObject(); + return result; + } + +} + +export class NodeSelectorRequirement { + key: string; + operator: string; + values: string[]; + + constructor(init?: NodeSelectorRequirement) { + if (!init) { + return; + } + if (init.key) { + this.key = init.key; + } + if (init.operator) { + this.operator = init.operator; + } + if (init.values) { + this.values = init.values; + } + } + + + static emptyObject(): NodeSelectorRequirement { + const result = new NodeSelectorRequirement(); + result.values = []; + return result; + } + +} + +export class NodeSelectorTerm { + matchExpressions: NodeSelectorRequirement[]; + + constructor(init?: NodeSelectorTerm) { + if (!init) { + return; + } + if (init.matchExpressions) { + this.matchExpressions = init.matchExpressions; + } + } + + + static emptyObject(): NodeSelectorTerm { + const result = new NodeSelectorTerm(); + result.matchExpressions = []; + return result; + } + +} + +export class NodeSelector { + nodeSelectorTerms: NodeSelectorTerm[]; + + constructor(init?: NodeSelector) { + if (!init) { + return; + } + if (init.nodeSelectorTerms) { + this.nodeSelectorTerms = init.nodeSelectorTerms; + } + } + + + static emptyObject(): NodeSelector { + const result = new NodeSelector(); + result.nodeSelectorTerms = []; + return result; + } + +} + +export class NodeAffinity { + requiredDuringSchedulingIgnoredDuringExecution?: NodeSelector; + preferredDuringSchedulingIgnoredDuringExecution: PreferredSchedulingTerm[]; + + constructor(init?: NodeAffinity) { + if (!init) { + return; + } + if (init.requiredDuringSchedulingIgnoredDuringExecution) { + this.requiredDuringSchedulingIgnoredDuringExecution = init.requiredDuringSchedulingIgnoredDuringExecution; + } + if (init.preferredDuringSchedulingIgnoredDuringExecution) { + this.preferredDuringSchedulingIgnoredDuringExecution = init.preferredDuringSchedulingIgnoredDuringExecution; + } + } + + + static emptyObject(): NodeAffinity { + const result = new NodeAffinity(); + result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); + result.preferredDuringSchedulingIgnoredDuringExecution = []; + return result; + } + +} + +export class Affinity { + nodeAffinity?: NodeAffinity; + podAffinity?: PodAffinity; + podAntiAffinity?: PodAntiAffinity; + + constructor(init?: Affinity) { + if (!init) { + return; + } + if (init.nodeAffinity) { + this.nodeAffinity = init.nodeAffinity; + } + if (init.podAffinity) { + this.podAffinity = init.podAffinity; + } + if (init.podAntiAffinity) { + this.podAntiAffinity = init.podAntiAffinity; + } + } + + + static emptyObject(): Affinity { + const result = new Affinity(); + result.nodeAffinity = NodeAffinity.emptyObject(); + result.podAffinity = PodAffinity.emptyObject(); + result.podAntiAffinity = PodAntiAffinity.emptyObject(); + return result; + } + +} + + +export class PodSecurityContext { + seLinuxOptions?: SELinuxOptions; + runAsUser?: number; + runAsGroup?: number; + runAsNonRoot?: boolean; + supplementalGroups: number[]; + fsGroup?: number; + + constructor(init?: PodSecurityContext) { + if (!init) { + return; + } + if (init.seLinuxOptions) { + this.seLinuxOptions = init.seLinuxOptions; + } + if (init.runAsUser) { + this.runAsUser = init.runAsUser; + } + if (init.runAsGroup) { + this.runAsGroup = init.runAsGroup; + } + if (init.runAsNonRoot) { + this.runAsNonRoot = init.runAsNonRoot; + } + if (init.supplementalGroups) { + this.supplementalGroups = init.supplementalGroups; + } + if (init.fsGroup) { + this.fsGroup = init.fsGroup; + } + } + + + static emptyObject(): PodSecurityContext { + const result = new PodSecurityContext(); + result.seLinuxOptions = SELinuxOptions.emptyObject(); + result.supplementalGroups = []; + return result; + } + +} + +export class SELinuxOptions { + user: string; + role: string; + type: string; + level: string; + + constructor(init?: SELinuxOptions) { + if (!init) { + return; + } + if (init.user) { + this.user = init.user; + } + if (init.role) { + this.role = init.role; + } + if (init.type) { + this.type = init.type; + } + if (init.level) { + this.level = init.level; + } + } + + + static emptyObject(): SELinuxOptions { + const result = new SELinuxOptions(); + return result; + } + +} + +export class Capabilities { + add: string[]; + drop: string[]; + + constructor(init?: Capabilities) { + if (!init) { + return; + } + if (init.add) { + this.add = init.add; + } + if (init.drop) { + this.drop = init.drop; + } + } + + + static emptyObject(): Capabilities { + const result = new Capabilities(); + result.add = []; + result.drop = []; + return result; + } + +} + +export class SecurityContext { + capabilities?: Capabilities; + privileged?: boolean; + seLinuxOptions?: SELinuxOptions; + runAsUser?: number; + runAsGroup?: number; + runAsNonRoot?: boolean; + readOnlyRootFilesystem?: boolean; + allowPrivilegeEscalation?: boolean; + + constructor(init?: SecurityContext) { + if (!init) { + return; + } + if (init.capabilities) { + this.capabilities = init.capabilities; + } + if (init.privileged) { + this.privileged = init.privileged; + } + if (init.seLinuxOptions) { + this.seLinuxOptions = init.seLinuxOptions; + } + if (init.runAsUser) { + this.runAsUser = init.runAsUser; + } + if (init.runAsGroup) { + this.runAsGroup = init.runAsGroup; + } + if (init.runAsNonRoot) { + this.runAsNonRoot = init.runAsNonRoot; + } + if (init.readOnlyRootFilesystem) { + this.readOnlyRootFilesystem = init.readOnlyRootFilesystem; + } + if (init.allowPrivilegeEscalation) { + this.allowPrivilegeEscalation = init.allowPrivilegeEscalation; + } + } + + + static emptyObject(): SecurityContext { + const result = new SecurityContext(); + result.capabilities = Capabilities.emptyObject(); + result.seLinuxOptions = SELinuxOptions.emptyObject(); + return result; + } + +} + + + + +export class Handler { + exec?: ExecAction; + httpGet?: HTTPGetAction; + tcpSocket?: TCPSocketAction; + + constructor(init?: Handler) { + if (!init) { + return; + } + if (init.exec) { + this.exec = init.exec; + } + if (init.httpGet) { + this.httpGet = init.httpGet; + } + if (init.tcpSocket) { + this.tcpSocket = init.tcpSocket; + } + } + + + static emptyObject(): Handler { + const result = new Handler(); + result.exec = ExecAction.emptyObject(); + result.httpGet = HTTPGetAction.emptyObject(); + result.tcpSocket = TCPSocketAction.emptyObject(); + return result; + } + +} + +export class Lifecycle { + postStart?: Handler; + preStop?: Handler; + + constructor(init?: Lifecycle) { + if (!init) { + return; + } + if (init.postStart) { + this.postStart = init.postStart; + } + if (init.preStop) { + this.preStop = init.preStop; + } + } + + + static emptyObject(): Lifecycle { + const result = new Lifecycle(); + result.postStart = Handler.emptyObject(); + result.preStop = Handler.emptyObject(); + return result; + } + +} + + +export class TCPSocketAction { + port: IntOrString; + host: string; + + constructor(init?: TCPSocketAction) { + if (!init) { + return; + } + if (init.port) { + this.port = init.port; + } + if (init.host) { + this.host = init.host; + } + } + + + static emptyObject(): TCPSocketAction { + const result = new TCPSocketAction(); + result.port = IntOrString.emptyObject(); + return result; + } + +} + +export class HTTPHeader { + name: string; + value: string; + + constructor(init?: HTTPHeader) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.value) { + this.value = init.value; + } + } + + + static emptyObject(): HTTPHeader { + const result = new HTTPHeader(); + return result; + } + +} + +export class IntOrString { + Type: number; + IntVal: number; + StrVal: string; + + constructor(init?: IntOrString) { + if (!init) { + return; + } + if (init.Type) { + this.Type = init.Type; + } + if (init.IntVal) { + this.IntVal = init.IntVal; + } + if (init.StrVal) { + this.StrVal = init.StrVal; + } + } + + + static emptyObject(): IntOrString { + const result = new IntOrString(); + return result; + } + +} + +export class HTTPGetAction { + path: string; + port: IntOrString; + host: string; + scheme: string; + httpHeaders: HTTPHeader[]; + + constructor(init?: HTTPGetAction) { + if (!init) { + return; + } + if (init.path) { + this.path = init.path; + } + if (init.port) { + this.port = init.port; + } + if (init.host) { + this.host = init.host; + } + if (init.scheme) { + this.scheme = init.scheme; + } + if (init.httpHeaders) { + this.httpHeaders = init.httpHeaders; + } + } + + + static emptyObject(): HTTPGetAction { + const result = new HTTPGetAction(); + result.port = IntOrString.emptyObject(); + result.httpHeaders = []; + return result; + } + +} + +export class ExecAction { + command: string[]; + + constructor(init?: ExecAction) { + if (!init) { + return; + } + if (init.command) { + this.command = init.command; + } + } + + + static emptyObject(): ExecAction { + const result = new ExecAction(); + result.command = []; + return result; + } + +} + +export class Probe { + exec?: ExecAction; + httpGet?: HTTPGetAction; + tcpSocket?: TCPSocketAction; + initialDelaySeconds: number; + timeoutSeconds: number; + periodSeconds: number; + successThreshold: number; + failureThreshold: number; + + constructor(init?: Probe) { + if (!init) { + return; + } + if (init.exec) { + this.exec = init.exec; + } + if (init.httpGet) { + this.httpGet = init.httpGet; + } + if (init.tcpSocket) { + this.tcpSocket = init.tcpSocket; + } + if (init.initialDelaySeconds) { + this.initialDelaySeconds = init.initialDelaySeconds; + } + if (init.timeoutSeconds) { + this.timeoutSeconds = init.timeoutSeconds; + } + if (init.periodSeconds) { + this.periodSeconds = init.periodSeconds; + } + if (init.successThreshold) { + this.successThreshold = init.successThreshold; + } + if (init.failureThreshold) { + this.failureThreshold = init.failureThreshold; + } + } + + + static emptyObject(): Probe { + const result = new Probe(); + result.exec = ExecAction.emptyObject(); + result.httpGet = HTTPGetAction.emptyObject(); + result.tcpSocket = TCPSocketAction.emptyObject(); + return result; + } + +} + +export class VolumeDevice { + name: string; + devicePath: string; + + constructor(init?: VolumeDevice) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.devicePath) { + this.devicePath = init.devicePath; + } + } + + + static emptyObject(): VolumeDevice { + const result = new VolumeDevice(); + return result; + } + +} + +export class VolumeMount { + name: string; + readOnly: boolean; + mountPath: string; + subPath: string; + mountPropagation?: string; + + constructor(init?: VolumeMount) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.mountPath) { + this.mountPath = init.mountPath; + } + if (init.subPath) { + this.subPath = init.subPath; + } + if (init.mountPropagation) { + this.mountPropagation = init.mountPropagation; + } + } + + + static emptyObject(): VolumeMount { + const result = new VolumeMount(); + return result; + } + +} + +export class ResourceRequirements { + limits?: { [key: string]: Quantity }; + requests?: { [key: string]: Quantity }; + + constructor(init?: ResourceRequirements) { + if (!init) { + return; + } + if (init.limits) { + this.limits = init.limits; + } + if (init.requests) { + this.requests = init.requests; + } + } + + + static emptyObject(): ResourceRequirements { + const result = new ResourceRequirements(); + result.limits = null; + result.requests = null; + return result; + } + +} + +export class SecretKeySelector { + name: string; + key: string; + optional?: boolean; + + constructor(init?: SecretKeySelector) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.key) { + this.key = init.key; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): SecretKeySelector { + const result = new SecretKeySelector(); + return result; + } + +} + +export class ConfigMapKeySelector { + name: string; + key: string; + optional?: boolean; + + constructor(init?: ConfigMapKeySelector) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.key) { + this.key = init.key; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): ConfigMapKeySelector { + const result = new ConfigMapKeySelector(); + return result; + } + +} + + +export class EnvVarSource { + fieldRef?: ObjectFieldSelector; + resourceFieldRef?: ResourceFieldSelector; + configMapKeyRef?: ConfigMapKeySelector; + secretKeyRef?: SecretKeySelector; + + constructor(init?: EnvVarSource) { + if (!init) { + return; + } + if (init.fieldRef) { + this.fieldRef = init.fieldRef; + } + if (init.resourceFieldRef) { + this.resourceFieldRef = init.resourceFieldRef; + } + if (init.configMapKeyRef) { + this.configMapKeyRef = init.configMapKeyRef; + } + if (init.secretKeyRef) { + this.secretKeyRef = init.secretKeyRef; + } + } + + + static emptyObject(): EnvVarSource { + const result = new EnvVarSource(); + result.fieldRef = ObjectFieldSelector.emptyObject(); + result.resourceFieldRef = ResourceFieldSelector.emptyObject(); + result.configMapKeyRef = ConfigMapKeySelector.emptyObject(); + result.secretKeyRef = SecretKeySelector.emptyObject(); + return result; + } + +} + +export class EnvVar { + name: string; + value: string; + valueFrom?: EnvVarSource; + + constructor(init?: EnvVar) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.value) { + this.value = init.value; + } + if (init.valueFrom) { + this.valueFrom = init.valueFrom; + } + } + + + static emptyObject(): EnvVar { + const result = new EnvVar(); + result.valueFrom = EnvVarSource.emptyObject(); + return result; + } + +} + +export class SecretEnvSource { + name: string; + optional?: boolean; + + constructor(init?: SecretEnvSource) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): SecretEnvSource { + const result = new SecretEnvSource(); + return result; + } + +} + +export class ConfigMapEnvSource { + name: string; + optional?: boolean; + + constructor(init?: ConfigMapEnvSource) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): ConfigMapEnvSource { + const result = new ConfigMapEnvSource(); + return result; + } + +} + +export class EnvFromSource { + prefix: string; + configMapRef?: ConfigMapEnvSource; + secretRef?: SecretEnvSource; + + constructor(init?: EnvFromSource) { + if (!init) { + return; + } + if (init.prefix) { + this.prefix = init.prefix; + } + if (init.configMapRef) { + this.configMapRef = init.configMapRef; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + } + + + static emptyObject(): EnvFromSource { + const result = new EnvFromSource(); + result.configMapRef = ConfigMapEnvSource.emptyObject(); + result.secretRef = SecretEnvSource.emptyObject(); + return result; + } + +} + +export class ContainerPort { + name: string; + hostPort: number; + containerPort: number; + protocol: string; + hostIP: string; + + constructor(init?: ContainerPort) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.hostPort) { + this.hostPort = init.hostPort; + } + if (init.containerPort) { + this.containerPort = init.containerPort; + } + if (init.protocol) { + this.protocol = init.protocol; + } + if (init.hostIP) { + this.hostIP = init.hostIP; + } + } + + + static emptyObject(): ContainerPort { + const result = new ContainerPort(); + return result; + } + +} + +export class Container { + name: string; + image: string; + command: string[]; + args: string[]; + workingDir: string; + ports: ContainerPort[]; + envFrom: EnvFromSource[]; + env: EnvVar[]; + resources: ResourceRequirements; + volumeMounts: VolumeMount[]; + volumeDevices: VolumeDevice[]; + livenessProbe?: Probe; + readinessProbe?: Probe; + lifecycle?: Lifecycle; + terminationMessagePath: string; + terminationMessagePolicy: string; + imagePullPolicy: string; + securityContext?: SecurityContext; + stdin: boolean; + stdinOnce: boolean; + tty: boolean; + + constructor(init?: Container) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.image) { + this.image = init.image; + } + if (init.command) { + this.command = init.command; + } + if (init.args) { + this.args = init.args; + } + if (init.workingDir) { + this.workingDir = init.workingDir; + } + if (init.ports) { + this.ports = init.ports; + } + if (init.envFrom) { + this.envFrom = init.envFrom; + } + if (init.env) { + this.env = init.env; + } + if (init.resources) { + this.resources = init.resources; + } + if (init.volumeMounts) { + this.volumeMounts = init.volumeMounts; + } + if (init.volumeDevices) { + this.volumeDevices = init.volumeDevices; + } + if (init.livenessProbe) { + this.livenessProbe = init.livenessProbe; + } + if (init.readinessProbe) { + this.readinessProbe = init.readinessProbe; + } + if (init.lifecycle) { + this.lifecycle = init.lifecycle; + } + if (init.terminationMessagePath) { + this.terminationMessagePath = init.terminationMessagePath; + } + if (init.terminationMessagePolicy) { + this.terminationMessagePolicy = init.terminationMessagePolicy; + } + if (init.imagePullPolicy) { + this.imagePullPolicy = init.imagePullPolicy; + } + if (init.securityContext) { + this.securityContext = init.securityContext; + } + if (init.stdin) { + this.stdin = init.stdin; + } + if (init.stdinOnce) { + this.stdinOnce = init.stdinOnce; + } + if (init.tty) { + this.tty = init.tty; + } + } + + + static emptyObject(): Container { + const result = new Container(); + result.command = []; + result.args = []; + result.ports = []; + result.envFrom = []; + result.env = []; + result.resources = ResourceRequirements.emptyObject(); + result.volumeMounts = []; + result.volumeDevices = []; + result.livenessProbe = Probe.emptyObject(); + result.readinessProbe = Probe.emptyObject(); + result.lifecycle = Lifecycle.emptyObject(); + result.securityContext = SecurityContext.emptyObject(); + return result; + } + +} + +export class StorageOSVolumeSource { + volumeName: string; + volumeNamespace: string; + fsType: string; + readOnly: boolean; + secretRef?: LocalObjectReference; + + constructor(init?: StorageOSVolumeSource) { + if (!init) { + return; + } + if (init.volumeName) { + this.volumeName = init.volumeName; + } + if (init.volumeNamespace) { + this.volumeNamespace = init.volumeNamespace; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + } + + + static emptyObject(): StorageOSVolumeSource { + const result = new StorageOSVolumeSource(); + result.secretRef = LocalObjectReference.emptyObject(); + return result; + } + +} + +export class ScaleIOVolumeSource { + gateway: string; + system: string; + secretRef?: LocalObjectReference; + sslEnabled: boolean; + protectionDomain: string; + storagePool: string; + storageMode: string; + volumeName: string; + fsType: string; + readOnly: boolean; + + constructor(init?: ScaleIOVolumeSource) { + if (!init) { + return; + } + if (init.gateway) { + this.gateway = init.gateway; + } + if (init.system) { + this.system = init.system; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + if (init.sslEnabled) { + this.sslEnabled = init.sslEnabled; + } + if (init.protectionDomain) { + this.protectionDomain = init.protectionDomain; + } + if (init.storagePool) { + this.storagePool = init.storagePool; + } + if (init.storageMode) { + this.storageMode = init.storageMode; + } + if (init.volumeName) { + this.volumeName = init.volumeName; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): ScaleIOVolumeSource { + const result = new ScaleIOVolumeSource(); + result.secretRef = LocalObjectReference.emptyObject(); + return result; + } + +} + +export class PortworxVolumeSource { + volumeID: string; + fsType: string; + readOnly: boolean; + + constructor(init?: PortworxVolumeSource) { + if (!init) { + return; + } + if (init.volumeID) { + this.volumeID = init.volumeID; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): PortworxVolumeSource { + const result = new PortworxVolumeSource(); + return result; + } + +} + +export class ConfigMapProjection { + name: string; + items: KeyToPath[]; + optional?: boolean; + + constructor(init?: ConfigMapProjection) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.items) { + this.items = init.items; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): ConfigMapProjection { + const result = new ConfigMapProjection(); + result.items = []; + return result; + } + +} + +export class DownwardAPIProjection { + items: DownwardAPIVolumeFile[]; + + constructor(init?: DownwardAPIProjection) { + if (!init) { + return; + } + if (init.items) { + this.items = init.items; + } + } + + + static emptyObject(): DownwardAPIProjection { + const result = new DownwardAPIProjection(); + result.items = []; + return result; + } + +} + +export class SecretProjection { + name: string; + items: KeyToPath[]; + optional?: boolean; + + constructor(init?: SecretProjection) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.items) { + this.items = init.items; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): SecretProjection { + const result = new SecretProjection(); + result.items = []; + return result; + } + +} + +export class VolumeProjection { + secret?: SecretProjection; + downwardAPI?: DownwardAPIProjection; + configMap?: ConfigMapProjection; + + constructor(init?: VolumeProjection) { + if (!init) { + return; + } + if (init.secret) { + this.secret = init.secret; + } + if (init.downwardAPI) { + this.downwardAPI = init.downwardAPI; + } + if (init.configMap) { + this.configMap = init.configMap; + } + } + + + static emptyObject(): VolumeProjection { + const result = new VolumeProjection(); + result.secret = SecretProjection.emptyObject(); + result.downwardAPI = DownwardAPIProjection.emptyObject(); + result.configMap = ConfigMapProjection.emptyObject(); + return result; + } + +} + +export class ProjectedVolumeSource { + sources: VolumeProjection[]; + defaultMode?: number; + + constructor(init?: ProjectedVolumeSource) { + if (!init) { + return; + } + if (init.sources) { + this.sources = init.sources; + } + if (init.defaultMode) { + this.defaultMode = init.defaultMode; + } + } + + + static emptyObject(): ProjectedVolumeSource { + const result = new ProjectedVolumeSource(); + result.sources = []; + return result; + } + +} + +export class PhotonPersistentDiskVolumeSource { + pdID: string; + fsType: string; + + constructor(init?: PhotonPersistentDiskVolumeSource) { + if (!init) { + return; + } + if (init.pdID) { + this.pdID = init.pdID; + } + if (init.fsType) { + this.fsType = init.fsType; + } + } + + + static emptyObject(): PhotonPersistentDiskVolumeSource { + const result = new PhotonPersistentDiskVolumeSource(); + return result; + } + +} + +export class AzureDiskVolumeSource { + diskName: string; + diskURI: string; + cachingMode?: string; + fsType?: string; + readOnly?: boolean; + kind?: string; + + constructor(init?: AzureDiskVolumeSource) { + if (!init) { + return; + } + if (init.diskName) { + this.diskName = init.diskName; + } + if (init.diskURI) { + this.diskURI = init.diskURI; + } + if (init.cachingMode) { + this.cachingMode = init.cachingMode; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.kind) { + this.kind = init.kind; + } + } + + + static emptyObject(): AzureDiskVolumeSource { + const result = new AzureDiskVolumeSource(); + return result; + } + +} + +export class QuobyteVolumeSource { + registry: string; + volume: string; + readOnly: boolean; + user: string; + group: string; + + constructor(init?: QuobyteVolumeSource) { + if (!init) { + return; + } + if (init.registry) { + this.registry = init.registry; + } + if (init.volume) { + this.volume = init.volume; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.user) { + this.user = init.user; + } + if (init.group) { + this.group = init.group; + } + } + + + static emptyObject(): QuobyteVolumeSource { + const result = new QuobyteVolumeSource(); + return result; + } + +} + +export class VsphereVirtualDiskVolumeSource { + volumePath: string; + fsType: string; + storagePolicyName: string; + storagePolicyID: string; + + constructor(init?: VsphereVirtualDiskVolumeSource) { + if (!init) { + return; + } + if (init.volumePath) { + this.volumePath = init.volumePath; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.storagePolicyName) { + this.storagePolicyName = init.storagePolicyName; + } + if (init.storagePolicyID) { + this.storagePolicyID = init.storagePolicyID; + } + } + + + static emptyObject(): VsphereVirtualDiskVolumeSource { + const result = new VsphereVirtualDiskVolumeSource(); + return result; + } + +} + +export class ConfigMapVolumeSource { + name: string; + items: KeyToPath[]; + defaultMode?: number; + optional?: boolean; + + constructor(init?: ConfigMapVolumeSource) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.items) { + this.items = init.items; + } + if (init.defaultMode) { + this.defaultMode = init.defaultMode; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): ConfigMapVolumeSource { + const result = new ConfigMapVolumeSource(); + result.items = []; + return result; + } + +} + +export class AzureFileVolumeSource { + secretName: string; + shareName: string; + readOnly: boolean; + + constructor(init?: AzureFileVolumeSource) { + if (!init) { + return; + } + if (init.secretName) { + this.secretName = init.secretName; + } + if (init.shareName) { + this.shareName = init.shareName; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): AzureFileVolumeSource { + const result = new AzureFileVolumeSource(); + return result; + } + +} + +export class FCVolumeSource { + targetWWNs: string[]; + lun?: number; + fsType: string; + readOnly: boolean; + wwids: string[]; + + constructor(init?: FCVolumeSource) { + if (!init) { + return; + } + if (init.targetWWNs) { + this.targetWWNs = init.targetWWNs; + } + if (init.lun) { + this.lun = init.lun; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.wwids) { + this.wwids = init.wwids; + } + } + + + static emptyObject(): FCVolumeSource { + const result = new FCVolumeSource(); + result.targetWWNs = []; + result.wwids = []; + return result; + } + +} + +export class ResourceFieldSelector { + containerName: string; + resource: string; + divisor: Quantity; + + constructor(init?: ResourceFieldSelector) { + if (!init) { + return; + } + if (init.containerName) { + this.containerName = init.containerName; + } + if (init.resource) { + this.resource = init.resource; + } + if (init.divisor) { + this.divisor = init.divisor; + } + } + + + static emptyObject(): ResourceFieldSelector { + const result = new ResourceFieldSelector(); + result.divisor = Quantity.emptyObject(); + return result; + } + +} + +export class ObjectFieldSelector { + apiVersion: string; + fieldPath: string; + + constructor(init?: ObjectFieldSelector) { + if (!init) { + return; + } + if (init.apiVersion) { + this.apiVersion = init.apiVersion; + } + if (init.fieldPath) { + this.fieldPath = init.fieldPath; + } + } + + + static emptyObject(): ObjectFieldSelector { + const result = new ObjectFieldSelector(); + return result; + } + +} + +export class DownwardAPIVolumeFile { + path: string; + fieldRef?: ObjectFieldSelector; + resourceFieldRef?: ResourceFieldSelector; + mode?: number; + + constructor(init?: DownwardAPIVolumeFile) { + if (!init) { + return; + } + if (init.path) { + this.path = init.path; + } + if (init.fieldRef) { + this.fieldRef = init.fieldRef; + } + if (init.resourceFieldRef) { + this.resourceFieldRef = init.resourceFieldRef; + } + if (init.mode) { + this.mode = init.mode; + } + } + + + static emptyObject(): DownwardAPIVolumeFile { + const result = new DownwardAPIVolumeFile(); + result.fieldRef = ObjectFieldSelector.emptyObject(); + result.resourceFieldRef = ResourceFieldSelector.emptyObject(); + return result; + } + +} + +export class DownwardAPIVolumeSource { + items: DownwardAPIVolumeFile[]; + defaultMode?: number; + + constructor(init?: DownwardAPIVolumeSource) { + if (!init) { + return; + } + if (init.items) { + this.items = init.items; + } + if (init.defaultMode) { + this.defaultMode = init.defaultMode; + } + } + + + static emptyObject(): DownwardAPIVolumeSource { + const result = new DownwardAPIVolumeSource(); + result.items = []; + return result; + } + +} + +export class FlockerVolumeSource { + datasetName: string; + datasetUUID: string; + + constructor(init?: FlockerVolumeSource) { + if (!init) { + return; + } + if (init.datasetName) { + this.datasetName = init.datasetName; + } + if (init.datasetUUID) { + this.datasetUUID = init.datasetUUID; + } + } + + + static emptyObject(): FlockerVolumeSource { + const result = new FlockerVolumeSource(); + return result; + } + +} + +export class CephFSVolumeSource { + monitors: string[]; + path: string; + user: string; + secretFile: string; + secretRef?: LocalObjectReference; + readOnly: boolean; + + constructor(init?: CephFSVolumeSource) { + if (!init) { + return; + } + if (init.monitors) { + this.monitors = init.monitors; + } + if (init.path) { + this.path = init.path; + } + if (init.user) { + this.user = init.user; + } + if (init.secretFile) { + this.secretFile = init.secretFile; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): CephFSVolumeSource { + const result = new CephFSVolumeSource(); + result.monitors = []; + result.secretRef = LocalObjectReference.emptyObject(); + return result; + } + +} + +export class CinderVolumeSource { + volumeID: string; + fsType: string; + readOnly: boolean; + + constructor(init?: CinderVolumeSource) { + if (!init) { + return; + } + if (init.volumeID) { + this.volumeID = init.volumeID; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): CinderVolumeSource { + const result = new CinderVolumeSource(); + return result; + } + +} + +export class FlexVolumeSource { + driver: string; + fsType: string; + secretRef?: LocalObjectReference; + readOnly: boolean; + options?: { [key: string]: string }; + + constructor(init?: FlexVolumeSource) { + if (!init) { + return; + } + if (init.driver) { + this.driver = init.driver; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.options) { + this.options = init.options; + } + } + + + static emptyObject(): FlexVolumeSource { + const result = new FlexVolumeSource(); + result.secretRef = LocalObjectReference.emptyObject(); + result.options = null; + return result; + } + +} + +export class RBDVolumeSource { + monitors: string[]; + image: string; + fsType: string; + pool: string; + user: string; + keyring: string; + secretRef?: LocalObjectReference; + readOnly: boolean; + + constructor(init?: RBDVolumeSource) { + if (!init) { + return; + } + if (init.monitors) { + this.monitors = init.monitors; + } + if (init.image) { + this.image = init.image; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.pool) { + this.pool = init.pool; + } + if (init.user) { + this.user = init.user; + } + if (init.keyring) { + this.keyring = init.keyring; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): RBDVolumeSource { + const result = new RBDVolumeSource(); + result.monitors = []; + result.secretRef = LocalObjectReference.emptyObject(); + return result; + } + +} + +export class PersistentVolumeClaimVolumeSource { + claimName: string; + readOnly: boolean; + + constructor(init?: PersistentVolumeClaimVolumeSource) { + if (!init) { + return; + } + if (init.claimName) { + this.claimName = init.claimName; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): PersistentVolumeClaimVolumeSource { + const result = new PersistentVolumeClaimVolumeSource(); + return result; + } + +} + +export class GlusterfsVolumeSource { + endpoints: string; + path: string; + readOnly: boolean; + + constructor(init?: GlusterfsVolumeSource) { + if (!init) { + return; + } + if (init.endpoints) { + this.endpoints = init.endpoints; + } + if (init.path) { + this.path = init.path; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): GlusterfsVolumeSource { + const result = new GlusterfsVolumeSource(); + return result; + } + +} + +export class LocalObjectReference { + name: string; + + constructor(init?: LocalObjectReference) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + } + + + static emptyObject(): LocalObjectReference { + const result = new LocalObjectReference(); + return result; + } + +} + +export class ISCSIVolumeSource { + targetPortal: string; + iqn: string; + lun: number; + iscsiInterface: string; + fsType: string; + readOnly: boolean; + portals: string[]; + chapAuthDiscovery: boolean; + chapAuthSession: boolean; + secretRef?: LocalObjectReference; + initiatorName?: string; + + constructor(init?: ISCSIVolumeSource) { + if (!init) { + return; + } + if (init.targetPortal) { + this.targetPortal = init.targetPortal; + } + if (init.iqn) { + this.iqn = init.iqn; + } + if (init.lun) { + this.lun = init.lun; + } + if (init.iscsiInterface) { + this.iscsiInterface = init.iscsiInterface; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + if (init.portals) { + this.portals = init.portals; + } + if (init.chapAuthDiscovery) { + this.chapAuthDiscovery = init.chapAuthDiscovery; + } + if (init.chapAuthSession) { + this.chapAuthSession = init.chapAuthSession; + } + if (init.secretRef) { + this.secretRef = init.secretRef; + } + if (init.initiatorName) { + this.initiatorName = init.initiatorName; + } + } + + + static emptyObject(): ISCSIVolumeSource { + const result = new ISCSIVolumeSource(); + result.portals = []; + result.secretRef = LocalObjectReference.emptyObject(); + return result; + } + +} + +export class NFSVolumeSource { + server: string; + path: string; + readOnly: boolean; + + constructor(init?: NFSVolumeSource) { + if (!init) { + return; + } + if (init.server) { + this.server = init.server; + } + if (init.path) { + this.path = init.path; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): NFSVolumeSource { + const result = new NFSVolumeSource(); + return result; + } + +} + +export class KeyToPath { + key: string; + path: string; + mode?: number; + + constructor(init?: KeyToPath) { + if (!init) { + return; + } + if (init.key) { + this.key = init.key; + } + if (init.path) { + this.path = init.path; + } + if (init.mode) { + this.mode = init.mode; + } + } + + + static emptyObject(): KeyToPath { + const result = new KeyToPath(); + return result; + } + +} + +export class SecretVolumeSource { + secretName: string; + items: KeyToPath[]; + defaultMode?: number; + optional?: boolean; + + constructor(init?: SecretVolumeSource) { + if (!init) { + return; + } + if (init.secretName) { + this.secretName = init.secretName; + } + if (init.items) { + this.items = init.items; + } + if (init.defaultMode) { + this.defaultMode = init.defaultMode; + } + if (init.optional) { + this.optional = init.optional; + } + } + + + static emptyObject(): SecretVolumeSource { + const result = new SecretVolumeSource(); + result.items = []; + return result; + } + +} + +export class GitRepoVolumeSource { + repository: string; + revision: string; + directory: string; + + constructor(init?: GitRepoVolumeSource) { + if (!init) { + return; + } + if (init.repository) { + this.repository = init.repository; + } + if (init.revision) { + this.revision = init.revision; + } + if (init.directory) { + this.directory = init.directory; + } + } + + + static emptyObject(): GitRepoVolumeSource { + const result = new GitRepoVolumeSource(); + return result; + } + +} + +export class AWSElasticBlockStoreVolumeSource { + volumeID: string; + fsType: string; + partition: number; + readOnly: boolean; + + constructor(init?: AWSElasticBlockStoreVolumeSource) { + if (!init) { + return; + } + if (init.volumeID) { + this.volumeID = init.volumeID; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.partition) { + this.partition = init.partition; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): AWSElasticBlockStoreVolumeSource { + const result = new AWSElasticBlockStoreVolumeSource(); + return result; + } + +} + +export class GCEPersistentDiskVolumeSource { + pdName: string; + fsType: string; + partition: number; + readOnly: boolean; + + constructor(init?: GCEPersistentDiskVolumeSource) { + if (!init) { + return; + } + if (init.pdName) { + this.pdName = init.pdName; + } + if (init.fsType) { + this.fsType = init.fsType; + } + if (init.partition) { + this.partition = init.partition; + } + if (init.readOnly) { + this.readOnly = init.readOnly; + } + } + + + static emptyObject(): GCEPersistentDiskVolumeSource { + const result = new GCEPersistentDiskVolumeSource(); + return result; + } + +} + +export class Quantity { + Format: string; + + constructor(init?: Quantity) { + if (!init) { + return; + } + if (init.Format) { + this.Format = init.Format; + } + } + + + static emptyObject(): Quantity { + const result = new Quantity(); + return result; + } + +} + +export class EmptyDirVolumeSource { + medium: string; + sizeLimit?: Quantity; + + constructor(init?: EmptyDirVolumeSource) { + if (!init) { + return; + } + if (init.medium) { + this.medium = init.medium; + } + if (init.sizeLimit) { + this.sizeLimit = init.sizeLimit; + } + } + + + static emptyObject(): EmptyDirVolumeSource { + const result = new EmptyDirVolumeSource(); + result.sizeLimit = Quantity.emptyObject(); + return result; + } + +} + +export class HostPathVolumeSource { + path: string; + type?: string; + + constructor(init?: HostPathVolumeSource) { + if (!init) { + return; + } + if (init.path) { + this.path = init.path; + } + if (init.type) { + this.type = init.type; + } + } + + + static emptyObject(): HostPathVolumeSource { + const result = new HostPathVolumeSource(); + return result; + } + +} + +export class Volume { + name: string; + hostPath?: HostPathVolumeSource; + emptyDir?: EmptyDirVolumeSource; + gcePersistentDisk?: GCEPersistentDiskVolumeSource; + awsElasticBlockStore?: AWSElasticBlockStoreVolumeSource; + gitRepo?: GitRepoVolumeSource; + secret?: SecretVolumeSource; + nfs?: NFSVolumeSource; + iscsi?: ISCSIVolumeSource; + glusterfs?: GlusterfsVolumeSource; + persistentVolumeClaim?: PersistentVolumeClaimVolumeSource; + rbd?: RBDVolumeSource; + flexVolume?: FlexVolumeSource; + cinder?: CinderVolumeSource; + cephfs?: CephFSVolumeSource; + flocker?: FlockerVolumeSource; + downwardAPI?: DownwardAPIVolumeSource; + fc?: FCVolumeSource; + azureFile?: AzureFileVolumeSource; + configMap?: ConfigMapVolumeSource; + vsphereVolume?: VsphereVirtualDiskVolumeSource; + quobyte?: QuobyteVolumeSource; + azureDisk?: AzureDiskVolumeSource; + photonPersistentDisk?: PhotonPersistentDiskVolumeSource; + projected?: ProjectedVolumeSource; + portworxVolume?: PortworxVolumeSource; + scaleIO?: ScaleIOVolumeSource; + storageos?: StorageOSVolumeSource; + + constructor(init?: Volume) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.hostPath) { + this.hostPath = init.hostPath; + } + if (init.emptyDir) { + this.emptyDir = init.emptyDir; + } + if (init.gcePersistentDisk) { + this.gcePersistentDisk = init.gcePersistentDisk; + } + if (init.awsElasticBlockStore) { + this.awsElasticBlockStore = init.awsElasticBlockStore; + } + if (init.gitRepo) { + this.gitRepo = init.gitRepo; + } + if (init.secret) { + this.secret = init.secret; + } + if (init.nfs) { + this.nfs = init.nfs; + } + if (init.iscsi) { + this.iscsi = init.iscsi; + } + if (init.glusterfs) { + this.glusterfs = init.glusterfs; + } + if (init.persistentVolumeClaim) { + this.persistentVolumeClaim = init.persistentVolumeClaim; + } + if (init.rbd) { + this.rbd = init.rbd; + } + if (init.flexVolume) { + this.flexVolume = init.flexVolume; + } + if (init.cinder) { + this.cinder = init.cinder; + } + if (init.cephfs) { + this.cephfs = init.cephfs; + } + if (init.flocker) { + this.flocker = init.flocker; + } + if (init.downwardAPI) { + this.downwardAPI = init.downwardAPI; + } + if (init.fc) { + this.fc = init.fc; + } + if (init.azureFile) { + this.azureFile = init.azureFile; + } + if (init.configMap) { + this.configMap = init.configMap; + } + if (init.vsphereVolume) { + this.vsphereVolume = init.vsphereVolume; + } + if (init.quobyte) { + this.quobyte = init.quobyte; + } + if (init.azureDisk) { + this.azureDisk = init.azureDisk; + } + if (init.photonPersistentDisk) { + this.photonPersistentDisk = init.photonPersistentDisk; + } + if (init.projected) { + this.projected = init.projected; + } + if (init.portworxVolume) { + this.portworxVolume = init.portworxVolume; + } + if (init.scaleIO) { + this.scaleIO = init.scaleIO; + } + if (init.storageos) { + this.storageos = init.storageos; + } + } + + + static emptyObject(): Volume { + const result = new Volume(); + result.hostPath = HostPathVolumeSource.emptyObject(); + result.emptyDir = EmptyDirVolumeSource.emptyObject(); + result.gcePersistentDisk = GCEPersistentDiskVolumeSource.emptyObject(); + result.awsElasticBlockStore = AWSElasticBlockStoreVolumeSource.emptyObject(); + result.gitRepo = GitRepoVolumeSource.emptyObject(); + result.secret = SecretVolumeSource.emptyObject(); + result.nfs = NFSVolumeSource.emptyObject(); + result.iscsi = ISCSIVolumeSource.emptyObject(); + result.glusterfs = GlusterfsVolumeSource.emptyObject(); + result.persistentVolumeClaim = PersistentVolumeClaimVolumeSource.emptyObject(); + result.rbd = RBDVolumeSource.emptyObject(); + result.flexVolume = FlexVolumeSource.emptyObject(); + result.cinder = CinderVolumeSource.emptyObject(); + result.cephfs = CephFSVolumeSource.emptyObject(); + result.flocker = FlockerVolumeSource.emptyObject(); + result.downwardAPI = DownwardAPIVolumeSource.emptyObject(); + result.fc = FCVolumeSource.emptyObject(); + result.azureFile = AzureFileVolumeSource.emptyObject(); + result.configMap = ConfigMapVolumeSource.emptyObject(); + result.vsphereVolume = VsphereVirtualDiskVolumeSource.emptyObject(); + result.quobyte = QuobyteVolumeSource.emptyObject(); + result.azureDisk = AzureDiskVolumeSource.emptyObject(); + result.photonPersistentDisk = PhotonPersistentDiskVolumeSource.emptyObject(); + result.projected = ProjectedVolumeSource.emptyObject(); + result.portworxVolume = PortworxVolumeSource.emptyObject(); + result.scaleIO = ScaleIOVolumeSource.emptyObject(); + result.storageos = StorageOSVolumeSource.emptyObject(); + return result; + } + +} + +export class PodSpec { + volumes: Volume[]; + initContainers: Container[]; + containers: Container[]; + restartPolicy: string; + terminationGracePeriodSeconds?: number; + activeDeadlineSeconds?: number; + dnsPolicy: string; + nodeSelector?: { [key: string]: string }; + serviceAccountName: string; + serviceAccount: string; + automountServiceAccountToken?: boolean; + nodeName: string; + hostNetwork: boolean; + hostPID: boolean; + hostIPC: boolean; + shareProcessNamespace?: boolean; + securityContext?: PodSecurityContext; + imagePullSecrets: LocalObjectReference[]; + hostname: string; + subdomain: string; + affinity?: Affinity; + schedulerName: string; + tolerations: Toleration[]; + hostAliases: HostAlias[]; + priorityClassName: string; + priority?: number; + dnsConfig?: PodDNSConfig; + + constructor(init?: PodSpec) { + if (!init) { + return; + } + if (init.volumes) { + this.volumes = init.volumes; + } + if (init.initContainers) { + this.initContainers = init.initContainers; + } + if (init.containers) { + this.containers = init.containers; + } + if (init.restartPolicy) { + this.restartPolicy = init.restartPolicy; + } + if (init.terminationGracePeriodSeconds) { + this.terminationGracePeriodSeconds = init.terminationGracePeriodSeconds; + } + if (init.activeDeadlineSeconds) { + this.activeDeadlineSeconds = init.activeDeadlineSeconds; + } + if (init.dnsPolicy) { + this.dnsPolicy = init.dnsPolicy; + } + if (init.nodeSelector) { + this.nodeSelector = init.nodeSelector; + } + if (init.serviceAccountName) { + this.serviceAccountName = init.serviceAccountName; + } + if (init.serviceAccount) { + this.serviceAccount = init.serviceAccount; + } + if (init.automountServiceAccountToken) { + this.automountServiceAccountToken = init.automountServiceAccountToken; + } + if (init.nodeName) { + this.nodeName = init.nodeName; + } + if (init.hostNetwork) { + this.hostNetwork = init.hostNetwork; + } + if (init.hostPID) { + this.hostPID = init.hostPID; + } + if (init.hostIPC) { + this.hostIPC = init.hostIPC; + } + if (init.shareProcessNamespace) { + this.shareProcessNamespace = init.shareProcessNamespace; + } + if (init.securityContext) { + this.securityContext = init.securityContext; + } + if (init.imagePullSecrets) { + this.imagePullSecrets = init.imagePullSecrets; + } + if (init.hostname) { + this.hostname = init.hostname; + } + if (init.subdomain) { + this.subdomain = init.subdomain; + } + if (init.affinity) { + this.affinity = init.affinity; + } + if (init.schedulerName) { + this.schedulerName = init.schedulerName; + } + if (init.tolerations) { + this.tolerations = init.tolerations; + } + if (init.hostAliases) { + this.hostAliases = init.hostAliases; + } + if (init.priorityClassName) { + this.priorityClassName = init.priorityClassName; + } + if (init.priority) { + this.priority = init.priority; + } + if (init.dnsConfig) { + this.dnsConfig = init.dnsConfig; + } + } + + + static emptyObject(): PodSpec { + const result = new PodSpec(); + result.volumes = []; + result.initContainers = []; + result.containers = []; + result.nodeSelector = null; + result.securityContext = PodSecurityContext.emptyObject(); + result.imagePullSecrets = []; + result.affinity = Affinity.emptyObject(); + result.tolerations = []; + result.hostAliases = []; + result.dnsConfig = PodDNSConfig.emptyObject(); + return result; + } + +} + +export class StatusCause { + reason: string; + message: string; + field: string; + + constructor(init?: StatusCause) { + if (!init) { + return; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.message) { + this.message = init.message; + } + if (init.field) { + this.field = init.field; + } + } + + + static emptyObject(): StatusCause { + const result = new StatusCause(); + return result; + } + +} + +export class StatusDetails { + name: string; + group: string; + kind: string; + uid: string; + causes: StatusCause[]; + retryAfterSeconds: number; + + constructor(init?: StatusDetails) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.group) { + this.group = init.group; + } + if (init.kind) { + this.kind = init.kind; + } + if (init.uid) { + this.uid = init.uid; + } + if (init.causes) { + this.causes = init.causes; + } + if (init.retryAfterSeconds) { + this.retryAfterSeconds = init.retryAfterSeconds; + } + } + + + static emptyObject(): StatusDetails { + const result = new StatusDetails(); + result.causes = []; + return result; + } + +} + +export class ListMeta { + selfLink: string; + resourceVersion: string; + continue: string; + + constructor(init?: ListMeta) { + if (!init) { + return; + } + if (init.selfLink) { + this.selfLink = init.selfLink; + } + if (init.resourceVersion) { + this.resourceVersion = init.resourceVersion; + } + if (init.continue) { + this.continue = init.continue; + } + } + + + static emptyObject(): ListMeta { + const result = new ListMeta(); + return result; + } + +} + +export class Status { + kind: string; + apiVersion: string; + metadata: ListMeta; + status: string; + message: string; + reason: string; + details?: StatusDetails; + code: number; + + constructor(init?: Status) { + if (!init) { + return; + } + if (init.kind) { + this.kind = init.kind; + } + if (init.apiVersion) { + this.apiVersion = init.apiVersion; + } + if (init.metadata) { + this.metadata = init.metadata; + } + if (init.status) { + this.status = init.status; + } + if (init.message) { + this.message = init.message; + } + if (init.reason) { + this.reason = init.reason; + } + if (init.details) { + this.details = init.details; + } + if (init.code) { + this.code = init.code; + } + } + + + static emptyObject(): Status { + const result = new Status(); + result.metadata = ListMeta.emptyObject(); + result.details = StatusDetails.emptyObject(); + return result; + } + +} + +export class Initializer { + name: string; + + constructor(init?: Initializer) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + } + + + static emptyObject(): Initializer { + const result = new Initializer(); + return result; + } + +} + +export class Initializers { + pending: Initializer[]; + result?: Status; + + constructor(init?: Initializers) { + if (!init) { + return; + } + if (init.pending) { + this.pending = init.pending; + } + if (init.result) { + this.result = init.result; + } + } + + + static emptyObject(): Initializers { + const result = new Initializers(); + result.pending = []; + result.result = Status.emptyObject(); + return result; + } + +} + +export class OwnerReference { + apiVersion: string; + kind: string; + name: string; + uid: string; + controller?: boolean; + blockOwnerDeletion?: boolean; + + constructor(init?: OwnerReference) { + if (!init) { + return; + } + if (init.apiVersion) { + this.apiVersion = init.apiVersion; + } + if (init.kind) { + this.kind = init.kind; + } + if (init.name) { + this.name = init.name; + } + if (init.uid) { + this.uid = init.uid; + } + if (init.controller) { + this.controller = init.controller; + } + if (init.blockOwnerDeletion) { + this.blockOwnerDeletion = init.blockOwnerDeletion; + } + } + + + static emptyObject(): OwnerReference { + const result = new OwnerReference(); + return result; + } + +} + + +export class Time { + Time: Date; + + constructor(init?: Time) { + if (!init) { + return; + } + if (init.Time) { + this.Time = new Date(init.Time as any); + } + } + + + static emptyObject(): Time { + const result = new Time(); + result.Time = null; + return result; + } + +} + +export class ObjectMeta { + name: string; + generateName: string; + namespace: string; + selfLink: string; + uid: string; + resourceVersion: string; + generation: number; + creationTimestamp: Time; + deletionTimestamp?: Time; + deletionGracePeriodSeconds?: number; + labels?: { [key: string]: string }; + annotations?: { [key: string]: string }; + ownerReferences: OwnerReference[]; + initializers?: Initializers; + finalizers: string[]; + clusterName: string; + + constructor(init?: ObjectMeta) { + if (!init) { + return; + } + if (init.name) { + this.name = init.name; + } + if (init.generateName) { + this.generateName = init.generateName; + } + if (init.namespace) { + this.namespace = init.namespace; + } + if (init.selfLink) { + this.selfLink = init.selfLink; + } + if (init.uid) { + this.uid = init.uid; + } + if (init.resourceVersion) { + this.resourceVersion = init.resourceVersion; + } + if (init.generation) { + this.generation = init.generation; + } + if (init.creationTimestamp) { + this.creationTimestamp = init.creationTimestamp; + } + if (init.deletionTimestamp) { + this.deletionTimestamp = init.deletionTimestamp; + } + if (init.deletionGracePeriodSeconds) { + this.deletionGracePeriodSeconds = init.deletionGracePeriodSeconds; + } + if (init.labels) { + this.labels = init.labels; + } + if (init.annotations) { + this.annotations = init.annotations; + } + if (init.ownerReferences) { + this.ownerReferences = init.ownerReferences; + } + if (init.initializers) { + this.initializers = init.initializers; + } + if (init.finalizers) { + this.finalizers = init.finalizers; + } + if (init.clusterName) { + this.clusterName = init.clusterName; + } + } + + + static emptyObject(): ObjectMeta { + const result = new ObjectMeta(); + result.creationTimestamp = Time.emptyObject(); + result.deletionTimestamp = Time.emptyObject(); + result.labels = null; + result.annotations = null; + result.ownerReferences = []; + result.initializers = Initializers.emptyObject(); + result.finalizers = []; + return result; + } + +} + +export class KubePod { + kind: string; + apiVersion: string; + metadata: ObjectMeta; + spec: PodSpec; + status: PodStatus; + + constructor(init?: KubePod) { + if (!init) { + return; + } + if (init.kind) { + this.kind = init.kind; + } + if (init.apiVersion) { + this.apiVersion = init.apiVersion; + } + if (init.metadata) { + this.metadata = init.metadata; + } + if (init.spec) { + this.spec = init.spec; + } + if (init.status) { + this.status = init.status; + } + } + + + static emptyObject(): KubePod { + const result = new KubePod(); + result.metadata = ObjectMeta.emptyObject(); + result.spec = PodSpec.emptyObject(); + result.status = PodStatus.emptyObject(); + return result; + } + +} diff --git a/src/frontend/src/app/shared/shared.const.ts b/src/frontend/src/app/shared/shared.const.ts index e6619bffe..e103d9111 100644 --- a/src/frontend/src/app/shared/shared.const.ts +++ b/src/frontend/src/app/shared/shared.const.ts @@ -177,7 +177,9 @@ export const enum ConfirmationTargets { DAEMONSET_TPL, TRASH_DAEMONSET_TPL, NOTIFICATION, - NODE + NODE, + HPA, + ENDPOINT } export const enum ActionType { From 9cdd23f949084836c8fd17e5b993d6c0068ab4d6 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:10:25 +0800 Subject: [PATCH 071/112] frontend: update confirmation-dialog target int to any --- .../confirmation-dialog/confirmation-dialog.component.ts | 4 ++-- .../app/shared/confirmation-dialog/confirmation-message.ts | 6 +++--- .../confirmation-dialog/confirmation-state-message.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index 41d867c59..299c22a54 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -53,7 +53,7 @@ export class ConfirmationDialogComponent implements OnDestroy { } const data: any = this.message.data ? this.message.data : {}; - const target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + const target = this.message.target ? this.message.target : ConfirmationTargets.EMPTY; this.confirmationService.cancel(new ConfirmationAcknowledgement( ConfirmationState.CANCEL, data, @@ -69,7 +69,7 @@ export class ConfirmationDialogComponent implements OnDestroy { } const data: any = this.message.data ? this.message.data : {}; - const target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY; + const target = this.message.target ? this.message.target : ConfirmationTargets.EMPTY; this.confirmationService.confirm(new ConfirmationAcknowledgement( ConfirmationState.CONFIRMED, data, diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts index 9a40a2b1c..243e29f72 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-message.ts @@ -1,18 +1,18 @@ import { ConfirmationButtons, ConfirmationTargets } from '../shared.const'; export class ConfirmationMessage { - public constructor(title: string, message: string, data: any, targetId: ConfirmationTargets, buttons?: ConfirmationButtons) { + public constructor(title: string, message: string, data: any, target: any, buttons?: ConfirmationButtons) { this.title = title; this.message = message; this.data = data; - this.targetId = targetId; + this.target = target; this.buttons = buttons ? buttons : ConfirmationButtons.CONFIRM_CANCEL; } title: string; message: string; data: any = {}; // default is empty - targetId: ConfirmationTargets = ConfirmationTargets.EMPTY; + target = ConfirmationTargets.EMPTY; param: string; buttons: ConfirmationButtons; } diff --git a/src/frontend/src/app/shared/confirmation-dialog/confirmation-state-message.ts b/src/frontend/src/app/shared/confirmation-dialog/confirmation-state-message.ts index ba6106616..41f6bff94 100644 --- a/src/frontend/src/app/shared/confirmation-dialog/confirmation-state-message.ts +++ b/src/frontend/src/app/shared/confirmation-dialog/confirmation-state-message.ts @@ -9,5 +9,5 @@ export class ConfirmationAcknowledgement { state: ConfirmationState = ConfirmationState.NA; data: any = {}; - source: ConfirmationTargets = ConfirmationTargets.EMPTY; + source: any = ConfirmationTargets.EMPTY; } From 50e36fa1895b676a415283d9a7793cd57570f00c Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:11:28 +0800 Subject: [PATCH 072/112] frontend: add kubernetes namespaced resource base class --- .../kubernetes-namespaced-list-resource.ts | 42 ++++ .../kubernetes-namespaced-resource.ts | 200 ++++++++++++++++++ .../base/kubernetes/kubernetes-resource.ts | 2 +- 3 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts create mode 100644 src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts new file mode 100644 index 000000000..3a35c905b --- /dev/null +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts @@ -0,0 +1,42 @@ +import { EventEmitter, Input, Output } from '@angular/core'; +import { ClrDatagridStateInterface } from '@clr/angular'; +import { Page } from '../../page/page-state'; +import { TplDetailService } from '../../tpl-detail/tpl-detail.service'; + +export class KubernetesNamespacedListResource { + state: ClrDatagridStateInterface; + currentPage = 1; + + @Input() page: Page; + + @Output() paginate = new EventEmitter(); + @Output() edit = new EventEmitter(); + @Output() delete = new EventEmitter(); + + constructor(public tplDetailService: TplDetailService) { + } + + versionDetail(version: string) { + this.tplDetailService.openModal(version, '详情'); + } + + onEditEvent(obj: any) { + this.edit.emit(obj); + } + + onDeleteEvent(obj: any) { + this.delete.emit(obj); + } + + refresh(state: ClrDatagridStateInterface) { + this.state = state; + this.paginate.emit(state); + } + + pageSizeChange(pageSize: number) { + this.state.page.to = pageSize - 1; + this.state.page.size = pageSize; + this.currentPage = 1; + this.paginate.emit(this.state); + } +} diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts new file mode 100644 index 000000000..a9a3f1cee --- /dev/null +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts @@ -0,0 +1,200 @@ +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { Subscription } from 'rxjs/Subscription'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { AceEditorComponent } from '../../ace-editor/ace-editor.component'; +import { AuthService } from '../../auth/auth.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ClusterService } from '../../client/v1/cluster.service'; +import { PageState } from '../../page/page-state'; +import { ClrDatagridStateInterface } from '@clr/angular'; +import { ConfirmationButtons, ConfirmationState, KubeResourceNamespace, KubeResourcePod, KubeResourcesName } from '../../shared.const'; +import { OnDestroy, OnInit } from '@angular/core'; +import { KubernetesClient } from '../../client/v1/kubernetes/kubernetes'; +import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; + +export class KubernetesNamespacedResource implements OnInit, OnDestroy { + aceEditorModal: AceEditorComponent; + + showState: object; + pageState: PageState = new PageState(); + + cluster: string; + clusters: Array; + resourceName: string; + resources: Array; + showList: any[] = Array(); + + subscription: Subscription; + resourceType: string; + kubeResource: KubeResourcesName; + + + namespaces: string[]; + namespace: string; + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService) { + this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { + if (message && + message.state === ConfirmationState.CONFIRMED && + message.source === this.kubeResource) { + const obj: any = message.data; + this.kubernetesClient + .delete(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) + .subscribe( + response => { + this.retrieveResource(); + this.messageHandlerService.showSuccess('删除成功！'); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + }); + } + + ngOnInit() { + this.initShow(); + const cluster = this.route.snapshot.params['cluster']; + this.clusterService.getNames().subscribe( + response => { + const data = response.data; + this.clusters = data.map(item => item.name); + if (data && data.length > 0 && !cluster) { + this.router.navigateByUrl(`admin/kubernetes/${this.resourceType}/${data[0].name}`); + return; + } + if (cluster) { + this.jumpToHref(cluster); + } + }, + error => this.messageHandlerService.handleError(error) + ); + } + + registResourceType(resourceType: string) { + this.resourceType = resourceType; + } + + registKubeResource(kubeResource: string) { + this.kubeResource = kubeResource; + } + + registShowSate(state: Object) { + this.showState = state; + } + + onConfirmEvent() { + Object.keys(this.showState).forEach(key => { + if (this.showList.indexOf(key) > -1) { + this.showState[key] = {hidden: false}; + } else { + this.showState[key] = {hidden: true}; + } + }); + } + + onCancelEvent() { + this.initShow(); + } + + onEditResourceEvent(obj: any) { + this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) + .subscribe( + response => { + const data = response.data; + this.aceEditorModal.openModal(data, `编辑 [${obj.metadata.name}]`, true); + }, + error => this.messageHandlerService.handleError(error) + ); + } + + onSaveResourceEvent(obj: any) { + this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace).subscribe( + resp => { + const respObj = resp.data; + respObj.spec = obj.spec; + respObj.metadata.labels = obj.metadata.labels; + respObj.metadata.annotations = obj.metadata.annotations; + this.kubernetesClient.update(respObj, this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace).subscribe( + resp2 => { + this.messageHandlerService.showSuccess(`[${obj.metadata.name}] Updated!`); + this.retrieveResource(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + + } + + initShow() { + this.showList = []; + Object.keys(this.showState).forEach(key => { + if (!this.showState[key].hidden) { + this.showList.push(key); + } + }); + } + + retrieveResource(state?: ClrDatagridStateInterface): void { + if (state) { + this.pageState = PageState.fromState(state, {totalPage: this.pageState.page.totalPage, totalCount: this.pageState.page.totalCount}); + } + if (this.cluster) { + this.kubernetesClient.listPage(this.pageState, this.cluster, KubeResourcePod, this.namespace) + .subscribe( + response => { + const data = response.data; + this.resources = data.list; + this.pageState.page.totalPage = data.totalPage; + this.pageState.page.totalCount = data.totalCount; + }, + error => this.messageHandlerService.handleError(error) + ); + } + } + + onDeleteResourceEvent(resource: any) { + const deletionMessage = new ConfirmationMessage( + '删除确认', + `是否确认删除对象 ${resource.metadata.name}`, + resource, + this.kubeResource, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); + } + + jumpToHref(cluster) { + this.cluster = cluster; + this.router.navigateByUrl(`admin/kubernetes/${this.resourceType}/${cluster}`); + this.kubernetesClient.getNames(cluster, KubeResourceNamespace).subscribe( + resp => { + this.namespaces = Array(); + const namespaces: Array = resp.data; + namespaces.map(ns => { + this.namespaces.push(ns.name); + }); + this.namespace = this.namespaces && this.namespaces.length > 0 ? this.namespaces[0] : 'default'; + // this.retrieveResource(); + }, + error => this.messageHandlerService.handleError(error) + ); + } + + ngOnDestroy(): void { + this.subscription.unsubscribe(); + } +} diff --git a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts index d4c64cd63..20cc9d46f 100644 --- a/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes/kubernetes-resource.ts @@ -19,7 +19,7 @@ export class KubernetesResource { clusters: Array; resourceName: string; resources: Array; - showList: any[] = new Array(); + showList: any[] = Array(); subscription: Subscription; resourceType: string; From 96f43255d74a5ab1646acc082cbaa90ba8b776f6 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 1 Feb 2019 18:12:47 +0800 Subject: [PATCH 073/112] frontend: add kubernetes pod resource --- .../src/app/admin/admin-routing.module.ts | 3 + src/frontend/src/app/admin/admin.module.ts | 4 +- .../kubernetes/pod/kube-pod.component.html | 45 +++++++++++ .../kubernetes/pod/kube-pod.component.ts | 61 ++++++++++++++ .../admin/kubernetes/pod/kube-pod.module.ts | 27 +++++++ .../pod/list-pod/list-pod.component.html | 79 +++++++++++++++++++ .../pod/list-pod/list-pod.component.ts | 57 +++++++++++++ .../overview/overview.component.html | 5 +- .../app/admin/sidenav/sidenav.component.html | 10 +++ 9 files changed, 288 insertions(+), 3 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/pod/kube-pod.module.ts create mode 100644 src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index a0c038fe3..acce8210c 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -68,6 +68,7 @@ import { AutoscaleComponent } from './autoscale/autoscale.component'; import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autoscale.component'; import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; +import { KubePodComponent } from './kubernetes/pod/kube-pod.component'; const routes: Routes = [ @@ -148,6 +149,8 @@ const routes: Routes = [ {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent}, {path: 'kubernetes/namespace', component: KubeNamespaceComponent}, {path: 'kubernetes/namespace/:cluster', component: KubeNamespaceComponent}, + {path: 'kubernetes/pod', component: KubePodComponent}, + {path: 'kubernetes/pod/:cluster', component: KubePodComponent}, ...ADMINROUTES ] } diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index 4517be742..b61957488 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -48,6 +48,7 @@ import { CreateEditAutoscaletplComponent } from './autoscaletpl/create-edit-auto import { ListAutoscaletplComponent } from './autoscaletpl/list-autoscaletpl/list-autoscaletpl.component'; import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; import { SidenavModule } from './sidenav/sidenav.module'; +import { KubePodModule } from './kubernetes/pod/kube-pod.module'; @NgModule({ imports: [ @@ -88,7 +89,8 @@ import { SidenavModule } from './sidenav/sidenav.module'; IngressTplModule, KubeDeploymentModule, TplDetailModule, - SidenavModule + SidenavModule, + KubePodModule, ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html new file mode 100644 index 000000000..4b8029cf9 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html @@ -0,0 +1,45 @@ +
+
+
+
+ + + + 名称 + Label + 镜像 + 状态 + PodIP + 节点 + 重启次数 + Age + + + + + {{ns}} + +
+
+ + + +
+
+ + + + diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.ts b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.ts new file mode 100644 index 000000000..87649a4b0 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.ts @@ -0,0 +1,61 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { ClusterService } from '../../../shared/client/v1/cluster.service'; +import { AuthService } from '../../../shared/auth/auth.service'; +import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component'; +import { ListPodComponent } from './list-pod/list-pod.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourcePod } from '../../../shared/shared.const'; +import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; + +const showState = { + 'name': {hidden: false}, + 'label': {hidden: false}, + 'images': {hidden: false}, + 'status': {hidden: false}, + 'podIP': {hidden: false}, + 'node': {hidden: false}, + 'restartCount': {hidden: false}, + 'age': {hidden: false}, +}; + +@Component({ + selector: 'wayne-kube-pod', + templateUrl: './kube-pod.component.html' +}) + +export class KubePodComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy { + @ViewChild(ListPodComponent) + listResourceComponent: ListPodComponent; + + @ViewChild(AceEditorComponent) + aceEditorModal: AceEditorComponent; + + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService, + public deletionDialogService: ConfirmationDialogService) { + super(kubernetesClient, route, router, clusterService, authService, messageHandlerService, deletionDialogService); + super.registResourceType('pod'); + super.registKubeResource(KubeResourcePod); + super.registShowSate(showState); + } + + ngOnInit() { + super.ngOnInit(); + } + + ngOnDestroy(): void { + super.ngOnDestroy(); + } + + + + +} diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.module.ts b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.module.ts new file mode 100644 index 000000000..15d3cbfaa --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { KubePodComponent } from './kube-pod.component'; +import { ListPodComponent } from './list-pod/list-pod.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; + +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + ], + providers: [ + KubernetesClient + ], + exports: [ + KubePodComponent, + ListPodComponent + ], + declarations: [ + KubePodComponent, + ListPodComponent + ] +}) + +export class KubePodModule { +} diff --git a/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.html b/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.html new file mode 100644 index 000000000..07253e7ee --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.html @@ -0,0 +1,79 @@ + + + + 名称 + + + + + Label + + + + + 镜像 + + + + + 状态 + + + + + PodIP + + + + + 节点 + + + + + 重启次数 + + + + + Age + + + + + + + + + + {{ obj.metadata.name }} + +
+ {{label.key}}: {{label.value}} +
+ + +
+ {{container.image}} +
+ + + {{ getPodStatus(obj) }} + {{ obj.status.podIP }} + {{ obj.spec.nodeName }} + +
+ {{state.name}}:{{state.restartCount}} +
+ + {{ obj.metadata.creationTimestamp | relativeTime}} + + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.ts b/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.ts new file mode 100644 index 000000000..74ddbb090 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.ts @@ -0,0 +1,57 @@ +import { Component, Input } from '@angular/core'; +import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; +import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; +import { KubePod } from '../../../../shared/model/v1/kubernetes/kubepod'; + + +@Component({ + selector: 'wayne-list-pod', + templateUrl: './list-pod.component.html' +}) + +export class ListPodComponent extends KubernetesNamespacedListResource { + @Input() resources: any[]; + @Input() showState: object; + + constructor(public tplDetailService: TplDetailService) { + super(tplDetailService); + } + + // getPodStatus returns the pod state + getPodStatus(pod: KubePod): string { + // Terminating + if (pod.metadata.deletionTimestamp) { + return 'Terminating'; + } + + // not running + if (pod.status.phase !== 'Running') { + return pod.status.phase; + } + + let ready = false; + let notReadyReason = ''; + for (const c of pod.status.conditions) { + if (c.type === 'Ready') { + ready = c.status === 'True'; + notReadyReason = c.reason; + } + } + + if (pod.status.reason) { + return pod.status.reason; + } + + if (notReadyReason) { + return notReadyReason; + } + + if (ready) { + return 'Running'; + } + + // Unknown? + return 'Unknown'; + } + +} diff --git a/src/frontend/src/app/admin/reportform/overview/overview.component.html b/src/frontend/src/app/admin/reportform/overview/overview.component.html index 5e7a2adb0..7c24c3f49 100644 --- a/src/frontend/src/app/admin/reportform/overview/overview.component.html +++ b/src/frontend/src/app/admin/reportform/overview/overview.component.html @@ -27,8 +27,9 @@

资源

实例数量
-

- {{summary.podTotal}} +

+ {{summary.podTotal}}

diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html index 6f1202992..2f1038b09 100644 --- a/src/frontend/src/app/admin/sidenav/sidenav.component.html +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -19,6 +19,7 @@ Dashboard +
Node +
Deployment + + + Pod + +
Date: Sat, 2 Feb 2019 10:09:48 +0800 Subject: [PATCH 074/112] frontend: update kubepod model --- .../app/shared/model/v1/kubernetes/kubepod.ts | 731 ------------------ 1 file changed, 731 deletions(-) diff --git a/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts b/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts index 5aee548de..58e8137bb 100644 --- a/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts +++ b/src/frontend/src/app/shared/model/v1/kubernetes/kubepod.ts @@ -37,14 +37,6 @@ export class ContainerStateTerminated { } } - - static emptyObject(): ContainerStateTerminated { - const result = new ContainerStateTerminated(); - result.startedAt = Time.emptyObject(); - result.finishedAt = Time.emptyObject(); - return result; - } - } export class ContainerStateRunning { @@ -59,13 +51,6 @@ export class ContainerStateRunning { } } - - static emptyObject(): ContainerStateRunning { - const result = new ContainerStateRunning(); - result.startedAt = Time.emptyObject(); - return result; - } - } export class ContainerStateWaiting { @@ -84,12 +69,6 @@ export class ContainerStateWaiting { } } - - static emptyObject(): ContainerStateWaiting { - const result = new ContainerStateWaiting(); - return result; - } - } export class ContainerState { @@ -112,15 +91,6 @@ export class ContainerState { } } - - static emptyObject(): ContainerState { - const result = new ContainerState(); - result.waiting = ContainerStateWaiting.emptyObject(); - result.running = ContainerStateRunning.emptyObject(); - result.terminated = ContainerStateTerminated.emptyObject(); - return result; - } - } export class ContainerStatus { @@ -163,14 +133,6 @@ export class ContainerStatus { } } - - static emptyObject(): ContainerStatus { - const result = new ContainerStatus(); - result.state = ContainerState.emptyObject(); - result.lastState = ContainerState.emptyObject(); - return result; - } - } @@ -207,14 +169,6 @@ export class PodCondition { } } - - static emptyObject(): PodCondition { - const result = new PodCondition(); - result.lastProbeTime = Time.emptyObject(); - result.lastTransitionTime = Time.emptyObject(); - return result; - } - } export class PodStatus { @@ -269,16 +223,6 @@ export class PodStatus { } } - - static emptyObject(): PodStatus { - const result = new PodStatus(); - result.conditions = []; - result.startTime = Time.emptyObject(); - result.initContainerStatuses = []; - result.containerStatuses = []; - return result; - } - } export class PodDNSConfigOption { @@ -297,12 +241,6 @@ export class PodDNSConfigOption { } } - - static emptyObject(): PodDNSConfigOption { - const result = new PodDNSConfigOption(); - return result; - } - } export class PodDNSConfig { @@ -325,15 +263,6 @@ export class PodDNSConfig { } } - - static emptyObject(): PodDNSConfig { - const result = new PodDNSConfig(); - result.nameservers = []; - result.searches = []; - result.options = []; - return result; - } - } export class HostAlias { @@ -352,13 +281,6 @@ export class HostAlias { } } - - static emptyObject(): HostAlias { - const result = new HostAlias(); - result.hostnames = []; - return result; - } - } export class Toleration { @@ -389,12 +311,6 @@ export class Toleration { } } - - static emptyObject(): Toleration { - const result = new Toleration(); - return result; - } - } @@ -414,14 +330,6 @@ export class PodAntiAffinity { } } - - static emptyObject(): PodAntiAffinity { - const result = new PodAntiAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - } export class WeightedPodAffinityTerm { @@ -440,13 +348,6 @@ export class WeightedPodAffinityTerm { } } - - static emptyObject(): WeightedPodAffinityTerm { - const result = new WeightedPodAffinityTerm(); - result.podAffinityTerm = PodAffinityTerm.emptyObject(); - return result; - } - } export class LabelSelectorRequirement { @@ -469,13 +370,6 @@ export class LabelSelectorRequirement { } } - - static emptyObject(): LabelSelectorRequirement { - const result = new LabelSelectorRequirement(); - result.values = []; - return result; - } - } export class LabelSelector { @@ -494,14 +388,6 @@ export class LabelSelector { } } - - static emptyObject(): LabelSelector { - const result = new LabelSelector(); - result.matchLabels = null; - result.matchExpressions = []; - return result; - } - } export class PodAffinityTerm { @@ -524,14 +410,6 @@ export class PodAffinityTerm { } } - - static emptyObject(): PodAffinityTerm { - const result = new PodAffinityTerm(); - result.labelSelector = LabelSelector.emptyObject(); - result.namespaces = []; - return result; - } - } export class PodAffinity { @@ -550,14 +428,6 @@ export class PodAffinity { } } - - static emptyObject(): PodAffinity { - const result = new PodAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = []; - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - } export class PreferredSchedulingTerm { @@ -576,13 +446,6 @@ export class PreferredSchedulingTerm { } } - - static emptyObject(): PreferredSchedulingTerm { - const result = new PreferredSchedulingTerm(); - result.preference = NodeSelectorTerm.emptyObject(); - return result; - } - } export class NodeSelectorRequirement { @@ -605,13 +468,6 @@ export class NodeSelectorRequirement { } } - - static emptyObject(): NodeSelectorRequirement { - const result = new NodeSelectorRequirement(); - result.values = []; - return result; - } - } export class NodeSelectorTerm { @@ -626,13 +482,6 @@ export class NodeSelectorTerm { } } - - static emptyObject(): NodeSelectorTerm { - const result = new NodeSelectorTerm(); - result.matchExpressions = []; - return result; - } - } export class NodeSelector { @@ -647,13 +496,6 @@ export class NodeSelector { } } - - static emptyObject(): NodeSelector { - const result = new NodeSelector(); - result.nodeSelectorTerms = []; - return result; - } - } export class NodeAffinity { @@ -672,14 +514,6 @@ export class NodeAffinity { } } - - static emptyObject(): NodeAffinity { - const result = new NodeAffinity(); - result.requiredDuringSchedulingIgnoredDuringExecution = NodeSelector.emptyObject(); - result.preferredDuringSchedulingIgnoredDuringExecution = []; - return result; - } - } export class Affinity { @@ -702,15 +536,6 @@ export class Affinity { } } - - static emptyObject(): Affinity { - const result = new Affinity(); - result.nodeAffinity = NodeAffinity.emptyObject(); - result.podAffinity = PodAffinity.emptyObject(); - result.podAntiAffinity = PodAntiAffinity.emptyObject(); - return result; - } - } @@ -746,14 +571,6 @@ export class PodSecurityContext { } } - - static emptyObject(): PodSecurityContext { - const result = new PodSecurityContext(); - result.seLinuxOptions = SELinuxOptions.emptyObject(); - result.supplementalGroups = []; - return result; - } - } export class SELinuxOptions { @@ -780,12 +597,6 @@ export class SELinuxOptions { } } - - static emptyObject(): SELinuxOptions { - const result = new SELinuxOptions(); - return result; - } - } export class Capabilities { @@ -804,14 +615,6 @@ export class Capabilities { } } - - static emptyObject(): Capabilities { - const result = new Capabilities(); - result.add = []; - result.drop = []; - return result; - } - } export class SecurityContext { @@ -854,14 +657,6 @@ export class SecurityContext { } } - - static emptyObject(): SecurityContext { - const result = new SecurityContext(); - result.capabilities = Capabilities.emptyObject(); - result.seLinuxOptions = SELinuxOptions.emptyObject(); - return result; - } - } @@ -887,15 +682,6 @@ export class Handler { } } - - static emptyObject(): Handler { - const result = new Handler(); - result.exec = ExecAction.emptyObject(); - result.httpGet = HTTPGetAction.emptyObject(); - result.tcpSocket = TCPSocketAction.emptyObject(); - return result; - } - } export class Lifecycle { @@ -914,14 +700,6 @@ export class Lifecycle { } } - - static emptyObject(): Lifecycle { - const result = new Lifecycle(); - result.postStart = Handler.emptyObject(); - result.preStop = Handler.emptyObject(); - return result; - } - } @@ -941,13 +719,6 @@ export class TCPSocketAction { } } - - static emptyObject(): TCPSocketAction { - const result = new TCPSocketAction(); - result.port = IntOrString.emptyObject(); - return result; - } - } export class HTTPHeader { @@ -966,12 +737,6 @@ export class HTTPHeader { } } - - static emptyObject(): HTTPHeader { - const result = new HTTPHeader(); - return result; - } - } export class IntOrString { @@ -994,12 +759,6 @@ export class IntOrString { } } - - static emptyObject(): IntOrString { - const result = new IntOrString(); - return result; - } - } export class HTTPGetAction { @@ -1030,14 +789,6 @@ export class HTTPGetAction { } } - - static emptyObject(): HTTPGetAction { - const result = new HTTPGetAction(); - result.port = IntOrString.emptyObject(); - result.httpHeaders = []; - return result; - } - } export class ExecAction { @@ -1052,13 +803,6 @@ export class ExecAction { } } - - static emptyObject(): ExecAction { - const result = new ExecAction(); - result.command = []; - return result; - } - } export class Probe { @@ -1101,15 +845,6 @@ export class Probe { } } - - static emptyObject(): Probe { - const result = new Probe(); - result.exec = ExecAction.emptyObject(); - result.httpGet = HTTPGetAction.emptyObject(); - result.tcpSocket = TCPSocketAction.emptyObject(); - return result; - } - } export class VolumeDevice { @@ -1128,12 +863,6 @@ export class VolumeDevice { } } - - static emptyObject(): VolumeDevice { - const result = new VolumeDevice(); - return result; - } - } export class VolumeMount { @@ -1164,12 +893,6 @@ export class VolumeMount { } } - - static emptyObject(): VolumeMount { - const result = new VolumeMount(); - return result; - } - } export class ResourceRequirements { @@ -1188,14 +911,6 @@ export class ResourceRequirements { } } - - static emptyObject(): ResourceRequirements { - const result = new ResourceRequirements(); - result.limits = null; - result.requests = null; - return result; - } - } export class SecretKeySelector { @@ -1218,12 +933,6 @@ export class SecretKeySelector { } } - - static emptyObject(): SecretKeySelector { - const result = new SecretKeySelector(); - return result; - } - } export class ConfigMapKeySelector { @@ -1246,12 +955,6 @@ export class ConfigMapKeySelector { } } - - static emptyObject(): ConfigMapKeySelector { - const result = new ConfigMapKeySelector(); - return result; - } - } @@ -1279,16 +982,6 @@ export class EnvVarSource { } } - - static emptyObject(): EnvVarSource { - const result = new EnvVarSource(); - result.fieldRef = ObjectFieldSelector.emptyObject(); - result.resourceFieldRef = ResourceFieldSelector.emptyObject(); - result.configMapKeyRef = ConfigMapKeySelector.emptyObject(); - result.secretKeyRef = SecretKeySelector.emptyObject(); - return result; - } - } export class EnvVar { @@ -1311,13 +1004,6 @@ export class EnvVar { } } - - static emptyObject(): EnvVar { - const result = new EnvVar(); - result.valueFrom = EnvVarSource.emptyObject(); - return result; - } - } export class SecretEnvSource { @@ -1336,12 +1022,6 @@ export class SecretEnvSource { } } - - static emptyObject(): SecretEnvSource { - const result = new SecretEnvSource(); - return result; - } - } export class ConfigMapEnvSource { @@ -1360,12 +1040,6 @@ export class ConfigMapEnvSource { } } - - static emptyObject(): ConfigMapEnvSource { - const result = new ConfigMapEnvSource(); - return result; - } - } export class EnvFromSource { @@ -1388,14 +1062,6 @@ export class EnvFromSource { } } - - static emptyObject(): EnvFromSource { - const result = new EnvFromSource(); - result.configMapRef = ConfigMapEnvSource.emptyObject(); - result.secretRef = SecretEnvSource.emptyObject(); - return result; - } - } export class ContainerPort { @@ -1426,12 +1092,6 @@ export class ContainerPort { } } - - static emptyObject(): ContainerPort { - const result = new ContainerPort(); - return result; - } - } export class Container { @@ -1526,24 +1186,6 @@ export class Container { } } - - static emptyObject(): Container { - const result = new Container(); - result.command = []; - result.args = []; - result.ports = []; - result.envFrom = []; - result.env = []; - result.resources = ResourceRequirements.emptyObject(); - result.volumeMounts = []; - result.volumeDevices = []; - result.livenessProbe = Probe.emptyObject(); - result.readinessProbe = Probe.emptyObject(); - result.lifecycle = Lifecycle.emptyObject(); - result.securityContext = SecurityContext.emptyObject(); - return result; - } - } export class StorageOSVolumeSource { @@ -1574,13 +1216,6 @@ export class StorageOSVolumeSource { } } - - static emptyObject(): StorageOSVolumeSource { - const result = new StorageOSVolumeSource(); - result.secretRef = LocalObjectReference.emptyObject(); - return result; - } - } export class ScaleIOVolumeSource { @@ -1631,13 +1266,6 @@ export class ScaleIOVolumeSource { } } - - static emptyObject(): ScaleIOVolumeSource { - const result = new ScaleIOVolumeSource(); - result.secretRef = LocalObjectReference.emptyObject(); - return result; - } - } export class PortworxVolumeSource { @@ -1660,12 +1288,6 @@ export class PortworxVolumeSource { } } - - static emptyObject(): PortworxVolumeSource { - const result = new PortworxVolumeSource(); - return result; - } - } export class ConfigMapProjection { @@ -1688,13 +1310,6 @@ export class ConfigMapProjection { } } - - static emptyObject(): ConfigMapProjection { - const result = new ConfigMapProjection(); - result.items = []; - return result; - } - } export class DownwardAPIProjection { @@ -1709,13 +1324,6 @@ export class DownwardAPIProjection { } } - - static emptyObject(): DownwardAPIProjection { - const result = new DownwardAPIProjection(); - result.items = []; - return result; - } - } export class SecretProjection { @@ -1738,13 +1346,6 @@ export class SecretProjection { } } - - static emptyObject(): SecretProjection { - const result = new SecretProjection(); - result.items = []; - return result; - } - } export class VolumeProjection { @@ -1767,15 +1368,6 @@ export class VolumeProjection { } } - - static emptyObject(): VolumeProjection { - const result = new VolumeProjection(); - result.secret = SecretProjection.emptyObject(); - result.downwardAPI = DownwardAPIProjection.emptyObject(); - result.configMap = ConfigMapProjection.emptyObject(); - return result; - } - } export class ProjectedVolumeSource { @@ -1794,13 +1386,6 @@ export class ProjectedVolumeSource { } } - - static emptyObject(): ProjectedVolumeSource { - const result = new ProjectedVolumeSource(); - result.sources = []; - return result; - } - } export class PhotonPersistentDiskVolumeSource { @@ -1819,12 +1404,6 @@ export class PhotonPersistentDiskVolumeSource { } } - - static emptyObject(): PhotonPersistentDiskVolumeSource { - const result = new PhotonPersistentDiskVolumeSource(); - return result; - } - } export class AzureDiskVolumeSource { @@ -1859,12 +1438,6 @@ export class AzureDiskVolumeSource { } } - - static emptyObject(): AzureDiskVolumeSource { - const result = new AzureDiskVolumeSource(); - return result; - } - } export class QuobyteVolumeSource { @@ -1895,12 +1468,6 @@ export class QuobyteVolumeSource { } } - - static emptyObject(): QuobyteVolumeSource { - const result = new QuobyteVolumeSource(); - return result; - } - } export class VsphereVirtualDiskVolumeSource { @@ -1927,12 +1494,6 @@ export class VsphereVirtualDiskVolumeSource { } } - - static emptyObject(): VsphereVirtualDiskVolumeSource { - const result = new VsphereVirtualDiskVolumeSource(); - return result; - } - } export class ConfigMapVolumeSource { @@ -1959,13 +1520,6 @@ export class ConfigMapVolumeSource { } } - - static emptyObject(): ConfigMapVolumeSource { - const result = new ConfigMapVolumeSource(); - result.items = []; - return result; - } - } export class AzureFileVolumeSource { @@ -1988,12 +1542,6 @@ export class AzureFileVolumeSource { } } - - static emptyObject(): AzureFileVolumeSource { - const result = new AzureFileVolumeSource(); - return result; - } - } export class FCVolumeSource { @@ -2024,14 +1572,6 @@ export class FCVolumeSource { } } - - static emptyObject(): FCVolumeSource { - const result = new FCVolumeSource(); - result.targetWWNs = []; - result.wwids = []; - return result; - } - } export class ResourceFieldSelector { @@ -2054,13 +1594,6 @@ export class ResourceFieldSelector { } } - - static emptyObject(): ResourceFieldSelector { - const result = new ResourceFieldSelector(); - result.divisor = Quantity.emptyObject(); - return result; - } - } export class ObjectFieldSelector { @@ -2079,12 +1612,6 @@ export class ObjectFieldSelector { } } - - static emptyObject(): ObjectFieldSelector { - const result = new ObjectFieldSelector(); - return result; - } - } export class DownwardAPIVolumeFile { @@ -2111,14 +1638,6 @@ export class DownwardAPIVolumeFile { } } - - static emptyObject(): DownwardAPIVolumeFile { - const result = new DownwardAPIVolumeFile(); - result.fieldRef = ObjectFieldSelector.emptyObject(); - result.resourceFieldRef = ResourceFieldSelector.emptyObject(); - return result; - } - } export class DownwardAPIVolumeSource { @@ -2137,13 +1656,6 @@ export class DownwardAPIVolumeSource { } } - - static emptyObject(): DownwardAPIVolumeSource { - const result = new DownwardAPIVolumeSource(); - result.items = []; - return result; - } - } export class FlockerVolumeSource { @@ -2162,12 +1674,6 @@ export class FlockerVolumeSource { } } - - static emptyObject(): FlockerVolumeSource { - const result = new FlockerVolumeSource(); - return result; - } - } export class CephFSVolumeSource { @@ -2202,14 +1708,6 @@ export class CephFSVolumeSource { } } - - static emptyObject(): CephFSVolumeSource { - const result = new CephFSVolumeSource(); - result.monitors = []; - result.secretRef = LocalObjectReference.emptyObject(); - return result; - } - } export class CinderVolumeSource { @@ -2232,12 +1730,6 @@ export class CinderVolumeSource { } } - - static emptyObject(): CinderVolumeSource { - const result = new CinderVolumeSource(); - return result; - } - } export class FlexVolumeSource { @@ -2268,14 +1760,6 @@ export class FlexVolumeSource { } } - - static emptyObject(): FlexVolumeSource { - const result = new FlexVolumeSource(); - result.secretRef = LocalObjectReference.emptyObject(); - result.options = null; - return result; - } - } export class RBDVolumeSource { @@ -2318,14 +1802,6 @@ export class RBDVolumeSource { } } - - static emptyObject(): RBDVolumeSource { - const result = new RBDVolumeSource(); - result.monitors = []; - result.secretRef = LocalObjectReference.emptyObject(); - return result; - } - } export class PersistentVolumeClaimVolumeSource { @@ -2344,12 +1820,6 @@ export class PersistentVolumeClaimVolumeSource { } } - - static emptyObject(): PersistentVolumeClaimVolumeSource { - const result = new PersistentVolumeClaimVolumeSource(); - return result; - } - } export class GlusterfsVolumeSource { @@ -2372,12 +1842,6 @@ export class GlusterfsVolumeSource { } } - - static emptyObject(): GlusterfsVolumeSource { - const result = new GlusterfsVolumeSource(); - return result; - } - } export class LocalObjectReference { @@ -2392,12 +1856,6 @@ export class LocalObjectReference { } } - - static emptyObject(): LocalObjectReference { - const result = new LocalObjectReference(); - return result; - } - } export class ISCSIVolumeSource { @@ -2452,14 +1910,6 @@ export class ISCSIVolumeSource { } } - - static emptyObject(): ISCSIVolumeSource { - const result = new ISCSIVolumeSource(); - result.portals = []; - result.secretRef = LocalObjectReference.emptyObject(); - return result; - } - } export class NFSVolumeSource { @@ -2482,12 +1932,6 @@ export class NFSVolumeSource { } } - - static emptyObject(): NFSVolumeSource { - const result = new NFSVolumeSource(); - return result; - } - } export class KeyToPath { @@ -2510,12 +1954,6 @@ export class KeyToPath { } } - - static emptyObject(): KeyToPath { - const result = new KeyToPath(); - return result; - } - } export class SecretVolumeSource { @@ -2542,13 +1980,6 @@ export class SecretVolumeSource { } } - - static emptyObject(): SecretVolumeSource { - const result = new SecretVolumeSource(); - result.items = []; - return result; - } - } export class GitRepoVolumeSource { @@ -2571,12 +2002,6 @@ export class GitRepoVolumeSource { } } - - static emptyObject(): GitRepoVolumeSource { - const result = new GitRepoVolumeSource(); - return result; - } - } export class AWSElasticBlockStoreVolumeSource { @@ -2603,12 +2028,6 @@ export class AWSElasticBlockStoreVolumeSource { } } - - static emptyObject(): AWSElasticBlockStoreVolumeSource { - const result = new AWSElasticBlockStoreVolumeSource(); - return result; - } - } export class GCEPersistentDiskVolumeSource { @@ -2635,12 +2054,6 @@ export class GCEPersistentDiskVolumeSource { } } - - static emptyObject(): GCEPersistentDiskVolumeSource { - const result = new GCEPersistentDiskVolumeSource(); - return result; - } - } export class Quantity { @@ -2655,12 +2068,6 @@ export class Quantity { } } - - static emptyObject(): Quantity { - const result = new Quantity(); - return result; - } - } export class EmptyDirVolumeSource { @@ -2679,13 +2086,6 @@ export class EmptyDirVolumeSource { } } - - static emptyObject(): EmptyDirVolumeSource { - const result = new EmptyDirVolumeSource(); - result.sizeLimit = Quantity.emptyObject(); - return result; - } - } export class HostPathVolumeSource { @@ -2704,12 +2104,6 @@ export class HostPathVolumeSource { } } - - static emptyObject(): HostPathVolumeSource { - const result = new HostPathVolumeSource(); - return result; - } - } export class Volume { @@ -2832,39 +2226,6 @@ export class Volume { } } - - static emptyObject(): Volume { - const result = new Volume(); - result.hostPath = HostPathVolumeSource.emptyObject(); - result.emptyDir = EmptyDirVolumeSource.emptyObject(); - result.gcePersistentDisk = GCEPersistentDiskVolumeSource.emptyObject(); - result.awsElasticBlockStore = AWSElasticBlockStoreVolumeSource.emptyObject(); - result.gitRepo = GitRepoVolumeSource.emptyObject(); - result.secret = SecretVolumeSource.emptyObject(); - result.nfs = NFSVolumeSource.emptyObject(); - result.iscsi = ISCSIVolumeSource.emptyObject(); - result.glusterfs = GlusterfsVolumeSource.emptyObject(); - result.persistentVolumeClaim = PersistentVolumeClaimVolumeSource.emptyObject(); - result.rbd = RBDVolumeSource.emptyObject(); - result.flexVolume = FlexVolumeSource.emptyObject(); - result.cinder = CinderVolumeSource.emptyObject(); - result.cephfs = CephFSVolumeSource.emptyObject(); - result.flocker = FlockerVolumeSource.emptyObject(); - result.downwardAPI = DownwardAPIVolumeSource.emptyObject(); - result.fc = FCVolumeSource.emptyObject(); - result.azureFile = AzureFileVolumeSource.emptyObject(); - result.configMap = ConfigMapVolumeSource.emptyObject(); - result.vsphereVolume = VsphereVirtualDiskVolumeSource.emptyObject(); - result.quobyte = QuobyteVolumeSource.emptyObject(); - result.azureDisk = AzureDiskVolumeSource.emptyObject(); - result.photonPersistentDisk = PhotonPersistentDiskVolumeSource.emptyObject(); - result.projected = ProjectedVolumeSource.emptyObject(); - result.portworxVolume = PortworxVolumeSource.emptyObject(); - result.scaleIO = ScaleIOVolumeSource.emptyObject(); - result.storageos = StorageOSVolumeSource.emptyObject(); - return result; - } - } export class PodSpec { @@ -2983,22 +2344,6 @@ export class PodSpec { } } - - static emptyObject(): PodSpec { - const result = new PodSpec(); - result.volumes = []; - result.initContainers = []; - result.containers = []; - result.nodeSelector = null; - result.securityContext = PodSecurityContext.emptyObject(); - result.imagePullSecrets = []; - result.affinity = Affinity.emptyObject(); - result.tolerations = []; - result.hostAliases = []; - result.dnsConfig = PodDNSConfig.emptyObject(); - return result; - } - } export class StatusCause { @@ -3021,12 +2366,6 @@ export class StatusCause { } } - - static emptyObject(): StatusCause { - const result = new StatusCause(); - return result; - } - } export class StatusDetails { @@ -3061,13 +2400,6 @@ export class StatusDetails { } } - - static emptyObject(): StatusDetails { - const result = new StatusDetails(); - result.causes = []; - return result; - } - } export class ListMeta { @@ -3090,12 +2422,6 @@ export class ListMeta { } } - - static emptyObject(): ListMeta { - const result = new ListMeta(); - return result; - } - } export class Status { @@ -3138,14 +2464,6 @@ export class Status { } } - - static emptyObject(): Status { - const result = new Status(); - result.metadata = ListMeta.emptyObject(); - result.details = StatusDetails.emptyObject(); - return result; - } - } export class Initializer { @@ -3160,12 +2478,6 @@ export class Initializer { } } - - static emptyObject(): Initializer { - const result = new Initializer(); - return result; - } - } export class Initializers { @@ -3184,14 +2496,6 @@ export class Initializers { } } - - static emptyObject(): Initializers { - const result = new Initializers(); - result.pending = []; - result.result = Status.emptyObject(); - return result; - } - } export class OwnerReference { @@ -3226,12 +2530,6 @@ export class OwnerReference { } } - - static emptyObject(): OwnerReference { - const result = new OwnerReference(); - return result; - } - } @@ -3247,13 +2545,6 @@ export class Time { } } - - static emptyObject(): Time { - const result = new Time(); - result.Time = null; - return result; - } - } export class ObjectMeta { @@ -3328,19 +2619,6 @@ export class ObjectMeta { } } - - static emptyObject(): ObjectMeta { - const result = new ObjectMeta(); - result.creationTimestamp = Time.emptyObject(); - result.deletionTimestamp = Time.emptyObject(); - result.labels = null; - result.annotations = null; - result.ownerReferences = []; - result.initializers = Initializers.emptyObject(); - result.finalizers = []; - return result; - } - } export class KubePod { @@ -3371,13 +2649,4 @@ export class KubePod { } } - - static emptyObject(): KubePod { - const result = new KubePod(); - result.metadata = ObjectMeta.emptyObject(); - result.spec = PodSpec.emptyObject(); - result.status = PodStatus.emptyObject(); - return result; - } - } From d486ceb1367ff35c710332a6443e97aac8e9ab2c Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Sat, 2 Feb 2019 15:35:05 +0800 Subject: [PATCH 075/112] frontend: kubernetes pod add i18n --- .../kubernetes/pod/kube-pod.component.html | 20 ++++++------ .../pod/list-pod/list-pod.component.html | 20 ++++++------ .../ace-editor/ace-editor.component.html | 2 +- .../kubernetes-namespaced-list-resource.ts | 2 +- .../kubernetes-namespaced-resource.ts | 6 ++-- .../tpl-detail/tpl-detail.component.html | 2 +- src/frontend/src/assets/i18n/zh-Hans.json | 31 +++++++++++++++++++ 7 files changed, 57 insertions(+), 26 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html index 4b8029cf9..6e7e7cbfc 100644 --- a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html @@ -3,21 +3,21 @@
- 名称 - Label - 镜像 - 状态 - PodIP - 节点 - 重启次数 - Age + {{'ADMIN.KUBERNETES.POD.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.LABEL' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.IMAGES' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.STATUS' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.PODIP' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.NODE' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.RESTARTCOUNT' | translate}} + {{'ADMIN.KUBERNETES.POD.LIST.AGE' | translate}} - + - 名称 + {{'ADMIN.KUBERNETES.POD.LIST.NAME' | translate}} - Label + {{'ADMIN.KUBERNETES.POD.LIST.LABEL' | translate}} - 镜像 + {{'ADMIN.KUBERNETES.POD.LIST.IMAGES' | translate}} - 状态 + {{'ADMIN.KUBERNETES.POD.LIST.STATUS' | translate}} - PodIP + {{'ADMIN.KUBERNETES.POD.LIST.PODIP' | translate}} - 节点 + {{'ADMIN.KUBERNETES.POD.LIST.NODE' | translate}} - 重启次数 + {{'ADMIN.KUBERNETES.POD.LIST.RESTARTCOUNT' | translate}} - Age + {{'ADMIN.KUBERNETES.POD.LIST.AGE' | translate}} - - + + {{ obj.metadata.name }} diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.component.html b/src/frontend/src/app/shared/ace-editor/ace-editor.component.html index 6abcf1fa6..b4d8d0414 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.component.html +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.component.html @@ -1,5 +1,5 @@ -

{{title}} +

{{title | translate}}

diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts index 3a35c905b..134a23f30 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts @@ -17,7 +17,7 @@ export class KubernetesNamespacedListResource { } versionDetail(version: string) { - this.tplDetailService.openModal(version, '详情'); + this.tplDetailService.openModal(version, 'ADMIN.KUBERNETES.TITLE.DETAIL'); } onEditEvent(obj: any) { diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts index a9a3f1cee..12fbbad0c 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts @@ -49,7 +49,7 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { .subscribe( response => { this.retrieveResource(); - this.messageHandlerService.showSuccess('删除成功！'); + this.messageHandlerService.showSuccess('ADMIN.KUBERNETES.MESSAGE.DELETE'); }, error => { this.messageHandlerService.handleError(error); @@ -109,7 +109,7 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { .subscribe( response => { const data = response.data; - this.aceEditorModal.openModal(data, `编辑 [${obj.metadata.name}]`, true); + this.aceEditorModal.openModal(data, 'ADMIN.KUBERNETES.ACTION.EDIT', true); }, error => this.messageHandlerService.handleError(error) ); @@ -124,7 +124,7 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { respObj.metadata.annotations = obj.metadata.annotations; this.kubernetesClient.update(respObj, this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace).subscribe( resp2 => { - this.messageHandlerService.showSuccess(`[${obj.metadata.name}] Updated!`); + this.messageHandlerService.showSuccess('ADMIN.KUBERNETES.MESSAGE.UPDATE'); this.retrieveResource(); }, error => { diff --git a/src/frontend/src/app/shared/tpl-detail/tpl-detail.component.html b/src/frontend/src/app/shared/tpl-detail/tpl-detail.component.html index 9c7c1e0ea..54461c17e 100644 --- a/src/frontend/src/app/shared/tpl-detail/tpl-detail.component.html +++ b/src/frontend/src/app/shared/tpl-detail/tpl-detail.component.html @@ -1,5 +1,5 @@ -

{{title}}

+

{{title | translate}}

diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 1ee44c8d8..7cea1fc6b 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -566,5 +566,36 @@ "CREATE": "创建新的{{ value }}", "FOCUS_EVENT": "关注事件", "TITLE": "{{ value }}列表" + }, + "ADMIN":{ + "KUBERNETES": { + "ACTION": { + "EDIT": "查看/编辑", + "DELETE": "删除", + "REFRESH": "刷新" + }, + "LABEL": { + "NAMESPACE": "命名空间:" + }, + "TITLE": { + "DETAIL": "详情" + }, + "MESSAGE": { + "DELETE": "删除成功！", + "UPDATE": "更新成功！" + }, + "POD": { + "LIST": { + "NAME": "名称", + "LABEL": "标签", + "IMAGES": "镜像", + "STATUS": "状态", + "PODIP": "PodIP", + "NODE": "主机节点", + "RESTARTCOUNT": "重启次数", + "AGE": "启动时间" + } + } + } } } From b72d85d85c1c4660e3331331596b61b827b4018e Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Sat, 2 Feb 2019 16:13:43 +0800 Subject: [PATCH 076/112] frontend: add create pod --- .../kubernetes/pod/kube-pod.component.html | 5 ++++- .../shared/ace-editor/ace-editor.component.ts | 19 +++++++++++++++--- .../kubernetes-namespaced-resource.ts | 20 +++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html index 6e7e7cbfc..fb89d1c0f 100644 --- a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html @@ -2,6 +2,9 @@
+ @@ -38,7 +41,7 @@
- + diff --git a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts index 62ee048ef..0a89648fb 100644 --- a/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts +++ b/src/frontend/src/app/shared/ace-editor/ace-editor.component.ts @@ -13,10 +13,13 @@ export class AceEditorComponent implements OnInit { modalOpened: boolean; title: string; hiddenFooter: boolean; + isCreate: boolean; @ViewChild(AceEditorBoxComponent) box: AceEditorBoxComponent; @Input() warningMsg = ''; @Output() outputObj = new EventEmitter(); + // for create only + @Output() createOutputObj = new EventEmitter(); constructor() { } @@ -28,10 +31,11 @@ export class AceEditorComponent implements OnInit { this.modalOpened = false; } - openModal(value: any, title: string, edit: boolean) { + openModal(value: any, title: string, edit: boolean, create?: boolean) { this.hiddenFooter = !edit; this.title = title; this.modalOpened = true; + this.isCreate = create; this.box.setValue(typeof value === 'string' ? JSON.stringify(JSON.parse(value), null, 2) : JSON.stringify(value, null, 2)); } @@ -45,9 +49,18 @@ export class AceEditorComponent implements OnInit { onSubmit() { if (this.box.aceMode === 'ace/mode/json') { - this.outputObj.emit(JSON.parse(this.box.editor.getValue())); + if (this.isCreate) { + this.createOutputObj.emit(JSON.parse(this.box.editor.getValue())); + } else { + this.outputObj.emit(JSON.parse(this.box.editor.getValue())); + } + } else { - this.outputObj.emit(YAML.load(this.box.editor.getValue())); + if (this.isCreate) { + this.createOutputObj.emit(YAML.load(this.box.editor.getValue())); + } else { + this.outputObj.emit(YAML.load(this.box.editor.getValue())); + } } this.modalOpened = false; } diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts index 12fbbad0c..68fc806c7 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts @@ -104,6 +104,10 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { this.initShow(); } + createResource() { + this.aceEditorModal.openModal({}, 'ADMIN.KUBERNETES.POD.CREATE', true, true); + } + onEditResourceEvent(obj: any) { this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) .subscribe( @@ -115,6 +119,22 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { ); } + onCreateResourceEvent(obj: any) { + if (obj && obj.metadata && obj.metadata.namespace) { + this.kubernetesClient.create(obj, this.cluster, this.kubeResource, obj.metadata.namespace).subscribe( + resp2 => { + this.messageHandlerService.showSuccess('ADMIN.KUBERNETES.MESSAGE.CREATE'); + this.retrieveResource(); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } else { + this.messageHandlerService.showError('格式校验错误'); + } + } + onSaveResourceEvent(obj: any) { this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace).subscribe( resp => { From e2381dd9f4b772366f46b370bc2cb7803f9e1aa1 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Sat, 2 Feb 2019 17:37:10 +0800 Subject: [PATCH 077/112] frontend: add deletion dialog module --- .../deletion-dialog.component.html | 14 ++++++ .../deletion-dialog.component.scss | 19 ++++++++ .../deletion-dialog.component.ts | 43 +++++++++++++++++++ .../deletion-dialog/deletion-dialog.module.ts | 14 ++++++ 4 files changed, 90 insertions(+) create mode 100644 src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.html create mode 100644 src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.scss create mode 100644 src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.ts create mode 100644 src/frontend/src/app/shared/deletion-dialog/deletion-dialog.module.ts diff --git a/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.html b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.html new file mode 100644 index 000000000..4f8d5c675 --- /dev/null +++ b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.html @@ -0,0 +1,14 @@ + +

{{dialogTitle}}

+
+
+ +
+
{{dialogContent}}
+ +
+
+ + +
+ diff --git a/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.scss b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.scss new file mode 100644 index 000000000..3b8def936 --- /dev/null +++ b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.scss @@ -0,0 +1,19 @@ +.confirmation-icon-inline { + display: inline-block; +} + +.confirmation-title { + line-height: 24px; + color: #000000; + font-size: 22px; +} + +.confirmation-content { + font-size: 14px; + color: #565656; + line-height: 24px; + display: inline-block; + vertical-align: middle; + width: 80%; + white-space: pre-wrap; +} diff --git a/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.ts b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.ts new file mode 100644 index 000000000..0f123e6b5 --- /dev/null +++ b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.component.ts @@ -0,0 +1,43 @@ +import { Component, EventEmitter, OnDestroy, Output } from '@angular/core'; + +@Component({ + selector: 'deletion-dialog', + templateUrl: 'deletion-dialog.component.html', + styleUrls: ['deletion-dialog.component.scss'] +}) + + +export class DeletionDialogComponent implements OnDestroy { + opened = false; + dialogTitle = ''; + dialogContent = ''; + obj: any; + @Output() outputObj = new EventEmitter(); + + constructor() { + + } + + ngOnDestroy(): void { + } + + open(dialogTitle, dialogContent: string, obj: any): void { + this.dialogTitle = dialogTitle; + this.dialogContent = dialogContent; + this.obj = obj; + this.opened = true; + } + + close(): void { + this.opened = false; + } + + cancel(): void { + this.close(); + } + + confirm(): void { + this.outputObj.emit(this.obj); + this.close(); + } +} diff --git a/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.module.ts b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.module.ts new file mode 100644 index 000000000..082674fa8 --- /dev/null +++ b/src/frontend/src/app/shared/deletion-dialog/deletion-dialog.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { DeletionDialogComponent } from './deletion-dialog.component'; +import { SharedModule } from '../shared.module'; + +@NgModule({ + imports: [ + SharedModule + ], + providers: [], + declarations: [DeletionDialogComponent], + exports: [DeletionDialogComponent], +}) +export class DeletionDialogModule { +} From 5da89d8bf6ab993d9af737b8757d6d8e7c2f7555 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Sat, 2 Feb 2019 17:37:45 +0800 Subject: [PATCH 078/112] backend: kubernetes resource delete add force option --- src/backend/controllers/kubernetes/proxy/proxy.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/backend/controllers/kubernetes/proxy/proxy.go b/src/backend/controllers/kubernetes/proxy/proxy.go index 813f24ae1..2d2db18f5 100644 --- a/src/backend/controllers/kubernetes/proxy/proxy.go +++ b/src/backend/controllers/kubernetes/proxy/proxy.go @@ -2,6 +2,7 @@ package proxy import ( "encoding/json" + "strconv" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -179,6 +180,7 @@ func (c *KubeProxyController) Update() { // @Param kind path string true "the resource kind" // @Param namespace path string true "the namespace want to delete" // @Param name path string true "the name want to delete" +// @Param force query bool false "force to delete the resource from etcd." // @Success 200 {string} delete success! // @router /:name [delete] func (c *KubeProxyController) Delete() { @@ -186,10 +188,21 @@ func (c *KubeProxyController) Delete() { namespace := c.Ctx.Input.Param(":namespace") name := c.Ctx.Input.Param(":name") kind := c.Ctx.Input.Param(":kind") + force := c.Input().Get("force") defaultPropagationPolicy := meta_v1.DeletePropagationBackground defaultDeleteOptions := meta_v1.DeleteOptions{ PropagationPolicy: &defaultPropagationPolicy, } + if force != "" { + forceBool, err := strconv.ParseBool(force) + if err != nil { + c.AbortBadRequestFormat("force") + } + if forceBool { + var gracePeriodSeconds int64 = 0 + defaultDeleteOptions.GracePeriodSeconds = &gracePeriodSeconds + } + } kubeClient := c.KubeClient(cluster) err := kubeClient.Delete(kind, namespace, name, &defaultDeleteOptions) if err != nil { From 21c67824270fffb6a17f4c90dbe16629abccbee6 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Sat, 2 Feb 2019 17:40:11 +0800 Subject: [PATCH 079/112] frontend: add force delete pod action --- .../kubernetes/pod/kube-pod.component.html | 3 +- .../kubernetes/pod/kube-pod.component.ts | 8 ++- .../admin/kubernetes/pod/kube-pod.module.ts | 2 + .../pod/list-pod/list-pod.component.html | 1 + .../kubernetes-namespaced-list-resource.ts | 13 +++- .../kubernetes-namespaced-resource.ts | 69 +++++++++---------- .../shared/client/v1/kubernetes/kubernetes.ts | 7 +- src/frontend/src/assets/i18n/zh-Hans.json | 15 ++-- 8 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html index fb89d1c0f..4690f17a6 100644 --- a/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html +++ b/src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html @@ -21,7 +21,7 @@ -
+ + {{ obj.metadata.name }} diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts index 134a23f30..ba033f5d2 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts @@ -3,6 +3,11 @@ import { ClrDatagridStateInterface } from '@clr/angular'; import { Page } from '../../page/page-state'; import { TplDetailService } from '../../tpl-detail/tpl-detail.service'; +export interface DeleteEvent { + obj: any; + force?: boolean; +} + export class KubernetesNamespacedListResource { state: ClrDatagridStateInterface; currentPage = 1; @@ -11,7 +16,7 @@ export class KubernetesNamespacedListResource { @Output() paginate = new EventEmitter(); @Output() edit = new EventEmitter(); - @Output() delete = new EventEmitter(); + @Output() delete = new EventEmitter(); constructor(public tplDetailService: TplDetailService) { } @@ -25,7 +30,11 @@ export class KubernetesNamespacedListResource { } onDeleteEvent(obj: any) { - this.delete.emit(obj); + this.delete.emit({obj: obj}); + } + + onForceDeleteEvent(obj: any) { + this.delete.emit({obj: obj, force: true}); } refresh(state: ClrDatagridStateInterface) { diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts index 68fc806c7..6f59bef55 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-resource.ts @@ -1,19 +1,19 @@ import { MessageHandlerService } from '../../message-handler/message-handler.service'; -import { Subscription } from 'rxjs/Subscription'; -import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; import { AceEditorComponent } from '../../ace-editor/ace-editor.component'; import { AuthService } from '../../auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; import { ClusterService } from '../../client/v1/cluster.service'; import { PageState } from '../../page/page-state'; import { ClrDatagridStateInterface } from '@clr/angular'; -import { ConfirmationButtons, ConfirmationState, KubeResourceNamespace, KubeResourcePod, KubeResourcesName } from '../../shared.const'; +import { KubeResourceNamespace, KubeResourcePod, KubeResourcesName } from '../../shared.const'; import { OnDestroy, OnInit } from '@angular/core'; import { KubernetesClient } from '../../client/v1/kubernetes/kubernetes'; -import { ConfirmationMessage } from '../../confirmation-dialog/confirmation-message'; +import { DeletionDialogComponent } from '../../deletion-dialog/deletion-dialog.component'; +import { DeleteEvent } from './kubernetes-namespaced-list-resource'; export class KubernetesNamespacedResource implements OnInit, OnDestroy { aceEditorModal: AceEditorComponent; + deletionDialogComponent: DeletionDialogComponent; showState: object; pageState: PageState = new PageState(); @@ -24,11 +24,9 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { resources: Array; showList: any[] = Array(); - subscription: Subscription; resourceType: string; kubeResource: KubeResourcesName; - namespaces: string[]; namespace: string; @@ -37,26 +35,7 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { public router: Router, public clusterService: ClusterService, public authService: AuthService, - public messageHandlerService: MessageHandlerService, - public deletionDialogService: ConfirmationDialogService) { - this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { - if (message && - message.state === ConfirmationState.CONFIRMED && - message.source === this.kubeResource) { - const obj: any = message.data; - this.kubernetesClient - .delete(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) - .subscribe( - response => { - this.retrieveResource(); - this.messageHandlerService.showSuccess('ADMIN.KUBERNETES.MESSAGE.DELETE'); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - }); + public messageHandlerService: MessageHandlerService) { } ngOnInit() { @@ -108,6 +87,32 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { this.aceEditorModal.openModal({}, 'ADMIN.KUBERNETES.POD.CREATE', true, true); } + + onDeleteResourceEvent(event: DeleteEvent) { + let msg = `是否确认删除对象 ${event.obj.metadata.name}`; + let title = `删除确认`; + if (event.force === true) { + msg = `是否确认强制删除对象 ${event.obj.metadata.name}, 强制删除将直接从 etcd 中删除数据，可能导致与 Kubernetes 中状态不一致!`; + title = `强制删除确认`; + } + this.deletionDialogComponent.open(title, msg, event); + } + + confirmDeleteEvent(event: DeleteEvent) { + this.kubernetesClient + .delete(this.cluster, this.kubeResource, event.force, event.obj.metadata.name, event.obj.metadata.namespace) + .subscribe( + response => { + this.retrieveResource(); + this.messageHandlerService.showSuccess('ADMIN.KUBERNETES.MESSAGE.DELETE'); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + } + + onEditResourceEvent(obj: any) { this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) .subscribe( @@ -186,17 +191,6 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { } } - onDeleteResourceEvent(resource: any) { - const deletionMessage = new ConfirmationMessage( - '删除确认', - `是否确认删除对象 ${resource.metadata.name}`, - resource, - this.kubeResource, - ConfirmationButtons.DELETE_CANCEL - ); - this.deletionDialogService.openComfirmDialog(deletionMessage); - } - jumpToHref(cluster) { this.cluster = cluster; this.router.navigateByUrl(`admin/kubernetes/${this.resourceType}/${cluster}`); @@ -215,6 +209,5 @@ export class KubernetesNamespacedResource implements OnInit, OnDestroy { } ngOnDestroy(): void { - this.subscription.unsubscribe(); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts b/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts index 3fed397c1..3e0a9ca42 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/kubernetes.ts @@ -87,7 +87,8 @@ export class KubernetesClient { .catch(error => throwError(error)); } - delete(cluster: string, kind: KubeResourcesName, name: string, namespace?: string, appId?: string): Observable { + // force delete will delete obj for etcd directly + delete(cluster: string, kind: KubeResourcesName, force: boolean, name: string, namespace?: string, appId?: string): Observable { if ((typeof (appId) === 'undefined') || (!appId)) { appId = '0'; } @@ -97,6 +98,10 @@ export class KubernetesClient { link = `/api/v1/apps/${appId}/_proxy/clusters/${cluster}/namespaces/${namespace}/${kind}/${name}`; } + if (force === true) { + link = `${link}?force=${force}`; + } + return this.http .delete(link) .catch(error => throwError(error)); diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 7cea1fc6b..543fd15c4 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -470,10 +470,10 @@ "TOTAL": "总量", "USER": "用户", "VERSION": "版本", - "COPY_INTERVAL":"副本区间" + "COPY_INTERVAL": "副本区间" }, "TIP": { - "REGULAR_NAME":"名称不符合规范，验证规则[a-z]([-a-z0-9]*[a-z0-9])?" + "REGULAR_NAME": "名称不符合规范，验证规则[a-z]([-a-z0-9]*[a-z0-9])?" }, "TEMPLATE": { "ADD_ENVIRONMENT": "添加环境变量", @@ -537,9 +537,9 @@ "SCHEDULING_CONFIG": "调度配置", "TYPE": "类型", "NAME": "名称", - "MIN_REPLICAS":"最小副本数", - "MAX_REPLICAS":"最小副本数", - "CPU_THRESHOLD":"CPU 负载阈值" + "MIN_REPLICAS": "最小副本数", + "MAX_REPLICAS": "最小副本数", + "CPU_THRESHOLD": "CPU 负载阈值" }, "UNIT": { "CORE": "核", @@ -567,11 +567,12 @@ "FOCUS_EVENT": "关注事件", "TITLE": "{{ value }}列表" }, - "ADMIN":{ + "ADMIN": { "KUBERNETES": { "ACTION": { "EDIT": "查看/编辑", "DELETE": "删除", + "FORCEDELETE": "强制删除", "REFRESH": "刷新" }, "LABEL": { @@ -581,10 +582,12 @@ "DETAIL": "详情" }, "MESSAGE": { + "CREATE": "创建成功！", "DELETE": "删除成功！", "UPDATE": "更新成功！" }, "POD": { + "CREATE": "创建 Pod", "LIST": { "NAME": "名称", "LABEL": "标签", From cdef68a12d7c7dc46db5bfe869e1f2160db5f2ad Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 15:07:54 +0800 Subject: [PATCH 080/112] frontend: admin add kubernetes service --- .../src/app/admin/admin-routing.module.ts | 3 + src/frontend/src/app/admin/admin.module.ts | 2 + .../service/kube-service.component.html | 47 ++++++++++++++ .../service/kube-service.component.ts | 60 ++++++++++++++++++ .../kubernetes/service/kube-service.module.ts | 29 +++++++++ .../list-service/list-service.component.html | 62 +++++++++++++++++++ .../list-service/list-service.component.ts | 31 ++++++++++ .../app/admin/sidenav/sidenav.component.html | 8 +++ .../kubernetes-namespaced-resource.ts | 4 +- src/frontend/src/assets/i18n/zh-Hans.json | 11 ++++ 10 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/service/kube-service.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts create mode 100644 src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index acce8210c..7c6a38a75 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -69,6 +69,7 @@ import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autos import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; import { KubePodComponent } from './kubernetes/pod/kube-pod.component'; +import { KubeServiceComponent } from './kubernetes/service/kube-service.component'; const routes: Routes = [ @@ -151,6 +152,8 @@ const routes: Routes = [ {path: 'kubernetes/namespace/:cluster', component: KubeNamespaceComponent}, {path: 'kubernetes/pod', component: KubePodComponent}, {path: 'kubernetes/pod/:cluster', component: KubePodComponent}, + {path: 'kubernetes/service', component: KubeServiceComponent}, + {path: 'kubernetes/service/:cluster', component: KubeServiceComponent}, ...ADMINROUTES ] } diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index b61957488..b80df6ccf 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -49,6 +49,7 @@ import { ListAutoscaletplComponent } from './autoscaletpl/list-autoscaletpl/list import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; import { SidenavModule } from './sidenav/sidenav.module'; import { KubePodModule } from './kubernetes/pod/kube-pod.module'; +import { KubeServiceModule } from './kubernetes/service/kube-service.module'; @NgModule({ imports: [ @@ -91,6 +92,7 @@ import { KubePodModule } from './kubernetes/pod/kube-pod.module'; TplDetailModule, SidenavModule, KubePodModule, + KubeServiceModule, ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html new file mode 100644 index 000000000..2ed4eecb6 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html @@ -0,0 +1,47 @@ +
+
+
+
+ + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.LABEL' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.CLUSTERIP' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.PORT' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.EXTERNALIP' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.AGE' | translate}} + + + + + {{ns}} + +
+
+ + + +
+
+ + + + + diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts new file mode 100644 index 000000000..2bd066db4 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts @@ -0,0 +1,60 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { ClusterService } from '../../../shared/client/v1/cluster.service'; +import { AuthService } from '../../../shared/auth/auth.service'; +import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component'; +import { ListServiceComponent } from './list-service/list-service.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceService } from '../../../shared/shared.const'; +import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; +import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component'; + +const showState = { + 'name': {hidden: false}, + 'label': {hidden: false}, + 'clusterIP': {hidden: false}, + 'port': {hidden: false}, + 'externalIP': {hidden: false}, + 'age': {hidden: false}, +}; + +@Component({ + selector: 'wayne-kube-service', + templateUrl: './kube-service.component.html' +}) + +export class KubeServiceComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy { + @ViewChild(ListServiceComponent) + listResourceComponent: ListServiceComponent; + + @ViewChild(AceEditorComponent) + aceEditorModal: AceEditorComponent; + + @ViewChild(DeletionDialogComponent) + deletionDialogComponent: DeletionDialogComponent; + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, route, router, clusterService, authService, messageHandlerService); + super.registResourceType('service'); + super.registKubeResource(KubeResourceService); + super.registShowSate(showState); + } + + ngOnInit() { + super.ngOnInit(); + } + + ngOnDestroy(): void { + super.ngOnDestroy(); + } + + + + +} diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts new file mode 100644 index 000000000..257a15c8a --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { KubeServiceComponent } from './kube-service.component'; +import { ListServiceComponent } from './list-service/list-service.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; + +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + DeletionDialogModule + ], + providers: [ + KubernetesClient + ], + exports: [ + KubeServiceComponent, + ListServiceComponent + ], + declarations: [ + KubeServiceComponent, + ListServiceComponent + ] +}) + +export class KubeServiceModule { +} diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html new file mode 100644 index 000000000..e803cc126 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html @@ -0,0 +1,62 @@ + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.NAME' | translate}} + + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.LABEL' | translate}} + + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.CLUSTERIP' | translate}} + + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.PORT' | translate}} + + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.EXTERNALIP' | translate}} + + + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.AGE' | translate}} + + + + + + + + + + {{ obj.metadata.name }} + +
+ {{label.key}}: {{label.value}} +
+ + {{ obj.spec.clusterIP }} + {{ getPort(obj) }} + +
+ {{ externalIP }} +
+ + {{ obj.metadata.creationTimestamp | relativeTime}} + + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts new file mode 100644 index 000000000..33f204753 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts @@ -0,0 +1,31 @@ +import { Component, Input } from '@angular/core'; +import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; +import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; +import { KubeService } from '../../../../../../lib/shared/model/kubernetes/service'; + +@Component({ + selector: 'wayne-list-service', + templateUrl: './list-service.component.html' +}) + +export class ListServiceComponent extends KubernetesNamespacedListResource { + @Input() resources: any[]; + @Input() showState: object; + + constructor(public tplDetailService: TplDetailService) { + super(tplDetailService); + } + + + getPort(obj: KubeService) { + const result = Array(); + for (const port of obj.spec.ports) { + if (port.nodePort) { + result.push(`${port.targetPort}:${port.port}:${port.nodePort}/${port.protocol}`); + } else { + result.push(`${port.targetPort}:${port.port}/${port.protocol}`); + } + } + return result.join(', '); + } +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html index 2f1038b09..f8a82bca0 100644 --- a/src/frontend/src/app/admin/sidenav/sidenav.component.html +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -50,6 +50,14 @@ Pod
+ + + Service + +
{ const data = response.data; diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 543fd15c4..e1c4991d0 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -598,6 +598,17 @@ "RESTARTCOUNT": "重启次数", "AGE": "启动时间" } + }, + "SERVICE": { + "CREATE": "创建 Service", + "LIST": { + "NAME": "名称", + "LABEL": "标签", + "CLUSTERIP": "集群 IP", + "PORT": "端口", + "EXTERNALIP": "ExternalIP", + "AGE": "启动时间" + } } } } From 00113a5da32b83ac84b497d11b5febe85c1bb211 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 15:19:51 +0800 Subject: [PATCH 081/112] frontend: admin kubernetes service add type column --- .../admin/kubernetes/service/kube-service.component.html | 1 + .../app/admin/kubernetes/service/kube-service.component.ts | 1 + .../service/list-service/list-service.component.html | 6 ++++++ src/frontend/src/assets/i18n/zh-Hans.json | 1 + 4 files changed, 9 insertions(+) diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html index 2ed4eecb6..bf2eca9c2 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html @@ -11,6 +11,7 @@ {{'ADMIN.KUBERNETES.SERVICE.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.SERVICE.LIST.TYPE' | translate}} {{'ADMIN.KUBERNETES.SERVICE.LIST.LABEL' | translate}} {{'ADMIN.KUBERNETES.SERVICE.LIST.CLUSTERIP' | translate}} {{'ADMIN.KUBERNETES.SERVICE.LIST.PORT' | translate}} diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts index 2bd066db4..3b18720aa 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts @@ -12,6 +12,7 @@ import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletio const showState = { 'name': {hidden: false}, + 'type': {hidden: false}, 'label': {hidden: false}, 'clusterIP': {hidden: false}, 'port': {hidden: false}, diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html index e803cc126..c15672759 100644 --- a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html @@ -9,6 +9,11 @@ {{'ADMIN.KUBERNETES.SERVICE.LIST.LABEL' | translate}} + + + {{'ADMIN.KUBERNETES.SERVICE.LIST.TYPE' | translate}} + + {{'ADMIN.KUBERNETES.SERVICE.LIST.CLUSTERIP' | translate}} @@ -42,6 +47,7 @@ {{label.key}}: {{label.value}}
+ {{ obj.spec.type }} {{ obj.spec.clusterIP }} {{ getPort(obj) }} diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index e1c4991d0..0525c0fe5 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -603,6 +603,7 @@ "CREATE": "创建 Service", "LIST": { "NAME": "名称", + "TYPE": "类型", "LABEL": "标签", "CLUSTERIP": "集群 IP", "PORT": "端口", From 28dd522fce1f00073fa2b7a08a6f2c56a943c8a0 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 15:57:15 +0800 Subject: [PATCH 082/112] backend: proxy kubernetes resource compatible endpoint --- src/backend/resources/common/common.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/resources/common/common.go b/src/backend/resources/common/common.go index f154d7dc1..91f20d5d1 100644 --- a/src/backend/resources/common/common.go +++ b/src/backend/resources/common/common.go @@ -9,6 +9,8 @@ type Object struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec interface{} `json:"spec,omitempty"` - Status interface{} `json:"status,omitempty"` + // for endpoint only + Subsets interface{} `json:"subsets,omitempty"` + Spec interface{} `json:"spec,omitempty"` + Status interface{} `json:"status,omitempty"` } From dd7eac3bd3ed5905e77df6211ca9d71b055da78c Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 15:57:52 +0800 Subject: [PATCH 083/112] frontend: admin kubernetes add endpoint --- .../src/app/admin/admin-routing.module.ts | 3 + src/frontend/src/app/admin/admin.module.ts | 2 + .../endpoint/kube-endpoint.component.html | 45 ++++++++++++++ .../endpoint/kube-endpoint.component.ts | 58 +++++++++++++++++++ .../endpoint/kube-endpoint.module.ts | 29 ++++++++++ .../list-endpoint.component.html | 52 +++++++++++++++++ .../list-endpoint/list-endpoint.component.ts | 31 ++++++++++ .../app/admin/sidenav/sidenav.component.html | 7 +++ src/frontend/src/assets/i18n/zh-Hans.json | 9 +++ 9 files changed, 236 insertions(+) create mode 100644 src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.module.ts create mode 100644 src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 7c6a38a75..3ae2e0764 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -70,6 +70,7 @@ import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component'; import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component'; import { KubePodComponent } from './kubernetes/pod/kube-pod.component'; import { KubeServiceComponent } from './kubernetes/service/kube-service.component'; +import { KubeEndpointComponent } from './kubernetes/endpoint/kube-endpoint.component'; const routes: Routes = [ @@ -154,6 +155,8 @@ const routes: Routes = [ {path: 'kubernetes/pod/:cluster', component: KubePodComponent}, {path: 'kubernetes/service', component: KubeServiceComponent}, {path: 'kubernetes/service/:cluster', component: KubeServiceComponent}, + {path: 'kubernetes/endpoint', component: KubeEndpointComponent}, + {path: 'kubernetes/endpoint/:cluster', component: KubeEndpointComponent}, ...ADMINROUTES ] } diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index b80df6ccf..e650ddc74 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -50,6 +50,7 @@ import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/tr import { SidenavModule } from './sidenav/sidenav.module'; import { KubePodModule } from './kubernetes/pod/kube-pod.module'; import { KubeServiceModule } from './kubernetes/service/kube-service.module'; +import { KubeEndpointModule } from './kubernetes/endpoint/kube-endpoint.module'; @NgModule({ imports: [ @@ -93,6 +94,7 @@ import { KubeServiceModule } from './kubernetes/service/kube-service.module'; SidenavModule, KubePodModule, KubeServiceModule, + KubeEndpointModule ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.html b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.html new file mode 100644 index 000000000..9037428a2 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.html @@ -0,0 +1,45 @@ +
+
+
+
+ + + + + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.PORT' | translate}} + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.IP' | translate}} + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.AGE' | translate}} + + + + + {{ns}} + +
+
+ + + +
+
+ + + + + diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.ts b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.ts new file mode 100644 index 000000000..3b492a986 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.component.ts @@ -0,0 +1,58 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { ClusterService } from '../../../shared/client/v1/cluster.service'; +import { AuthService } from '../../../shared/auth/auth.service'; +import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceEndpoint } from '../../../shared/shared.const'; +import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; +import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component'; +import { ListEndpointComponent } from './list-endpoint/list-endpoint.component'; + +const showState = { + 'name': {hidden: false}, + 'port': {hidden: false}, + 'ip': {hidden: false}, + 'age': {hidden: false}, +}; + +@Component({ + selector: 'wayne-kube-endpoint', + templateUrl: './kube-endpoint.component.html' +}) + +export class KubeEndpointComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy { + @ViewChild(ListEndpointComponent) + listResourceComponent: ListEndpointComponent; + + @ViewChild(AceEditorComponent) + aceEditorModal: AceEditorComponent; + + @ViewChild(DeletionDialogComponent) + deletionDialogComponent: DeletionDialogComponent; + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, route, router, clusterService, authService, messageHandlerService); + super.registResourceType('endpoint'); + super.registKubeResource(KubeResourceEndpoint); + super.registShowSate(showState); + } + + ngOnInit() { + super.ngOnInit(); + } + + ngOnDestroy(): void { + super.ngOnDestroy(); + } + + + + +} diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.module.ts b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.module.ts new file mode 100644 index 000000000..99cfbf5de --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/endpoint/kube-endpoint.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { KubeEndpointComponent } from './kube-endpoint.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; +import { ListEndpointComponent } from './list-endpoint/list-endpoint.component'; + +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + DeletionDialogModule + ], + providers: [ + KubernetesClient + ], + exports: [ + KubeEndpointComponent, + ListEndpointComponent + ], + declarations: [ + KubeEndpointComponent, + ListEndpointComponent + ] +}) + +export class KubeEndpointModule { +} diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html new file mode 100644 index 000000000..fea558017 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html @@ -0,0 +1,52 @@ + + + + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.NAME' | translate}} + + + + + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.PORT' | translate}} + + + + + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.IP' | translate}} + + + + + {{'ADMIN.KUBERNETES.ENDPOINT.LIST.AGE' | translate}} + + + + + + + + + + {{ obj.metadata.name }} + +
+
+ {{ port.port }} / {{ port.protocol }} +
+
+ +
+
+ {{ addresse.ip }} +
+
+ {{ obj.metadata.creationTimestamp | relativeTime}} + + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.ts b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.ts new file mode 100644 index 000000000..82cd8e607 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.ts @@ -0,0 +1,31 @@ +import { Component, Input } from '@angular/core'; +import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; +import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; +import { KubeService } from '../../../../../../lib/shared/model/kubernetes/service'; + +@Component({ + selector: 'wayne-list-endpoint', + templateUrl: './list-endpoint.component.html' +}) + +export class ListEndpointComponent extends KubernetesNamespacedListResource { + @Input() resources: any[]; + @Input() showState: object; + + constructor(public tplDetailService: TplDetailService) { + super(tplDetailService); + } + + + getPort(obj: KubeService) { + const result = Array(); + for (const port of obj.spec.ports) { + if (port.nodePort) { + result.push(`${port.targetPort}:${port.port}:${port.nodePort}/${port.protocol}`); + } else { + result.push(`${port.targetPort}:${port.port}/${port.protocol}`); + } + } + return result.join(', '); + } +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html index f8a82bca0..69cee7e0c 100644 --- a/src/frontend/src/app/admin/sidenav/sidenav.component.html +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -57,6 +57,13 @@ Service + + + Endpoint +
Date: Mon, 11 Feb 2019 17:28:09 +0800 Subject: [PATCH 084/112] frontend: admin kubernetes service add view endpoint detail --- .../list-endpoint.component.html | 6 ++-- .../service/kube-service.component.html | 1 + .../kubernetes/service/kube-service.module.ts | 4 ++- .../list-service/list-service.component.html | 3 ++ .../service-dg-row-detail.component.html | 24 +++++++++++++ .../service-dg-row-detail.component.ts | 35 +++++++++++++++++++ .../kubernetes-namespaced-list-resource.ts | 1 + 7 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/service/service-dg-row-detail/service-dg-row-detail.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/service/service-dg-row-detail/service-dg-row-detail.component.ts diff --git a/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html index fea558017..1cdf2e153 100644 --- a/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html +++ b/src/frontend/src/app/admin/kubernetes/endpoint/list-endpoint/list-endpoint.component.html @@ -34,11 +34,13 @@
-
+ +
{{ addresse.ip }}
-
+
+ {{ obj.metadata.creationTimestamp | relativeTime}} diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html index bf2eca9c2..13f3514ec 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html @@ -36,6 +36,7 @@ (delete)="onDeleteResourceEvent($event)" (edit)="onEditResourceEvent($event)" [page]="pageState.page" + [cluster]="cluster" (paginate)="retrieveResource($event)">
diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts index 257a15c8a..97b846294 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts @@ -5,6 +5,7 @@ import { KubeServiceComponent } from './kube-service.component'; import { ListServiceComponent } from './list-service/list-service.component'; import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; +import { DgRowDetailComponent } from './service-dg-row-detail/service-dg-row-detail.component'; @NgModule({ imports: [ @@ -21,7 +22,8 @@ import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-d ], declarations: [ KubeServiceComponent, - ListServiceComponent + ListServiceComponent, + DgRowDetailComponent ] }) diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html index c15672759..6b723f674 100644 --- a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html @@ -56,6 +56,9 @@
{{ obj.metadata.creationTimestamp | relativeTime}} + + Lorem ipsum... + +
+ +
+ +
+ +
+
+ {{ addresse.ip }} +
+
+
+
+ +
+
+ {{ port.port }}/{{ port.protocol }} +
+
+
+
+ +
diff --git a/src/frontend/src/app/admin/kubernetes/service/service-dg-row-detail/service-dg-row-detail.component.ts b/src/frontend/src/app/admin/kubernetes/service/service-dg-row-detail/service-dg-row-detail.component.ts new file mode 100644 index 000000000..6fe937770 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/service-dg-row-detail/service-dg-row-detail.component.ts @@ -0,0 +1,35 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceEndpoint } from '../../../../shared/shared.const'; + +@Component({ + selector: 'service-detail', + templateUrl: './service-dg-row-detail.component.html' +}) + + +export class DgRowDetailComponent implements OnInit { + @Input() obj: any; + + @Input() cluster: string; + + + endpoint: any; + + constructor(private kubernetesClient: KubernetesClient) { + + } + + ngOnInit() { + this.kubernetesClient.get(this.cluster, KubeResourceEndpoint, this.obj.metadata.name, this.obj.metadata.namespace).subscribe( + resp => { + this.endpoint = resp.data; + }, + error => { + // this.messageHandlerService.handleError(error); + } + ); + // Make the server call + + } +} diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts index ba033f5d2..50607bee6 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource.ts @@ -12,6 +12,7 @@ export class KubernetesNamespacedListResource { state: ClrDatagridStateInterface; currentPage = 1; + @Input() cluster: string; @Input() page: Page; @Output() paginate = new EventEmitter(); From f94297d752cff95637233e6ec2ff9ae522078cf6 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 18:47:00 +0800 Subject: [PATCH 085/112] frontend: admin kubernetes service migration --- .../service/kube-service.component.html | 2 + .../service/kube-service.component.ts | 8 +- .../kubernetes/service/kube-service.module.ts | 4 +- .../list-service/list-service.component.html | 2 +- .../list-service/list-service.component.ts | 8 +- .../migration/migration.component.html | 32 +++++++ .../service/migration/migration.component.ts | 64 ++++++++++++++ ...ubernetes-namespaced-migration-resource.ts | 84 +++++++++++++++++++ .../default-models/kube-resource.const.ts | 7 ++ src/frontend/src/assets/i18n/zh-Hans.json | 1 + 10 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/service/migration/migration.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts create mode 100644 src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts create mode 100644 src/frontend/src/app/shared/default-models/kube-resource.const.ts diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html index 13f3514ec..4723cc6d9 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.html @@ -37,10 +37,12 @@ (edit)="onEditResourceEvent($event)" [page]="pageState.page" [cluster]="cluster" + (migration)="migration($event)" (paginate)="retrieveResource($event)">
+ diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts index 3b18720aa..23e403d26 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.component.ts @@ -9,6 +9,7 @@ import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernete import { KubeResourceService } from '../../../shared/shared.const'; import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component'; +import { MigrationComponent } from './migration/migration.component'; const showState = { 'name': {hidden: false}, @@ -35,6 +36,9 @@ export class KubeServiceComponent extends KubernetesNamespacedResource implement @ViewChild(DeletionDialogComponent) deletionDialogComponent: DeletionDialogComponent; + @ViewChild(MigrationComponent) + migrationComponent: MigrationComponent; + constructor(public kubernetesClient: KubernetesClient, public route: ActivatedRoute, public router: Router, @@ -56,6 +60,8 @@ export class KubeServiceComponent extends KubernetesNamespacedResource implement } - + migration(obj: any) { + this.migrationComponent.openModal(this.cluster, obj); + } } diff --git a/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts index 97b846294..ef3573ac2 100644 --- a/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts +++ b/src/frontend/src/app/admin/kubernetes/service/kube-service.module.ts @@ -6,6 +6,7 @@ import { ListServiceComponent } from './list-service/list-service.component'; import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; import { DgRowDetailComponent } from './service-dg-row-detail/service-dg-row-detail.component'; +import { MigrationComponent } from './migration/migration.component'; @NgModule({ imports: [ @@ -23,7 +24,8 @@ import { DgRowDetailComponent } from './service-dg-row-detail/service-dg-row-det declarations: [ KubeServiceComponent, ListServiceComponent, - DgRowDetailComponent + DgRowDetailComponent, + MigrationComponent ] }) diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html index 6b723f674..bc11c51f9 100644 --- a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.html @@ -40,6 +40,7 @@ + {{ obj.metadata.name }} @@ -57,7 +58,6 @@ {{ obj.metadata.creationTimestamp | relativeTime}} - Lorem ipsum... diff --git a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts index 33f204753..9bf402578 100644 --- a/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts +++ b/src/frontend/src/app/admin/kubernetes/service/list-service/list-service.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; import { KubeService } from '../../../../../../lib/shared/model/kubernetes/service'; @@ -12,11 +12,17 @@ export class ListServiceComponent extends KubernetesNamespacedListResource { @Input() resources: any[]; @Input() showState: object; + @Output() migration = new EventEmitter(); + constructor(public tplDetailService: TplDetailService) { super(tplDetailService); } + migrationResource(obj: any) { + this.migration.emit(obj); + } + getPort(obj: KubeService) { const result = Array(); for (const port of obj.spec.ports) { diff --git a/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.html b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.html new file mode 100644 index 000000000..488f54eea --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.html @@ -0,0 +1,32 @@ + +

迁移资源 + +

+
+
+
+
+ +
+ + {{app.name}} + +
+
+
+ + + +
+
+
+
+ + + +
+
+ diff --git a/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts new file mode 100644 index 000000000..263d219ee --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts @@ -0,0 +1,64 @@ +import { Component, OnInit } from '@angular/core'; +import { AppService } from '../../../../shared/client/v1/app.service'; +import { AceEditorService } from '../../../../shared/ace-editor/ace-editor.service'; +import { MessageHandlerService } from '../../../../shared/message-handler/message-handler.service'; +import { ServiceService } from '../../../../../../lib/shared/client/v1/service.service'; +import { ServiceTplService } from '../../../../../../lib/shared/client/v1/servicetpl.service'; +import { Service } from '../../../../../../lib/shared/model/service'; +import { ServiceTpl } from '../../../../../../lib/shared/model/servicetpl'; +import { KubernetesNamespacedMigrationResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource'; +import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceService } from '../../../../shared/shared.const'; + +@Component({ + selector: 'kube-migration', + templateUrl: 'migration.component.html' +}) +export class MigrationComponent extends KubernetesNamespacedMigrationResource implements OnInit { + + constructor(private serviceService: ServiceService, + private serviceTplService: ServiceTplService, + public appService: AppService, + public kubernetesClient: KubernetesClient, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, appService, aceEditorService, messageHandlerService); + super.registKubeResource(KubeResourceService); + } + + ngOnInit(): void { + super.ngOnInit(); + } + + onSubmit() { + if (this.isSubmitOnGoing) { + return; + } + this.isSubmitOnGoing = true; + const resource = new Service(); + resource.name = this.obj.metadata.name; + resource.appId = this.selectedApp.id; + this.serviceService.create(resource).subscribe( + resp => { + const data = resp.data; + const tpl = new ServiceTpl(); + tpl.name = this.obj.metadata.name; + tpl.serviceId = data.id; + tpl.template = JSON.stringify(this.obj); + tpl.description = 'migration from kubernetes. '; + this.serviceTplService.create(tpl, this.selectedApp.id).subscribe( + () => { + this.messageHandlerService.showSuccess('资源创建成功！请前往前台手动发布到相应机房！'); + }, + error => { + this.messageHandlerService.handleError(error); + }); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + this.modalOpened = false; + } + +} diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts new file mode 100644 index 000000000..5d16408b5 --- /dev/null +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts @@ -0,0 +1,84 @@ +import { OnInit, ViewChild } from '@angular/core'; +import { NgForm } from '@angular/forms'; +import { AceEditorBoxComponent } from '../../ace-editor/ace-editor-box/ace-editor-box.component'; +import { App } from '../../model/v1/app'; +import { AppService } from '../../client/v1/app.service'; +import { AceEditorService } from '../../ace-editor/ace-editor.service'; +import { MessageHandlerService } from '../../message-handler/message-handler.service'; +import { defaultKubeResouce } from '../../default-models/kube-resource.const'; +import { AceEditorMsg } from '../../ace-editor/ace-editor'; +import { KubernetesClient } from '../../client/v1/kubernetes/kubernetes'; +import { KubeResourcesName } from '../../shared.const'; + + +export class KubernetesNamespacedMigrationResource implements OnInit { + modalOpened: boolean; + kubeResource: KubeResourcesName; + + @ViewChild('ngForm') + currentForm: NgForm; + + @ViewChild(AceEditorBoxComponent) + aceBox: any; + + obj: any; + isSubmitOnGoing = false; + cluster: string; + + apps: App[]; + selectedApp: App; + + constructor(public kubernetesClient: KubernetesClient, + public appService: AppService, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { + + } + + registKubeResource(kubeResource: string) { + this.kubeResource = kubeResource; + } + + ngOnInit(): void { + this.appService + .getNames() + .subscribe( + response => { + this.apps = response.data; + }, + error => this.messageHandlerService.handleError(error) + ); + + } + + openModal(cluster: string, obj: any) { + this.modalOpened = true; + this.isSubmitOnGoing = false; + this.cluster = cluster; + this.kubernetesClient.get(this.cluster, this.kubeResource, obj.metadata.name, obj.metadata.namespace) + .subscribe( + response => { + const data = response.data; + this.obj = JSON.parse(defaultKubeResouce); + this.obj.metadata.name = data.metadata.name; + this.obj.metadata.labels = data.metadata.labels; + this.obj.metadata.annotations = data.metadata.annotations; + this.obj.spec = data.spec; + this.aceEditorService.announceMessage(AceEditorMsg.Instance(this.obj)); + }, + error => this.messageHandlerService.handleError(error) + ); + } + + onCancel() { + this.modalOpened = false; + this.currentForm.reset(); + } + + public get isValid(): boolean { + return this.currentForm && + this.currentForm.valid && + !this.isSubmitOnGoing && + this.selectedApp != null; + } +} diff --git a/src/frontend/src/app/shared/default-models/kube-resource.const.ts b/src/frontend/src/app/shared/default-models/kube-resource.const.ts new file mode 100644 index 000000000..9b0881cf4 --- /dev/null +++ b/src/frontend/src/app/shared/default-models/kube-resource.const.ts @@ -0,0 +1,7 @@ +export const defaultKubeResouce = `{ + "metadata": { + "labels": {} + }, + "spec": { + } +}`; diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 1a840915b..27eaae7d2 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -571,6 +571,7 @@ "KUBERNETES": { "ACTION": { "EDIT": "查看/编辑", + "MIGRATION": "迁移", "DELETE": "删除", "FORCEDELETE": "强制删除", "REFRESH": "刷新" From 32fc4f7c6ffe39f7687e7569b752dd0467fb53ad Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Mon, 11 Feb 2019 19:12:00 +0800 Subject: [PATCH 086/112] frontend: rename kubernetes base migration --- .../admin/kubernetes/service/migration/migration.component.ts | 4 ++-- ...namespaced-migration-resource.ts => migration-resource.ts} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/frontend/src/app/shared/base/kubernetes-namespaced/{kubernetes-namespaced-migration-resource.ts => migration-resource.ts} (97%) diff --git a/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts index 263d219ee..f65814008 100644 --- a/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts +++ b/src/frontend/src/app/admin/kubernetes/service/migration/migration.component.ts @@ -6,7 +6,7 @@ import { ServiceService } from '../../../../../../lib/shared/client/v1/service.s import { ServiceTplService } from '../../../../../../lib/shared/client/v1/servicetpl.service'; import { Service } from '../../../../../../lib/shared/model/service'; import { ServiceTpl } from '../../../../../../lib/shared/model/servicetpl'; -import { KubernetesNamespacedMigrationResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource'; +import { MigrationResource } from '../../../../shared/base/kubernetes-namespaced/migration-resource'; import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes'; import { KubeResourceService } from '../../../../shared/shared.const'; @@ -14,7 +14,7 @@ import { KubeResourceService } from '../../../../shared/shared.const'; selector: 'kube-migration', templateUrl: 'migration.component.html' }) -export class MigrationComponent extends KubernetesNamespacedMigrationResource implements OnInit { +export class MigrationComponent extends MigrationResource implements OnInit { constructor(private serviceService: ServiceService, private serviceTplService: ServiceTplService, diff --git a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts b/src/frontend/src/app/shared/base/kubernetes-namespaced/migration-resource.ts similarity index 97% rename from src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts rename to src/frontend/src/app/shared/base/kubernetes-namespaced/migration-resource.ts index 5d16408b5..e8fa2b3e2 100644 --- a/src/frontend/src/app/shared/base/kubernetes-namespaced/kubernetes-namespaced-migration-resource.ts +++ b/src/frontend/src/app/shared/base/kubernetes-namespaced/migration-resource.ts @@ -11,7 +11,7 @@ import { KubernetesClient } from '../../client/v1/kubernetes/kubernetes'; import { KubeResourcesName } from '../../shared.const'; -export class KubernetesNamespacedMigrationResource implements OnInit { +export class MigrationResource implements OnInit { modalOpened: boolean; kubeResource: KubeResourcesName; From 539d0bde4f974f529ececb7dfb6a91a1898af793 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 11:56:42 +0800 Subject: [PATCH 087/112] frontend: admin add kubernetes configmap resource --- .../src/app/admin/admin-routing.module.ts | 3 + src/frontend/src/app/admin/admin.module.ts | 4 +- .../configmap/kube-configmap.component.html | 47 +++++++++++++ .../configmap/kube-configmap.component.ts | 67 +++++++++++++++++++ .../configmap/kube-configmap.module.ts | 31 +++++++++ .../list-configmap.component.html | 41 ++++++++++++ .../list-configmap.component.ts | 24 +++++++ .../migration/migration.component.html | 32 +++++++++ .../migration/migration.component.ts | 64 ++++++++++++++++++ .../app/admin/sidenav/sidenav.component.html | 7 ++ .../migration-resource.ts | 12 ++-- src/frontend/src/assets/i18n/zh-Hans.json | 8 +++ 12 files changed, 333 insertions(+), 7 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.module.ts create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index 3ae2e0764..f778fc0ce 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -71,6 +71,7 @@ import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/tr import { KubePodComponent } from './kubernetes/pod/kube-pod.component'; import { KubeServiceComponent } from './kubernetes/service/kube-service.component'; import { KubeEndpointComponent } from './kubernetes/endpoint/kube-endpoint.component'; +import { KubeConfigmapComponent } from './kubernetes/configmap/kube-configmap.component'; const routes: Routes = [ @@ -157,6 +158,8 @@ const routes: Routes = [ {path: 'kubernetes/service/:cluster', component: KubeServiceComponent}, {path: 'kubernetes/endpoint', component: KubeEndpointComponent}, {path: 'kubernetes/endpoint/:cluster', component: KubeEndpointComponent}, + {path: 'kubernetes/configmap', component: KubeConfigmapComponent}, + {path: 'kubernetes/configmap/:cluster', component: KubeConfigmapComponent}, ...ADMINROUTES ] } diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index e650ddc74..98e9eec93 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -51,6 +51,7 @@ import { SidenavModule } from './sidenav/sidenav.module'; import { KubePodModule } from './kubernetes/pod/kube-pod.module'; import { KubeServiceModule } from './kubernetes/service/kube-service.module'; import { KubeEndpointModule } from './kubernetes/endpoint/kube-endpoint.module'; +import { KubeConfigmapModule } from './kubernetes/configmap/kube-configmap.module'; @NgModule({ imports: [ @@ -94,7 +95,8 @@ import { KubeEndpointModule } from './kubernetes/endpoint/kube-endpoint.module'; SidenavModule, KubePodModule, KubeServiceModule, - KubeEndpointModule + KubeEndpointModule, + KubeConfigmapModule ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.html b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.html new file mode 100644 index 000000000..833c94cd5 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.html @@ -0,0 +1,47 @@ +
+
+
+
+ + + + + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.LABEL' | translate}} + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.AGE' | translate}} + + + + + {{ns}} + +
+
+ + + +
+
+ + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.ts b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.ts new file mode 100644 index 000000000..985a5f97d --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.component.ts @@ -0,0 +1,67 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { ClusterService } from '../../../shared/client/v1/cluster.service'; +import { AuthService } from '../../../shared/auth/auth.service'; +import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceConfigMap } from '../../../shared/shared.const'; +import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; +import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component'; +import { MigrationComponent } from './migration/migration.component'; +import { ListConfigmapComponent } from './list-configmap/list-configmap.component'; + +const showState = { + 'name': {hidden: false}, + 'type': {hidden: false}, + 'label': {hidden: false}, + 'clusterIP': {hidden: false}, + 'port': {hidden: false}, + 'externalIP': {hidden: false}, + 'age': {hidden: false}, +}; + +@Component({ + selector: 'wayne-kube-configmap', + templateUrl: './kube-configmap.component.html' +}) + +export class KubeConfigmapComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy { + @ViewChild(ListConfigmapComponent) + listResourceComponent: ListConfigmapComponent; + + @ViewChild(AceEditorComponent) + aceEditorModal: AceEditorComponent; + + @ViewChild(DeletionDialogComponent) + deletionDialogComponent: DeletionDialogComponent; + + @ViewChild(MigrationComponent) + migrationComponent: MigrationComponent; + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, route, router, clusterService, authService, messageHandlerService); + super.registResourceType('configmap'); + super.registKubeResource(KubeResourceConfigMap); + super.registShowSate(showState); + } + + ngOnInit() { + super.ngOnInit(); + } + + ngOnDestroy(): void { + super.ngOnDestroy(); + } + + + migration(obj: any) { + this.migrationComponent.openModal(this.cluster, obj); + } + +} diff --git a/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.module.ts b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.module.ts new file mode 100644 index 000000000..c5b6b3127 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/kube-configmap.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { KubeConfigmapComponent } from './kube-configmap.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; +import { MigrationComponent } from './migration/migration.component'; +import { ListConfigmapComponent } from './list-configmap/list-configmap.component'; + +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + DeletionDialogModule + ], + providers: [ + KubernetesClient + ], + exports: [ + KubeConfigmapComponent, + ListConfigmapComponent + ], + declarations: [ + KubeConfigmapComponent, + ListConfigmapComponent, + MigrationComponent + ] +}) + +export class KubeConfigmapModule { +} diff --git a/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html new file mode 100644 index 000000000..004a081e6 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html @@ -0,0 +1,41 @@ + + + + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.NAME' | translate}} + + + + + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.LABEL' | translate}} + + + + + {{'ADMIN.KUBERNETES.CONFIGMAP.LIST.AGE' | translate}} + + + + + + + + + + + {{ obj.metadata.name }} + +
+ {{label.key}}: {{label.value}} +
+ + {{ obj.metadata.creationTimestamp | relativeTime}} + + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.ts b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.ts new file mode 100644 index 000000000..03f579a36 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.ts @@ -0,0 +1,24 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; +import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; + +@Component({ + selector: 'wayne-list-configmap', + templateUrl: './list-configmap.component.html' +}) + +export class ListConfigmapComponent extends KubernetesNamespacedListResource { + @Input() resources: any[]; + @Input() showState: object; + + @Output() migration = new EventEmitter(); + + constructor(public tplDetailService: TplDetailService) { + super(tplDetailService); + } + + + migrationResource(obj: any) { + this.migration.emit(obj); + } +} diff --git a/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.html b/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.html new file mode 100644 index 000000000..488f54eea --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.html @@ -0,0 +1,32 @@ + +

迁移资源 + +

+
+
+
+
+ +
+ + {{app.name}} + +
+
+
+ + + +
+
+
+
+ + + +
+
+ diff --git a/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.ts b/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.ts new file mode 100644 index 000000000..ec7bd694a --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/configmap/migration/migration.component.ts @@ -0,0 +1,64 @@ +import { Component, OnInit } from '@angular/core'; +import { AppService } from '../../../../shared/client/v1/app.service'; +import { AceEditorService } from '../../../../shared/ace-editor/ace-editor.service'; +import { MessageHandlerService } from '../../../../shared/message-handler/message-handler.service'; +import { MigrationResource } from '../../../../shared/base/kubernetes-namespaced/migration-resource'; +import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceConfigMap } from '../../../../shared/shared.const'; +import { ConfigMapService } from '../../../../shared/client/v1/configmap.service'; +import { ConfigMapTplService } from '../../../../shared/client/v1/configmaptpl.service'; +import { ConfigMap } from '../../../../shared/model/v1/configmap'; +import { ConfigMapTpl } from '../../../../shared/model/v1/configmaptpl'; + +@Component({ + selector: 'kube-migration', + templateUrl: 'migration.component.html' +}) +export class MigrationComponent extends MigrationResource implements OnInit { + + constructor(private configMapService: ConfigMapService, + private configMapTplService: ConfigMapTplService, + public appService: AppService, + public kubernetesClient: KubernetesClient, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, appService, aceEditorService, messageHandlerService); + super.registKubeResource(KubeResourceConfigMap); + } + + ngOnInit(): void { + super.ngOnInit(); + } + + onSubmit() { + if (this.isSubmitOnGoing) { + return; + } + this.isSubmitOnGoing = true; + const resource = new ConfigMap(); + resource.name = this.obj.metadata.name; + resource.appId = this.selectedApp.id; + this.configMapService.create(resource).subscribe( + resp => { + const data = resp.data; + const tpl = new ConfigMapTpl(); + tpl.name = this.obj.metadata.name; + tpl.configMapId = data.id; + tpl.template = JSON.stringify(this.obj); + tpl.description = 'migration from kubernetes. '; + this.configMapTplService.create(tpl, this.selectedApp.id).subscribe( + () => { + this.messageHandlerService.showSuccess('资源创建成功！请前往前台手动发布到相应机房！'); + }, + error => { + this.messageHandlerService.handleError(error); + }); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + this.modalOpened = false; + } + +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html index 69cee7e0c..e59d31ba9 100644 --- a/src/frontend/src/app/admin/sidenav/sidenav.component.html +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -65,6 +65,13 @@ Endpoint
+ + + ConfigMap + { const data = response.data; - this.obj = JSON.parse(defaultKubeResouce); - this.obj.metadata.name = data.metadata.name; - this.obj.metadata.labels = data.metadata.labels; - this.obj.metadata.annotations = data.metadata.annotations; - this.obj.spec = data.spec; + data.status = undefined; + data.metadata.selfLink = undefined; + data.metadata.uid = undefined; + data.metadata.resourceVersion = undefined; + data.metadata.creationTimestamp = undefined; + this.obj = data; this.aceEditorService.announceMessage(AceEditorMsg.Instance(this.obj)); }, error => this.messageHandlerService.handleError(error) diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 27eaae7d2..7dd71ee8a 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -620,6 +620,14 @@ "IP": "IP", "AGE": "启动时间" } + }, + "CONFIGMAP": { + "CREATE": "创建 ConfigMap", + "LIST": { + "NAME": "名称", + "LABEL": "标签", + "AGE": "启动时间" + } } } } From 7d4a77c4c7fffb67c39c75fb3f0fa19ad411957d Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 11:57:35 +0800 Subject: [PATCH 088/112] frontend: fit admin kubernetes pv action button --- .../persistentvolume/persistentvolume.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html index bc1f6521e..86faa06fd 100644 --- a/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html +++ b/src/frontend/src/app/admin/kubernetes/persistentvolume/persistentvolume.component.html @@ -3,12 +3,12 @@
- + {{'TITLE.NAME' | translate}} From a163034d67c6c65b16b97818124ea6602468d893 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Tue, 12 Feb 2019 15:31:39 +0800 Subject: [PATCH 089/112] Fix get pod info API bug that label should be a key not a map --- src/backend/controllers/openapi/pod.go | 10 +--------- src/backend/resources/pod/pod.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/backend/controllers/openapi/pod.go b/src/backend/controllers/openapi/pod.go index 1f1aa740d..73af2cceb 100644 --- a/src/backend/controllers/openapi/pod.go +++ b/src/backend/controllers/openapi/pod.go @@ -5,8 +5,6 @@ import ( "net/http" "strings" - "k8s.io/apimachinery/pkg/labels" - "github.com/Qihoo360/wayne/src/backend/client" "github.com/Qihoo360/wayne/src/backend/models" "github.com/Qihoo360/wayne/src/backend/models/response" @@ -79,13 +77,7 @@ func (c *OpenAPIController) GetPodInfo() { return } - label, err := labels.ConvertSelectorToLabelsMap(params.LabelSelector) - if err != nil { - c.AddErrorAndResponse(fmt.Sprintf("Invalid LabelSelector parameter: %v!", err), http.StatusBadRequest) - return - } - - pods, err := pod.ListPod(manager.CacheFactory, "", label) + pods, err := pod.ListPodByLabelKey(manager.CacheFactory, "", params.LabelSelector) if err != nil { logs.Error(fmt.Sprintf("Failed to parse metadata: %s", err.Error())) c.AddErrorAndResponse(fmt.Sprintf("Maybe a problematic k8s cluster(%s)!", params.Cluster), http.StatusInternalServerError) diff --git a/src/backend/resources/pod/pod.go b/src/backend/resources/pod/pod.go index a3dbf7577..0d7d9ace5 100644 --- a/src/backend/resources/pod/pod.go +++ b/src/backend/resources/pod/pod.go @@ -71,6 +71,24 @@ func ListKubePod(indexer *client.CacheFactory, namespace string, label map[strin return pods, nil } +func ListPodByLabelKey(indexer *client.CacheFactory, namespace string, label string) ([]*Pod, error) { + podSelector := map[string]string{} + podList, err := ListKubePod(indexer, namespace, podSelector) + if err != nil { + return nil, err + } + pods := make([]*Pod, 0) + for _, pod := range podList { + if pod.Labels[label] != "" { + pods = append(pods, &Pod{ + Labels: pod.Labels, + PodIp: pod.Status.PodIP, + }) + } + } + return pods, nil +} + func GetPodsByStatefulset(indexer *client.CacheFactory, namespace, name string) ([]*Pod, error) { podSelector := map[string]string{"app": name} pods, err := ListKubePod(indexer, namespace, podSelector) From 0ae707479f04c70b0c2abf11d915c04ea8899cbc Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 15:35:05 +0800 Subject: [PATCH 090/112] backend: proxy kubernetes resource list support secret and configmap --- src/backend/resources/common/common.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/backend/resources/common/common.go b/src/backend/resources/common/common.go index 91f20d5d1..af44580ba 100644 --- a/src/backend/resources/common/common.go +++ b/src/backend/resources/common/common.go @@ -4,6 +4,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +// TODO convert runtime.Object to real type // for common kubernetes Object type Object struct { metav1.TypeMeta `json:",inline"` @@ -11,6 +12,10 @@ type Object struct { // for endpoint only Subsets interface{} `json:"subsets,omitempty"` - Spec interface{} `json:"spec,omitempty"` - Status interface{} `json:"status,omitempty"` + // for secret and configmap + Type interface{} `json:"type,omitempty"` + Data interface{} `json:"data,omitempty"` + + Spec interface{} `json:"spec,omitempty"` + Status interface{} `json:"status,omitempty"` } From a6b0be856d7b62f6111bd536014149399b1d849f Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 15:35:44 +0800 Subject: [PATCH 091/112] frontend: admin add kubernetes secret resource --- .../src/app/admin/admin-routing.module.ts | 3 + src/frontend/src/app/admin/admin.module.ts | 4 +- .../list-configmap.component.html | 4 +- .../secret/kube-secret.component.html | 48 +++++++++++++ .../secret/kube-secret.component.ts | 67 +++++++++++++++++++ .../kubernetes/secret/kube-secret.module.ts | 27 ++++++++ .../list-secret/list-secret.component.html | 47 +++++++++++++ .../list-secret/list-secret.component.ts | 24 +++++++ .../secret/migration/migration.component.html | 32 +++++++++ .../secret/migration/migration.component.ts | 64 ++++++++++++++++++ .../app/admin/sidenav/sidenav.component.html | 7 ++ src/frontend/src/assets/i18n/zh-Hans.json | 9 +++ 12 files changed, 333 insertions(+), 3 deletions(-) create mode 100644 src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/secret/kube-secret.module.ts create mode 100644 src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.ts create mode 100644 src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.html create mode 100644 src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.ts diff --git a/src/frontend/src/app/admin/admin-routing.module.ts b/src/frontend/src/app/admin/admin-routing.module.ts index f778fc0ce..0b420c3bc 100644 --- a/src/frontend/src/app/admin/admin-routing.module.ts +++ b/src/frontend/src/app/admin/admin-routing.module.ts @@ -72,6 +72,7 @@ import { KubePodComponent } from './kubernetes/pod/kube-pod.component'; import { KubeServiceComponent } from './kubernetes/service/kube-service.component'; import { KubeEndpointComponent } from './kubernetes/endpoint/kube-endpoint.component'; import { KubeConfigmapComponent } from './kubernetes/configmap/kube-configmap.component'; +import { KubeSecretComponent } from './kubernetes/secret/kube-secret.component'; const routes: Routes = [ @@ -160,6 +161,8 @@ const routes: Routes = [ {path: 'kubernetes/endpoint/:cluster', component: KubeEndpointComponent}, {path: 'kubernetes/configmap', component: KubeConfigmapComponent}, {path: 'kubernetes/configmap/:cluster', component: KubeConfigmapComponent}, + {path: 'kubernetes/secret', component: KubeSecretComponent}, + {path: 'kubernetes/secret/:cluster', component: KubeSecretComponent}, ...ADMINROUTES ] } diff --git a/src/frontend/src/app/admin/admin.module.ts b/src/frontend/src/app/admin/admin.module.ts index 98e9eec93..1906bb557 100644 --- a/src/frontend/src/app/admin/admin.module.ts +++ b/src/frontend/src/app/admin/admin.module.ts @@ -52,6 +52,7 @@ import { KubePodModule } from './kubernetes/pod/kube-pod.module'; import { KubeServiceModule } from './kubernetes/service/kube-service.module'; import { KubeEndpointModule } from './kubernetes/endpoint/kube-endpoint.module'; import { KubeConfigmapModule } from './kubernetes/configmap/kube-configmap.module'; +import { KubeSecretModule } from './kubernetes/secret/kube-secret.module'; @NgModule({ imports: [ @@ -96,7 +97,8 @@ import { KubeConfigmapModule } from './kubernetes/configmap/kube-configmap.modul KubePodModule, KubeServiceModule, KubeEndpointModule, - KubeConfigmapModule + KubeConfigmapModule, + KubeSecretModule ], providers: [ AdminAuthCheckGuard, diff --git a/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html index 004a081e6..8c8fe76cb 100644 --- a/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html +++ b/src/frontend/src/app/admin/kubernetes/configmap/list-configmap/list-configmap.component.html @@ -22,8 +22,8 @@ - {{ obj.metadata.name }} - + {{ obj.metadata.name }} +
{{label.key}}: {{label.value}}
diff --git a/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.html b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.html new file mode 100644 index 000000000..b03bf47ea --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.html @@ -0,0 +1,48 @@ +
+
+
+
+ + + + + {{'ADMIN.KUBERNETES.SECRET.LIST.NAME' | translate}} + {{'ADMIN.KUBERNETES.SECRET.LIST.TYPE' | translate}} + {{'ADMIN.KUBERNETES.SECRET.LIST.LABEL' | translate}} + {{'ADMIN.KUBERNETES.SECRET.LIST.AGE' | translate}} + + + + + {{ns}} + +
+
+ + + +
+
+ + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.ts b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.ts new file mode 100644 index 000000000..e0fc056d4 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.component.ts @@ -0,0 +1,67 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { ClusterService } from '../../../shared/client/v1/cluster.service'; +import { AuthService } from '../../../shared/auth/auth.service'; +import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceSecret } from '../../../shared/shared.const'; +import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource'; +import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component'; +import { MigrationComponent } from './migration/migration.component'; +import { ListSecretComponent } from './list-secret/list-secret.component'; + +const showState = { + 'name': {hidden: false}, + 'type': {hidden: false}, + 'label': {hidden: false}, + 'clusterIP': {hidden: false}, + 'port': {hidden: false}, + 'externalIP': {hidden: false}, + 'age': {hidden: false}, +}; + +@Component({ + selector: 'wayne-kube-secret', + templateUrl: './kube-secret.component.html' +}) + +export class KubeSecretComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy { + @ViewChild(ListSecretComponent) + listResourceComponent: ListSecretComponent; + + @ViewChild(AceEditorComponent) + aceEditorModal: AceEditorComponent; + + @ViewChild(DeletionDialogComponent) + deletionDialogComponent: DeletionDialogComponent; + + @ViewChild(MigrationComponent) + migrationComponent: MigrationComponent; + + constructor(public kubernetesClient: KubernetesClient, + public route: ActivatedRoute, + public router: Router, + public clusterService: ClusterService, + public authService: AuthService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, route, router, clusterService, authService, messageHandlerService); + super.registResourceType('secret'); + super.registKubeResource(KubeResourceSecret); + super.registShowSate(showState); + } + + ngOnInit() { + super.ngOnInit(); + } + + ngOnDestroy(): void { + super.ngOnDestroy(); + } + + + migration(obj: any) { + this.migrationComponent.openModal(this.cluster, obj); + } + +} diff --git a/src/frontend/src/app/admin/kubernetes/secret/kube-secret.module.ts b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.module.ts new file mode 100644 index 000000000..9b7933f36 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/kube-secret.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { KubeSecretComponent } from './kube-secret.component'; +import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes'; +import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module'; +import { MigrationComponent } from './migration/migration.component'; +import { ListSecretComponent } from './list-secret/list-secret.component'; + +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + DeletionDialogModule + ], + providers: [ + KubernetesClient + ], + declarations: [ + KubeSecretComponent, + ListSecretComponent, + MigrationComponent + ] +}) + +export class KubeSecretModule { +} diff --git a/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.html b/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.html new file mode 100644 index 000000000..15a9e29d3 --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.html @@ -0,0 +1,47 @@ + + + + {{'ADMIN.KUBERNETES.SECRET.LIST.NAME' | translate}} + + + + + {{'ADMIN.KUBERNETES.SECRET.LIST.LABEL' | translate}} + + + + + {{'ADMIN.KUBERNETES.SECRET.LIST.TYPE' | translate}} + + + + + {{'ADMIN.KUBERNETES.SECRET.LIST.AGE' | translate}} + + + + + + + + + + + {{ obj.metadata.name }} + +
+ {{label.key}}: {{label.value}} +
+ + {{ obj.type }} + {{ obj.metadata.creationTimestamp | relativeTime}} + + + + + + diff --git a/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.ts b/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.ts new file mode 100644 index 000000000..130e32cfb --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/list-secret/list-secret.component.ts @@ -0,0 +1,24 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource'; +import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service'; + +@Component({ + selector: 'wayne-list-secret', + templateUrl: './list-secret.component.html' +}) + +export class ListSecretComponent extends KubernetesNamespacedListResource { + @Input() resources: any[]; + @Input() showState: object; + + @Output() migration = new EventEmitter(); + + constructor(public tplDetailService: TplDetailService) { + super(tplDetailService); + } + + + migrationResource(obj: any) { + this.migration.emit(obj); + } +} diff --git a/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.html b/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.html new file mode 100644 index 000000000..488f54eea --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.html @@ -0,0 +1,32 @@ + +

迁移资源 + +

+
+
+
+
+ +
+ + {{app.name}} + +
+
+
+ + + +
+
+
+
+ + + +
+
+ diff --git a/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.ts b/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.ts new file mode 100644 index 000000000..258ad445d --- /dev/null +++ b/src/frontend/src/app/admin/kubernetes/secret/migration/migration.component.ts @@ -0,0 +1,64 @@ +import { Component, OnInit } from '@angular/core'; +import { AppService } from '../../../../shared/client/v1/app.service'; +import { AceEditorService } from '../../../../shared/ace-editor/ace-editor.service'; +import { MessageHandlerService } from '../../../../shared/message-handler/message-handler.service'; +import { MigrationResource } from '../../../../shared/base/kubernetes-namespaced/migration-resource'; +import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes'; +import { KubeResourceSecret } from '../../../../shared/shared.const'; +import { SecretService } from '../../../../shared/client/v1/secret.service'; +import { SecretTplService } from '../../../../shared/client/v1/secrettpl.service'; +import { Secret } from '../../../../shared/model/v1/secret'; +import { SecretTpl } from '../../../../shared/model/v1/secrettpl'; + +@Component({ + selector: 'kube-migration', + templateUrl: 'migration.component.html' +}) +export class MigrationComponent extends MigrationResource implements OnInit { + + constructor(private secretService: SecretService, + private secretTplService: SecretTplService, + public appService: AppService, + public kubernetesClient: KubernetesClient, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { + super(kubernetesClient, appService, aceEditorService, messageHandlerService); + super.registKubeResource(KubeResourceSecret); + } + + ngOnInit(): void { + super.ngOnInit(); + } + + onSubmit() { + if (this.isSubmitOnGoing) { + return; + } + this.isSubmitOnGoing = true; + const resource = new Secret(); + resource.name = this.obj.metadata.name; + resource.appId = this.selectedApp.id; + this.secretService.create(resource).subscribe( + resp => { + const data = resp.data; + const tpl = new SecretTpl(); + tpl.name = this.obj.metadata.name; + tpl.secretId = data.id; + tpl.template = JSON.stringify(this.obj); + tpl.description = 'migration from kubernetes. '; + this.secretTplService.create(tpl, this.selectedApp.id).subscribe( + () => { + this.messageHandlerService.showSuccess('资源创建成功！请前往前台手动发布到相应机房！'); + }, + error => { + this.messageHandlerService.handleError(error); + }); + }, + error => { + this.messageHandlerService.handleError(error); + } + ); + this.modalOpened = false; + } + +} diff --git a/src/frontend/src/app/admin/sidenav/sidenav.component.html b/src/frontend/src/app/admin/sidenav/sidenav.component.html index e59d31ba9..fb87d53cb 100644 --- a/src/frontend/src/app/admin/sidenav/sidenav.component.html +++ b/src/frontend/src/app/admin/sidenav/sidenav.component.html @@ -72,6 +72,13 @@ ConfigMap + + + Secret + Date: Tue, 12 Feb 2019 16:42:22 +0800 Subject: [PATCH 092/112] frontend: fix log detail error --- .../src/app/portal/pod-logging/pod-logging.component.html | 2 +- src/frontend/src/app/shared/client/v1/kubernetes/log.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/app/portal/pod-logging/pod-logging.component.html b/src/frontend/src/app/portal/pod-logging/pod-logging.component.html index eb955b31f..76dba18ca 100644 --- a/src/frontend/src/app/portal/pod-logging/pod-logging.component.html +++ b/src/frontend/src/app/portal/pod-logging/pod-logging.component.html @@ -55,7 +55,7 @@

{{'POD.LOG_SHOW_ROWS' | translate}}

{{'ACTION.REFRESH' | translate}} - {{(isCopied ? 'COPY.SUCCESS' : 'COPY.SUCCESS_MESSAGE') | translate}} + {{(isCopied ? 'COPY.SUCCESS' : 'COPY.SEARCH_COMMAND') | translate}}
diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts index 3df34561c..0f513c7d3 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/log.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/log.ts @@ -11,9 +11,9 @@ export class LogClient { get(appId: number, cluster: string, namespace: string, pod: string, container: string, tailLines: number): Observable { let params = new HttpParams(); params = params.set('tailLines', tailLines + ''); + const url = `/api/v1/kubernetes/apps/${appId}/podlogs/${pod}/containers/${container}/namespaces/${namespace}/clusters/${cluster}`; return this.http - .get(`/api/v1/kubernetes/apps/${appId}/podlogs/${pod}/containers/${container}/ - namespaces/${namespace}/clusters/${cluster}`, {params: params}) + .get(url, {params: params}) .catch(error => throwError(error)); } } From 06a482cbbc198f71b5692f69bc0b4a95e898baef Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 18:47:50 +0800 Subject: [PATCH 093/112] frontend: fix portal configmap get status error --- src/frontend/src/app/portal/configmap/configmap.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/app/portal/configmap/configmap.component.ts b/src/frontend/src/app/portal/configmap/configmap.component.ts index 64b3b4f9d..1325e1d39 100644 --- a/src/frontend/src/app/portal/configmap/configmap.component.ts +++ b/src/frontend/src/app/portal/configmap/configmap.component.ts @@ -325,7 +325,7 @@ export class ConfigMapComponent implements AfterContentInit, OnDestroy, OnInit { tplStatusMap[statu.templateId] = Array(); } statu.errNum = 0; - tplStatusMap[statu.templateId].push(state); + tplStatusMap[statu.templateId].push(statu); } } this.tplStatusMap = tplStatusMap; From 1a0ff229e2ba14fe04ce557900dfa25ae041c250 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Tue, 12 Feb 2019 19:22:29 +0800 Subject: [PATCH 094/112] frontend: fix url new-line character error --- .../src/app/portal/cronjob/cronjob.component.ts | 4 ++-- .../src/app/portal/daemonset/daemonset.component.ts | 3 +-- .../v1/kubernetes/persistentvolumeclaims-robin.ts | 12 ++++-------- src/frontend/tslint.json | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/frontend/src/app/portal/cronjob/cronjob.component.ts b/src/frontend/src/app/portal/cronjob/cronjob.component.ts index d635578f4..c92cd8c67 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.component.ts @@ -380,8 +380,8 @@ export class CronjobComponent implements AfterContentInit, OnDestroy, OnInit { // 点击克隆模版 cloneCronjobTpl(tpl: CronjobTpl) { if (tpl) { - this.router.navigate([`portal/namespace/${this.cacheService.namespaceId}/app - /${this.app.id}/cronjob/${this.cronjobId}/tpl/${tpl.id}`]); + this.router.navigate( + [`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/cronjob/${this.cronjobId}/tpl/${tpl.id}`]); } } diff --git a/src/frontend/src/app/portal/daemonset/daemonset.component.ts b/src/frontend/src/app/portal/daemonset/daemonset.component.ts index 4028fd3e9..ba1338d91 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.component.ts @@ -353,8 +353,7 @@ export class DaemonSetComponent implements AfterContentInit, OnDestroy, OnInit { cloneDaemonSetTpl(tpl: DaemonSetTemplate) { if (tpl) { this.router.navigate( - [`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/daemonset - /${this.daemonSetId}/tpl/${tpl.id}`]); + [`portal/namespace/${this.cacheService.namespaceId}/app/${this.app.id}/daemonset/${this.daemonSetId}/tpl/${tpl.id}`]); } } diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts index c44ce6aa4..f3eacc5d0 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts @@ -53,29 +53,25 @@ export class PersistentVolumeClaimRobinClient { createSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http .post( - `/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin - /${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + `/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => throwError(error)); } deleteSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims - /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) + .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } deleteAllSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims - /robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) + .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } rollBackSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims - /robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => throwError(error)); } diff --git a/src/frontend/tslint.json b/src/frontend/tslint.json index 4a56e8a8f..efb3dee84 100644 --- a/src/frontend/tslint.json +++ b/src/frontend/tslint.json @@ -28,7 +28,7 @@ "interface-over-type-literal": true, "label-position": true, "max-line-length": [ - true, + false, 140 ], "member-access": false, From 26587d33536d7dccb7ae65912b6f2a2ddd33cdd0 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 11:02:50 +0800 Subject: [PATCH 095/112] frontend: fix robin url new-line character error --- .../persistentvolumeclaims-robin.ts | 28 +++++++++++-------- src/frontend/tslint.json | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts index f3eacc5d0..730346a97 100644 --- a/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts +++ b/src/frontend/src/app/shared/client/v1/kubernetes/persistentvolumeclaims-robin.ts @@ -3,6 +3,8 @@ import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; import { throwError } from 'rxjs'; +export const robinBaseUrl = `/api/v1/kubernetes/apps/`; + @Injectable() export class PersistentVolumeClaimRobinClient { constructor(private http: HttpClient) { @@ -10,68 +12,72 @@ export class PersistentVolumeClaimRobinClient { getStatus(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/status/namespaces/${namespace}/clusters/${cluster}`) + .get(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/status/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } activeRbdImage(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .post(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`, null) + .post(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => throwError(error)); } inActiveRbdImage(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`) + .delete(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/rbd/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } offlineRbdImageUser(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) + .delete(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } loginInfo(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) + .get(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/user/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } verify(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/verify/namespaces/${namespace}/clusters/${cluster}`) + .get(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/verify/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } listSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .get(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) + .get(robinBaseUrl + `${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } createSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http .post( - `/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + robinBaseUrl + + `${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => throwError(error)); } deleteSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) + .delete(robinBaseUrl + + `${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } deleteAllSnapshot(appId: number, cluster: string, namespace: string, name: string): Observable { return this.http - .delete(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) + .delete(robinBaseUrl + + `${appId}/persistentvolumeclaims/robin/${name}/snapshot/namespaces/${namespace}/clusters/${cluster}`) .catch(error => throwError(error)); } rollBackSnapshot(appId: number, cluster: string, namespace: string, name: string, version: string): Observable { return this.http - .put(`/api/v1/kubernetes/apps/${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) + .put(robinBaseUrl + + `${appId}/persistentvolumeclaims/robin/${name}/snapshot/${version}/namespaces/${namespace}/clusters/${cluster}`, null) .catch(error => throwError(error)); } diff --git a/src/frontend/tslint.json b/src/frontend/tslint.json index efb3dee84..4a56e8a8f 100644 --- a/src/frontend/tslint.json +++ b/src/frontend/tslint.json @@ -28,7 +28,7 @@ "interface-over-type-literal": true, "label-position": true, "max-line-length": [ - false, + true, 140 ], "member-access": false, From 9cdefccde313aaa74eff1c174ae635393ea1557b Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 11:03:41 +0800 Subject: [PATCH 096/112] frontend: add list-job i18 end_time --- .../src/app/portal/cronjob/list-job/list-job.component.html | 2 +- src/frontend/src/assets/i18n/zh-Hans.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html index 13a34d37c..48b6df980 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html @@ -27,7 +27,7 @@ - {{'TITLE.FINI_TIME' | translate}} + {{'TITLE.END_TIME' | translate}} diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 7d0817442..0313c36f6 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -465,6 +465,7 @@ "SHOW_COLUMN": "展示列", "START_STATUS": "启用状态", "START_TIME": "开始时间", + "END_TIME": "结束时间", "STATUS": "状态", "TEMPLATE": "模板", "TOTAL": "总量", From b97e9c230f8f002a751c5a9b2c185c18681a46dd Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 11:28:44 +0800 Subject: [PATCH 097/112] frontend: fix normal user edit resource error --- .../create-edit-cronjob/create-edit-cronjob.component.html | 2 +- .../create-edit-cronjob/create-edit-cronjob.component.ts | 3 ++- .../create-edit-daemonset/create-edit-daemonset.component.html | 2 +- .../create-edit-statefulset.component.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.html b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.html index 175e44841..8c8c1e365 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.html +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.html @@ -44,7 +44,7 @@

{{title}}

rows="3">
- +
diff --git a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts index 020930b25..5f03849e1 100644 --- a/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts +++ b/src/frontend/src/app/portal/cronjob/create-edit-cronjob/create-edit-cronjob.component.ts @@ -77,7 +77,8 @@ export class CreateEditCronjobComponent implements OnInit { this.clusterMetas[clu.name] = culsterMeta; } } - this.resourceLimitComponent.setValue(JSON.parse(this.cronjob.metaData)['resources']); + const metaData = JSON.parse(this.cronjob.metaData ? this.cronjob.metaData : '{}'); + this.resourceLimitComponent.setValue(metaData['resources']); }, error => { this.messageHandlerService.handleError(error); diff --git a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.html b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.html index 625486414..d5c1acbe3 100644 --- a/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.html +++ b/src/frontend/src/app/portal/daemonset/create-edit-daemonset/create-edit-daemonset.component.html @@ -41,7 +41,7 @@

{{title | translate}}

rows="3">
- +
diff --git a/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.html b/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.html index 981b45564..eaa038209 100644 --- a/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.html +++ b/src/frontend/src/app/portal/statefulset/create-edit-statefulset/create-edit-statefulset.component.html @@ -60,7 +60,7 @@

{{title}}

- +
From c22f3cecf2107139de31d87bae235529699b4092 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Thu, 14 Feb 2019 15:05:52 +0800 Subject: [PATCH 098/112] frontend:Refine list-pod to share component --- .../src/app/portal/cronjob/cronjob.module.ts | 2 - .../cronjob/list-job/list-job.component.html | 2 +- .../cronjob/list-job/list-job.component.ts | 4 +- .../cronjob/list-pod/list-pod.component.html | 63 ------- .../cronjob/list-pod/list-pod.component.ts | 129 ------------- .../app/portal/cronjob/list-pod/list-pod.scss | 14 -- .../app/portal/daemonset/daemonset.module.ts | 2 - .../list-daemonset.component.html | 2 +- .../list-daemonset.component.ts | 2 +- .../portal/daemonset/list-pod/inventory.ts | 27 --- .../list-pod/list-pod.component.html | 73 -------- .../daemonset/list-pod/list-pod.component.ts | 173 ----------------- .../portal/deployment/deployment.module.ts | 4 +- .../list-deployment.component.html | 2 +- .../list-deployment.component.ts | 2 +- .../portal/deployment/list-pod/inventory.ts | 27 --- .../portal/deployment/list-pod/list-pod.scss | 18 -- .../portal/statefulset/list-pod/inventory.ts | 27 --- .../list-pod/list-pod.component.html | 73 -------- .../list-pod/list-pod.component.ts | 175 ------------------ .../portal/statefulset/list-pod/list-pod.scss | 18 -- .../list-statefulset.component.html | 2 +- .../list-statefulset.component.ts | 2 +- .../portal/statefulset/statefulset.module.ts | 2 - .../cronjob => shared}/list-pod/inventory.ts | 2 +- .../list-pod/list-pod.component.html | 0 .../list-pod/list-pod.component.ts | 40 ++-- .../list-pod/list-pod.scss | 0 src/frontend/src/app/shared/shared.module.ts | 7 +- 29 files changed, 35 insertions(+), 859 deletions(-) delete mode 100644 src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.html delete mode 100644 src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts delete mode 100644 src/frontend/src/app/portal/cronjob/list-pod/list-pod.scss delete mode 100644 src/frontend/src/app/portal/daemonset/list-pod/inventory.ts delete mode 100644 src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.html delete mode 100644 src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts delete mode 100644 src/frontend/src/app/portal/deployment/list-pod/inventory.ts delete mode 100644 src/frontend/src/app/portal/deployment/list-pod/list-pod.scss delete mode 100644 src/frontend/src/app/portal/statefulset/list-pod/inventory.ts delete mode 100644 src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.html delete mode 100644 src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts delete mode 100644 src/frontend/src/app/portal/statefulset/list-pod/list-pod.scss rename src/frontend/src/app/{portal/cronjob => shared}/list-pod/inventory.ts (90%) rename src/frontend/src/app/{portal/deployment => shared}/list-pod/list-pod.component.html (100%) rename src/frontend/src/app/{portal/deployment => shared}/list-pod/list-pod.component.ts (79%) rename src/frontend/src/app/{portal/daemonset => shared}/list-pod/list-pod.scss (100%) diff --git a/src/frontend/src/app/portal/cronjob/cronjob.module.ts b/src/frontend/src/app/portal/cronjob/cronjob.module.ts index 594d1279f..ef85a96f5 100644 --- a/src/frontend/src/app/portal/cronjob/cronjob.module.ts +++ b/src/frontend/src/app/portal/cronjob/cronjob.module.ts @@ -4,7 +4,6 @@ import { CreateEditCronjobComponent } from './create-edit-cronjob/create-edit-cr import { CronjobComponent } from './cronjob.component'; import { ListCronjobComponent } from './list-cronjob/list-cronjob.component'; import { ListJobComponent } from './list-job/list-job.component'; -import { ListPodComponent } from './list-pod/list-pod.component'; import { CreateEditCronjobTplComponent } from './create-edit-cronjobtpl/create-edit-cronjobtpl.component'; import { ReactiveFormsModule } from '@angular/forms'; import { PublishCronjobTplComponent } from './publish-tpl/publish-tpl.component'; @@ -38,7 +37,6 @@ import { ListEventComponent } from './list-event/list-event.component'; CronjobComponent, ListCronjobComponent, ListJobComponent, - ListPodComponent, CreateEditCronjobComponent, CreateEditCronjobTplComponent, PublishCronjobTplComponent, diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html index 13a34d37c..0e429def8 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.html @@ -67,5 +67,5 @@ - + diff --git a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts index a0ff9917b..2e7f98d5e 100644 --- a/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts +++ b/src/frontend/src/app/portal/cronjob/list-job/list-job.component.ts @@ -3,7 +3,7 @@ import { ClrDatagridStateInterface } from '@clr/angular'; import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; import { Job } from '../../../shared/model/v1/job'; import { JobClient } from '../../../shared/client/v1/kubernetes/job'; -import { ListPodComponent } from '../list-pod/list-pod.component'; +import { ListPodComponent } from '../../../shared/list-pod/list-pod.component'; import { ActivatedRoute } from '@angular/router'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; @@ -75,7 +75,7 @@ export class ListJobComponent implements OnInit, OnDestroy { listPod(job: Job) { // 只允许查看非完成的pod列表? - this.listPodComponent.openModal(job.cluster, job.kubeJob); + this.listPodComponent.openModal(job.cluster, job.kubeJob.metadata.name); } refresh(state?: ClrDatagridStateInterface) { diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.html b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.html deleted file mode 100644 index f22b5966d..000000000 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.html +++ /dev/null @@ -1,63 +0,0 @@ - -

{{'POD.LIST' | translate}}

-
-
- - {{'MESSAGE.NO_MESSAGE' | translate}} - - - {{'TITLE.NAME' | translate}} - - - - - {{'TITLE.STATUS' | translate}} - - - - - PODIP - - - - - {{'POD.RESTART_NUM' | translate}} - - - - - Age - - - - - {{'TITLE.ACTION' | translate}} - - - - {{pod.name}} - - {{pod.state}} - - {{pod.podIp}} - - {{state.name}}:{{state.restartCount}} - - - {{pod.startTime | relativeTime}} - - - - - - - - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} - of {{pagination.totalItems}} - - - -
- - diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts deleted file mode 100644 index 3b65bac5f..000000000 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.component.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import 'rxjs/add/observable/combineLatest'; -import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { ClrDatagridSortOrder } from '@clr/angular'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; -import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; -import { PublicService } from '../../../shared/client/v1/public.service'; -import { CacheService } from '../../../shared/auth/cache.service'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; -import { DOCUMENT } from '@angular/common'; -import { ActivatedRoute } from '@angular/router'; -import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { Subscription } from 'rxjs/Subscription'; -import { KubeJob } from '../../../shared/model/v1/kubernetes/job'; - -@Component({ - selector: 'list-pod', - providers: [Inventory], - templateUrl: 'list-pod.component.html', - styleUrls: ['list-pod.scss'] -}) - -export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing = false; - isSubmitOnGoing = false; - modalOpened: boolean; - pods: Pod[]; - sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; - sorted = false; - timeComparator = new TimeComparator(); - stateComparator = new StateComparator(); - currentCluster: string; - job: KubeJob; - - subscription: Subscription; - - get appId(): number { - return parseInt(this.route.parent.snapshot.params['id'], 10); - } - - - constructor(private inventory: Inventory, - private deletionDialogService: ConfirmationDialogService, - private route: ActivatedRoute, - @Inject(DOCUMENT) private document: any, - public cacheService: CacheService, - private publicService: PublicService, - private messageHandlerService: MessageHandlerService, - private podClient: PodClient) { - this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { - if (message && - message.state === ConfirmationState.CONFIRMED && - message.source === ConfirmationTargets.POD) { - const pod: Pod = message.data; - this.podClient - .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) - .subscribe( - response => { - this.refresh(); - this.messageHandlerService.showSuccess('实例删除成功！'); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - }); - } - - ngOnDestroy(): void { - this.subscription.unsubscribe(); - } - - openModal(cluster: string, job: KubeJob) { - this.currentCluster = cluster; - this.job = job; - this.modalOpened = true; - this.refresh(); - } - - ngOnInit(): void { - } - - refresh() { - this.pods = null; - this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, 'job', this.job.metadata.name).subscribe( - response => { - const pods = response.data; - this.inventory.size = pods.length; - this.inventory.reset(pods); - this.pods = this.inventory.all; - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - - deletePod(pod: Pod) { - const deletionMessage = new ConfirmationMessage( - '删除实例确认', - `是否确认删除实例 ${pod.name}`, - pod, - ConfirmationTargets.POD, - ConfirmationButtons.DELETE_CANCEL - ); - this.deletionDialogService.openComfirmDialog(deletionMessage); - } - - enterContainer(pod: Pod): void { - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app` + - `/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } - - podLog(pod: Pod): void { - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + - `/${appId}/job/${this.job.metadata.name}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } -} - - diff --git a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.scss b/src/frontend/src/app/portal/cronjob/list-pod/list-pod.scss deleted file mode 100644 index a24ab310f..000000000 --- a/src/frontend/src/app/portal/cronjob/list-pod/list-pod.scss +++ /dev/null @@ -1,14 +0,0 @@ -.form-group-label-override { - font-size: 14px; - font-weight: 400; -} - -.access-level-label { - font-size: 14px; - font-weight: 400; - margin-left: -4px; - margin-right: 12px; - top: -6px; - position: relative; -} - diff --git a/src/frontend/src/app/portal/daemonset/daemonset.module.ts b/src/frontend/src/app/portal/daemonset/daemonset.module.ts index 82195de79..0796a8318 100644 --- a/src/frontend/src/app/portal/daemonset/daemonset.module.ts +++ b/src/frontend/src/app/portal/daemonset/daemonset.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { ReactiveFormsModule } from '@angular/forms'; import { ListEventComponent } from './list-event/list-event.component'; -import { ListPodComponent } from './list-pod/list-pod.component'; import { PodClient } from '../../shared/client/v1/kubernetes/pod'; import { ClusterService } from '../../shared/client/v1/cluster.service'; import { PublicService } from '../../shared/client/v1/public.service'; @@ -41,7 +40,6 @@ import { DaemonSetComponent } from './daemonset.component'; ListDaemonSetComponent, PublishDaemonSetTplComponent, ListEventComponent, - ListPodComponent, CreateEditDaemonSetTplComponent ] diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html index 8cf6b9585..4b542ac82 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.html @@ -108,5 +108,5 @@ - + diff --git a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts index 42620f494..647fa4c63 100644 --- a/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts +++ b/src/frontend/src/app/portal/daemonset/list-daemonset/list-daemonset.component.ts @@ -13,7 +13,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { Subscription } from 'rxjs/Subscription'; import { PublishDaemonSetTplComponent } from '../publish-tpl/publish-tpl.component'; import { ListEventComponent } from '../list-event/list-event.component'; -import { ListPodComponent } from '../list-pod/list-pod.component'; +import { ListPodComponent } from '../../../shared/list-pod/list-pod.component'; import { TplDetailService } from '../../../shared/tpl-detail/tpl-detail.service'; import { AuthService } from '../../../shared/auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts b/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts deleted file mode 100644 index 01b4944c4..000000000 --- a/src/frontend/src/app/portal/daemonset/list-pod/inventory.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ClrDatagridComparatorInterface } from '@clr/angular'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; - -export class Inventory { - public size = 10; - private _all: Pod[]; - - get all(): Pod[] { - return this._all.slice(); - } - - reset(events: Pod[]) { - this._all = events; - } -} - -export class TimeComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); - } -} - -export class StateComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return a.state.localeCompare(b.state); - } -} diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.html b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.html deleted file mode 100644 index 8aa7bacb8..000000000 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.html +++ /dev/null @@ -1,73 +0,0 @@ - -

- {{'POD.LIST' | translate}} -

-
-
-
- - -
- - {{'MESSAGE.NO_MESSAGE' | translate}} - - - {{'TITLE.NAME' | translate}} - - - - - {{'TITLE.STATUS' | translate}} - - - - - {{'POD.NAME' | translate}} - - - - - PODIP - - - - - {{'POD.RESTART_NUM' | translate}} - - - - - Age - - - - - {{'TITLE.ACTION' | translate}} - - - - {{pod.name}} - - {{pod.state}} - - {{pod.nodeName}} - {{pod.podIp}} - - {{state.name}} - :{{state.restartCount}} - - - {{pod.startTime | relativeTime}} - - - - - - - - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} of {{pagination.totalItems}} - - - -
- diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts deleted file mode 100644 index ea8fb4f00..000000000 --- a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.component.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import 'rxjs/add/observable/combineLatest'; -import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { ClrDatagridSortOrder } from '@clr/angular'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; -import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; -import { PublicService } from '../../../shared/client/v1/public.service'; -import { CacheService } from '../../../shared/auth/cache.service'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; -import { DOCUMENT } from '@angular/common'; -import { ActivatedRoute, Router } from '@angular/router'; -import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { Subscription } from 'rxjs/Subscription'; -import { ClusterService } from '../../../shared/client/v1/cluster.service'; -import { Cluster } from '../../../shared/model/v1/cluster'; - -@Component({ - selector: 'list-pod', - providers: [Inventory], - templateUrl: 'list-pod.component.html', - styleUrls: ['list-pod.scss'] -}) - -export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing = false; - isSubmitOnGoing = false; - modalOpened: boolean; - pods: Pod[]; - sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; - sorted = false; - timeComparator = new TimeComparator(); - stateComparator = new StateComparator(); - currentCluster: string; - daemonSet: string; - logSource: string; - timer: any; - whetherHotReflash = true; - - subscription: Subscription; - - get appId(): number { - return parseInt(this.route.parent.snapshot.params['id'], 10); - } - - constructor(private inventory: Inventory, - private router: Router, - private deletionDialogService: ConfirmationDialogService, - private route: ActivatedRoute, - @Inject(DOCUMENT) private document: any, - public cacheService: CacheService, - private publicService: PublicService, - private clusterService: ClusterService, - private messageHandlerService: MessageHandlerService, - private podClient: PodClient) { - this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { - if (message && - message.state === ConfirmationState.CONFIRMED && - message.source === ConfirmationTargets.POD) { - const pod: Pod = message.data; - this.podClient - .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) - .subscribe( - response => { - this.refresh(); - this.messageHandlerService.showSuccess('实例删除成功！'); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - }); - } - - ngOnDestroy(): void { - this.subscription.unsubscribe(); - clearInterval(this.timer); - } - - openModal(cluster: string, daemonSet: string) { - this.currentCluster = cluster; - this.daemonSet = daemonSet; - this.pods = null; - this.modalOpened = true; - this.whetherHotReflash = true; - this.clusterService.getByName(this.currentCluster).subscribe( - response => { - const data: Cluster = response.data; - if (data.metaData) { - const metaData = JSON.parse(data.metaData); - if (metaData.logSource) { - this.logSource = metaData.logSource; - } - } - this.keepUpdate(); - this.refresh(); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - - closeModal() { - this.modalOpened = false; - clearInterval(this.timer); - } - - ngOnInit(): void { - } - - keepUpdate() { - if (this.timer) { - clearInterval(this.timer); - } - this.timer = setInterval(() => { - if (!this.modalOpened) { - clearInterval(this.timer); - return; - } - if (this.whetherHotReflash) { this.refresh(); } - }, 5000); - } - - refresh() { - this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, 'daemonSet', this.daemonSet).subscribe( - response => { - const pods = response.data; - this.inventory.size = pods.length; - this.inventory.reset(pods); - this.pods = this.inventory.all; - }, - error => { - this.pods = null; - this.messageHandlerService.handleError(error); - } - ); - } - - deletePod(pod: Pod) { - const deletionMessage = new ConfirmationMessage( - '删除实例确认', - `是否确认删除实例 ${pod.name}`, - pod, - ConfirmationTargets.POD, - ConfirmationButtons.DELETE_CANCEL - ); - this.deletionDialogService.openComfirmDialog(deletionMessage); - } - - - enterContainer(pod: Pod): void { - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app` + - `/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } - - - podLog(pod: Pod): void { - - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + - `/${appId}/daemonSet/${this.daemonSet}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } -} - - diff --git a/src/frontend/src/app/portal/deployment/deployment.module.ts b/src/frontend/src/app/portal/deployment/deployment.module.ts index 8b18cec0b..130563d4f 100644 --- a/src/frontend/src/app/portal/deployment/deployment.module.ts +++ b/src/frontend/src/app/portal/deployment/deployment.module.ts @@ -7,7 +7,6 @@ import { ReactiveFormsModule } from '@angular/forms'; import { CreateEditDeploymentTplComponent } from './create-edit-deploymenttpl/create-edit-deploymenttpl.component'; import { PublishDeploymentTplComponent } from './publish-tpl/publish-tpl.component'; import { ListEventComponent } from './list-event/list-event.component'; -import { ListPodComponent } from './list-pod/list-pod.component'; import { DeploymentClient } from '../../shared/client/v1/kubernetes/deployment'; import { PodClient } from '../../shared/client/v1/kubernetes/pod'; import { DeploymentService } from '../../shared/client/v1/deployment.service'; @@ -41,8 +40,7 @@ import { LogClient } from '../../shared/client/v1/kubernetes/log'; ListDeploymentComponent, CreateEditDeploymentTplComponent, PublishDeploymentTplComponent, - ListEventComponent, - ListPodComponent + ListEventComponent ] }) diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html index e3663615e..411ac45d6 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.html @@ -108,7 +108,7 @@ - + diff --git a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts index dbb50f65f..a974b64e6 100644 --- a/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts +++ b/src/frontend/src/app/portal/deployment/list-deployment/list-deployment.component.ts @@ -13,7 +13,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { Subscription } from 'rxjs/Subscription'; import { PublishDeploymentTplComponent } from '../publish-tpl/publish-tpl.component'; import { ListEventComponent } from '../list-event/list-event.component'; -import { ListPodComponent } from '../list-pod/list-pod.component'; +import { ListPodComponent } from '../../../shared/list-pod/list-pod.component'; import { DeploymentStatus, DeploymentTpl, Event } from '../../../shared/model/v1/deploymenttpl'; import { DeploymentService } from '../../../shared/client/v1/deployment.service'; import { DeploymentTplService } from '../../../shared/client/v1/deploymenttpl.service'; diff --git a/src/frontend/src/app/portal/deployment/list-pod/inventory.ts b/src/frontend/src/app/portal/deployment/list-pod/inventory.ts deleted file mode 100644 index 01b4944c4..000000000 --- a/src/frontend/src/app/portal/deployment/list-pod/inventory.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ClrDatagridComparatorInterface } from '@clr/angular'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; - -export class Inventory { - public size = 10; - private _all: Pod[]; - - get all(): Pod[] { - return this._all.slice(); - } - - reset(events: Pod[]) { - this._all = events; - } -} - -export class TimeComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); - } -} - -export class StateComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return a.state.localeCompare(b.state); - } -} diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.scss b/src/frontend/src/app/portal/deployment/list-pod/list-pod.scss deleted file mode 100644 index 7956f623e..000000000 --- a/src/frontend/src/app/portal/deployment/list-pod/list-pod.scss +++ /dev/null @@ -1,18 +0,0 @@ -.form-group-label-override { - font-size: 14px; - font-weight: 400; -} - -.access-level-label { - font-size: 14px; - font-weight: 400; - margin-left: -4px; - margin-right: 12px; - top: -6px; - position: relative; -} - -.toggle-switch { - padding-left: 15px; - font-size: 16px; -} diff --git a/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts b/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts deleted file mode 100644 index 01b4944c4..000000000 --- a/src/frontend/src/app/portal/statefulset/list-pod/inventory.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ClrDatagridComparatorInterface } from '@clr/angular'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; - -export class Inventory { - public size = 10; - private _all: Pod[]; - - get all(): Pod[] { - return this._all.slice(); - } - - reset(events: Pod[]) { - this._all = events; - } -} - -export class TimeComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return new Date(a.startTime).getTime() - new Date(b.startTime).getTime(); - } -} - -export class StateComparator implements ClrDatagridComparatorInterface { - compare(a: Pod, b: Pod) { - return a.state.localeCompare(b.state); - } -} diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.html b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.html deleted file mode 100644 index 93cf68597..000000000 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.html +++ /dev/null @@ -1,73 +0,0 @@ - -

- {{'POD.LIST' | translate}} -

-
-
-
- - -
- - {{'MESSAGE.NO_MESSAGE' | translate}} - - - {{'TITLE.NAME' | translate}} - - - - - {{'TITLE.STATUS' | translate}} - - - - - PODIP - - - - - NodeName - - - - - {{'POD.RESTART_NUM' | translate}} - - - - - Age - - - - - {{'TITLE.ACTION' | translate}} - - - - {{pod.name}} - - {{pod.state}} - - {{pod.podIp}} - {{pod.nodeName}} - - {{state.name}} - :{{state.restartCount}} - - - {{pod.startTime | relativeTime}} - - - - - - - - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} of {{pagination.totalItems}} - - - -
- diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts deleted file mode 100644 index 4fa47ef43..000000000 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.component.ts +++ /dev/null @@ -1,175 +0,0 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import 'rxjs/add/observable/combineLatest'; -import { Inventory, StateComparator, TimeComparator } from './inventory'; -import { ClrDatagridSortOrder } from '@clr/angular'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; -import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; -import { PublicService } from '../../../shared/client/v1/public.service'; -import { CacheService } from '../../../shared/auth/cache.service'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; -import { DOCUMENT } from '@angular/common'; -import { ActivatedRoute, Router } from '@angular/router'; -import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { Subscription } from 'rxjs/Subscription'; -import { ClusterService } from '../../../shared/client/v1/cluster.service'; -import { Cluster } from '../../../shared/model/v1/cluster'; -import { AuthService } from '../../../shared/auth/auth.service'; - -@Component({ - selector: 'list-pod', - providers: [Inventory], - templateUrl: 'list-pod.component.html', - styleUrls: ['list-pod.scss'] -}) - -export class ListPodComponent implements OnInit, OnDestroy { - checkOnGoing = false; - isSubmitOnGoing = false; - modalOpened: boolean; - pods: Pod[]; - sortOrder: ClrDatagridSortOrder = ClrDatagridSortOrder.UNSORTED; - sorted = false; - timeComparator = new TimeComparator(); - stateComparator = new StateComparator(); - currentCluster: string; - statefulset: string; - logSource: string; - timer: any; - whetherHotReflash = true; - - subscription: Subscription; - - get appId(): number { - return parseInt(this.route.parent.snapshot.params['id'], 10); - } - - constructor(private inventory: Inventory, - private router: Router, - private deletionDialogService: ConfirmationDialogService, - private route: ActivatedRoute, - @Inject(DOCUMENT) private document: any, - public cacheService: CacheService, - private publicService: PublicService, - private clusterService: ClusterService, - private messageHandlerService: MessageHandlerService, - private podClient: PodClient, - public authService: AuthService) { - this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { - if (message && - message.state === ConfirmationState.CONFIRMED && - message.source === ConfirmationTargets.POD) { - const pod: Pod = message.data; - this.podClient - .deleteByName(this.appId, this.currentCluster, pod.namespace, pod.name) - .subscribe( - response => { - this.refresh(); - this.messageHandlerService.showSuccess('实例删除成功！'); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - }); - } - - ngOnDestroy(): void { - this.subscription.unsubscribe(); - clearInterval(this.timer); - } - - openModal(cluster: string, statefulset: string) { - this.currentCluster = cluster; - this.statefulset = statefulset; - this.pods = null; - this.modalOpened = true; - this.whetherHotReflash = true; - this.clusterService.getByName(this.currentCluster).subscribe( - response => { - const data: Cluster = response.data; - if (data.metaData) { - const metaData = JSON.parse(data.metaData); - if (metaData.logSource) { - this.logSource = metaData.logSource; - } - } - this.keepUpdate(); - this.refresh(); - }, - error => { - this.messageHandlerService.handleError(error); - } - ); - } - - closeModal() { - this.modalOpened = false; - clearInterval(this.timer); - } - - ngOnInit(): void { - } - - keepUpdate() { - if (this.timer) { - clearInterval(this.timer); - } - this.timer = setInterval(() => { - if (!this.modalOpened) { - clearInterval(this.timer); - return; - } - if (this.whetherHotReflash) { this.refresh(); } - }, 5000); - } - - refresh() { - this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, - 'statefulset', this.statefulset).subscribe( - response => { - const pods = response.data; - this.inventory.size = pods.length; - this.inventory.reset(pods); - this.pods = this.inventory.all; - }, - error => { - this.pods = null; - this.messageHandlerService.handleError(error); - } - ); - } - - deletePod(pod: Pod) { - const deletionMessage = new ConfirmationMessage( - '删除实例确认', - `是否确认删除实例 ${pod.name}`, - pod, - ConfirmationTargets.POD, - ConfirmationButtons.DELETE_CANCEL - ); - this.deletionDialogService.openComfirmDialog(deletionMessage); - } - - - enterContainer(pod: Pod): void { - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/statefulset` + - `/${this.statefulset}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } - - - podLog(pod: Pod): void { - const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app` + - `/${appId}/statefulset/${this.statefulset}/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; - window.open(url, '_blank'); - } -} - - diff --git a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.scss b/src/frontend/src/app/portal/statefulset/list-pod/list-pod.scss deleted file mode 100644 index 7956f623e..000000000 --- a/src/frontend/src/app/portal/statefulset/list-pod/list-pod.scss +++ /dev/null @@ -1,18 +0,0 @@ -.form-group-label-override { - font-size: 14px; - font-weight: 400; -} - -.access-level-label { - font-size: 14px; - font-weight: 400; - margin-left: -4px; - margin-right: 12px; - top: -6px; - position: relative; -} - -.toggle-switch { - padding-left: 15px; - font-size: 16px; -} diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html index 35a1cf2be..122b65bbe 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.html @@ -107,5 +107,5 @@ - + diff --git a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts index 702d78bd4..6adde6892 100644 --- a/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts +++ b/src/frontend/src/app/portal/statefulset/list-statefulset/list-statefulset.component.ts @@ -13,7 +13,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { Subscription } from 'rxjs/Subscription'; import { PublishStatefulsetTplComponent } from '../publish-tpl/publish-tpl.component'; import { ListEventComponent } from '../list-event/list-event.component'; -import { ListPodComponent } from '../list-pod/list-pod.component'; +import { ListPodComponent } from '../../../shared/list-pod/list-pod.component'; import { TplDetailService } from '../../../shared/tpl-detail/tpl-detail.service'; import { AuthService } from '../../../shared/auth/auth.service'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/src/frontend/src/app/portal/statefulset/statefulset.module.ts b/src/frontend/src/app/portal/statefulset/statefulset.module.ts index 4631e694a..020d45db1 100644 --- a/src/frontend/src/app/portal/statefulset/statefulset.module.ts +++ b/src/frontend/src/app/portal/statefulset/statefulset.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { ReactiveFormsModule } from '@angular/forms'; import { ListEventComponent } from './list-event/list-event.component'; -import { ListPodComponent } from './list-pod/list-pod.component'; import { PodClient } from '../../shared/client/v1/kubernetes/pod'; import { ClusterService } from '../../shared/client/v1/cluster.service'; import { PublicService } from '../../shared/client/v1/public.service'; @@ -41,7 +40,6 @@ import { CreateEditStatefulsettplComponent } from './create-edit-statefulsettpl/ ListStatefulsetComponent, PublishStatefulsetTplComponent, ListEventComponent, - ListPodComponent, CreateEditStatefulsettplComponent ] diff --git a/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts b/src/frontend/src/app/shared/list-pod/inventory.ts similarity index 90% rename from src/frontend/src/app/portal/cronjob/list-pod/inventory.ts rename to src/frontend/src/app/shared/list-pod/inventory.ts index 01b4944c4..9cf656e5a 100644 --- a/src/frontend/src/app/portal/cronjob/list-pod/inventory.ts +++ b/src/frontend/src/app/shared/list-pod/inventory.ts @@ -1,5 +1,5 @@ import { ClrDatagridComparatorInterface } from '@clr/angular'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; +import { Pod } from '../model/v1/kubernetes/pod'; export class Inventory { public size = 10; diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.html b/src/frontend/src/app/shared/list-pod/list-pod.component.html similarity index 100% rename from src/frontend/src/app/portal/deployment/list-pod/list-pod.component.html rename to src/frontend/src/app/shared/list-pod/list-pod.component.html diff --git a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts b/src/frontend/src/app/shared/list-pod/list-pod.component.ts similarity index 79% rename from src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts rename to src/frontend/src/app/shared/list-pod/list-pod.component.ts index e3fc67026..ce517baef 100644 --- a/src/frontend/src/app/portal/deployment/list-pod/list-pod.component.ts +++ b/src/frontend/src/app/shared/list-pod/list-pod.component.ts @@ -1,24 +1,24 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { Component, Inject, Input, OnDestroy } from '@angular/core'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/combineLatest'; import { Inventory, StateComparator, TimeComparator } from './inventory'; import { ClrDatagridSortOrder } from '@clr/angular'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { Pod } from '../../../shared/model/v1/kubernetes/pod'; -import { PodClient } from '../../../shared/client/v1/kubernetes/pod'; -import { PublicService } from '../../../shared/client/v1/public.service'; -import { CacheService } from '../../../shared/auth/cache.service'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; +import { MessageHandlerService } from '../message-handler/message-handler.service'; +import { Pod } from '../model/v1/kubernetes/pod'; +import { PodClient } from '../client/v1/kubernetes/pod'; +import { PublicService } from '../client/v1/public.service'; +import { CacheService } from '../auth/cache.service'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../shared.const'; import { DOCUMENT } from '@angular/common'; import { ActivatedRoute, Router } from '@angular/router'; -import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ConfirmationMessage } from '../confirmation-dialog/confirmation-message'; +import { ConfirmationDialogService } from '../confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; -import { ClusterService } from '../../../shared/client/v1/cluster.service'; -import { Cluster } from '../../../shared/model/v1/cluster'; -import { CopyService } from '../../../shared/client/v1/copy.service'; -import { AuthService } from '../../../shared/auth/auth.service'; +import { ClusterService } from '../client/v1/cluster.service'; +import { Cluster } from '../model/v1/cluster'; +import { CopyService } from '../client/v1/copy.service'; +import { AuthService } from '../auth/auth.service'; @Component({ selector: 'list-pod', @@ -27,7 +27,8 @@ import { AuthService } from '../../../shared/auth/auth.service'; styleUrls: ['list-pod.scss'] }) -export class ListPodComponent implements OnInit, OnDestroy { +export class ListPodComponent implements OnDestroy { + @Input() Type: string; checkOnGoing = false; isSubmitOnGoing = false; modalOpened: boolean; @@ -116,9 +117,6 @@ export class ListPodComponent implements OnInit, OnDestroy { clearInterval(this.timer); } - ngOnInit(): void { - } - keepUpdate() { if (this.timer) { clearInterval(this.timer); @@ -132,7 +130,7 @@ export class ListPodComponent implements OnInit, OnDestroy { } refresh() { - this.podClient.list(this.appId, this.currentCluster, this.cacheService.kubeNamespace, this.deployment).subscribe( + this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, this.Type, this.deployment).subscribe( response => { const pods = response.data; this.inventory.size = pods.length; @@ -160,7 +158,7 @@ export class ListPodComponent implements OnInit, OnDestroy { enterContainer(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment` + + const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/${this.Type}` + `/${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } @@ -176,7 +174,7 @@ export class ListPodComponent implements OnInit, OnDestroy { if (this.logSource === undefined) { this.messageHandlerService.showInfo('缺少机房信息，请联系管理员'); } - const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --deployment ${this.deployment} ` + + const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --${this.Type} ${this.deployment} ` + `--pod=${pod.name} --layout=log`; this.copyService.copy(kubeToolCmd); this.switchCopyButton(); @@ -185,7 +183,7 @@ export class ListPodComponent implements OnInit, OnDestroy { podLog(pod: Pod): void { const appId = this.route.parent.snapshot.params['id']; - const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/deployment/${this.deployment}` + + const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/${this.Type}/${this.deployment}` + `/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`; window.open(url, '_blank'); } diff --git a/src/frontend/src/app/portal/daemonset/list-pod/list-pod.scss b/src/frontend/src/app/shared/list-pod/list-pod.scss similarity index 100% rename from src/frontend/src/app/portal/daemonset/list-pod/list-pod.scss rename to src/frontend/src/app/shared/list-pod/list-pod.scss diff --git a/src/frontend/src/app/shared/shared.module.ts b/src/frontend/src/app/shared/shared.module.ts index a7bd80efd..dc8d136cd 100644 --- a/src/frontend/src/app/shared/shared.module.ts +++ b/src/frontend/src/app/shared/shared.module.ts @@ -50,6 +50,7 @@ import { DiffComponent } from './diff/diff.component'; import { DiffService } from './diff/diff.service'; import { ResourceLimitModule } from './component/resource-limit/resource-limit.module'; import { EchartsModule } from './echarts/echars.module'; +import { ListPodComponent } from './list-pod/list-pod.component'; @NgModule({ imports: [ @@ -91,7 +92,8 @@ import { EchartsModule } from './echarts/echars.module'; DropDownComponent, DropdownItemComponent, RelativeTimeFilterPipe, - DiffComponent + DiffComponent, + ListPodComponent ], exports: [ BrowserAnimationsModule, @@ -129,7 +131,8 @@ import { EchartsModule } from './echarts/echars.module'; DropdownItemComponent, RelativeTimeFilterPipe, TranslateModule, - DiffComponent + DiffComponent, + ListPodComponent ], providers: [ TipService, From b3ab72b873234e272e3b846ddd5c6d8c1ebe9351 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 15:08:58 +0800 Subject: [PATCH 099/112] frontend: fix container terminal error --- src/frontend/package-lock.json | 6 +++--- src/frontend/package.json | 2 +- .../portal/pod-terminal/pod-terminal.component.ts | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 541788a56..cca1f1bb6 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -11732,9 +11732,9 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "xterm": { - "version": "3.10.1", - "resolved": "http://registry.npm.taobao.org/xterm/download/xterm-3.10.1.tgz", - "integrity": "sha1-FKzPkncuWmco8xejwgm6cUtzyLU=" + "version": "3.11.0", + "resolved": "http://registry.npm.taobao.org/xterm/download/xterm-3.11.0.tgz", + "integrity": "sha1-LBDaPpZduRcEMKp7aPiWXeP/AE0=" }, "y18n": { "version": "4.0.0", diff --git a/src/frontend/package.json b/src/frontend/package.json index 6b47f8476..5d9abcc82 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -49,7 +49,7 @@ "rxjs-compat": "^6.2.1", "sockjs-client": "^1.1.4", "tslib": "^1.9.0", - "xterm": "^3.2.0", + "xterm": "^3.11.0", "zone.js": "^0.8.29" }, "devDependencies": { diff --git a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts index d517ceffd..90d6d7db2 100644 --- a/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts +++ b/src/frontend/src/app/portal/pod-terminal/pod-terminal.component.ts @@ -56,7 +56,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { const pod = this.getPodByName(podName); if (!pod) { const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}` + - `/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; + `/${this.resourceName}/pod/${this.pods[0].name}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } this.selectedPod = pod; @@ -84,7 +84,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { containerChange() { const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}` + - `/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + `/${this.resourceName}/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -105,7 +105,7 @@ export class PodTerminalComponent implements OnInit, OnDestroy { this.containers = this.selectedPod.containerStatus; this.selectedContainer = this.containers[0].name; const url = `portal/namespace/${this.nid}/app/${this.appId}/${this.resourceType}/${this.resourceName}` + - `/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; + `/pod/${this.selectedPod.name}/container/${this.selectedContainer}/terminal/${this.cluster}/${this.namespace}`; this.router.navigateByUrl(url); } @@ -157,9 +157,9 @@ export class PodTerminalComponent implements OnInit, OnDestroy { onTerminalResize() { const width = this.terminal.nativeElement.parentElement.clientWidth; const height = this.terminal.nativeElement.parentElement.clientHeight; - const xterm = Terminal.apply(this.xterm); - const cols = (width - xterm.viewport.scrollBarWidth - 15) / xterm.renderer.dimensions.actualCellWidth; - const rows = height / xterm.renderer.dimensions.actualCellHeight; + const xterm: any = this.xterm; + const cols = (width - xterm._core.viewport.scrollBarWidth - 15) / xterm._core.renderer.dimensions.actualCellWidth; + const rows = height / xterm._core.renderer.dimensions.actualCellHeight; this.xterm.resize(parseInt(cols.toString(), 10), parseInt(rows.toString(), 10)); } From 80bf604bbcf64fb3e05ac16d8a82de803632bd43 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 16:07:22 +0800 Subject: [PATCH 100/112] frontend: hpa name selectable --- .../create-edit-autoscaletpl.component.html | 10 +++--- .../create-edit-autoscaletpl.component.ts | 31 +++++++++++-------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html index 287bf9581..de78e288e 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html @@ -21,7 +21,7 @@

{{'HPA.CREATE_TEMPLATE' | translate}}

@@ -29,9 +29,11 @@

{{'HPA.CREATE_TEMPLATE' | translate}}

diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts index 1c66974b7..da07044cd 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.ts @@ -13,6 +13,8 @@ import { AceEditorService } from '../../../shared/ace-editor/ace-editor.service' import { AutoscaleTplService } from '../../../shared/client/v1/autoscaletpl.service'; import { AutoscaleService } from '../../../shared/client/v1/autoscale.service'; import { AutoscaleTpl } from '../../../shared/model/v1/autoscaletpl'; +import { DeploymentService } from '../../../shared/client/v1/deployment.service'; +import { Deployment } from '../../../shared/model/v1/deployment'; @Component({ selector: 'wayne-create-edit-autoscaletpl', @@ -22,18 +24,19 @@ import { AutoscaleTpl } from '../../../shared/model/v1/autoscaletpl'; export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplate implements OnInit { actionType: ActionType; + deploys: Deployment[]; constructor(private autoscaleTplService: AutoscaleTplService, - private autoscaleService: AutoscaleService, - public location: Location, - public router: Router, - public appService: AppService, - public route: ActivatedRoute, - public authService: AuthService, - public cacheService: CacheService, - public aceEditorService: AceEditorService, - public messageHandlerService: MessageHandlerService -) { + private autoscaleService: AutoscaleService, + public location: Location, + public router: Router, + public deploymentService: DeploymentService, + public appService: AppService, + public route: ActivatedRoute, + public authService: AuthService, + public cacheService: CacheService, + public aceEditorService: AceEditorService, + public messageHandlerService: MessageHandlerService) { super( autoscaleTplService, autoscaleService, @@ -60,6 +63,7 @@ export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplate const observables = Array( this.appService.getById(appId, namespaceId), this.autoscaleService.getById(hpaId, appId), + this.deploymentService.getNames(appId), ); if (tplId) { this.actionType = ActionType.EDIT; @@ -71,14 +75,15 @@ export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplate response => { this.app = response[0].data; this.resource = response[1].data; - const tpl = response[2]; + this.deploys = response[2].data; + const tpl = response[3]; if (tpl) { this.template = tpl.data; this.template.description = null; this.saveResourceTemplate(JSON.parse(this.template.template)); } }, - error => { + error => { this.messageHandlerService.handleError(error); } ); @@ -88,7 +93,7 @@ export class CreateEditAutoscaletplComponent extends CreateEditResourceTemplate if (super.isValidResource() === false) { return false; } - if (this.kubeResource.spec.minReplicas > this.kubeResource.spec.maxReplicas) { + if (this.kubeResource.spec.minReplicas > this.kubeResource.spec.maxReplicas) { return false; } if (this.kubeResource.spec.targetCPUUtilizationPercentage <= 0) { From 18e92babb0f2326e799a00656a5da3969b6c2319 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Thu, 14 Feb 2019 16:12:09 +0800 Subject: [PATCH 101/112] frontend:Different resource states by label of different colors --- .../src/app/shared/list-pod/list-pod.component.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/app/shared/list-pod/list-pod.component.html b/src/frontend/src/app/shared/list-pod/list-pod.component.html index ff7834ee4..935ff9a50 100644 --- a/src/frontend/src/app/shared/list-pod/list-pod.component.html +++ b/src/frontend/src/app/shared/list-pod/list-pod.component.html @@ -48,13 +48,20 @@

{{pod.name}} - {{pod.state}} + {{pod.state}} {{pod.podIp}} {{pod.nodeName}} - {{state.name}} - :{{state.restartCount}} + + {{state.name}} : {{state.restartCount}} {{pod.startTime | relativeTime}} From 2228eed7fa1dccac446a5049dc3590c682fe6d4c Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 17:19:29 +0800 Subject: [PATCH 102/112] frontend: ingress name selectable --- src/frontend/lib | 2 +- .../create-edit-ingresstpl.component.html | 30 ++++++++++++------- .../create-edit-ingresstpl.component.ts | 21 ++++++++++--- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/frontend/lib b/src/frontend/lib index 07737302e..3cf5fe7e3 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 07737302ef25c36206a1868e4047a536de2c6ac7 +Subproject commit 3cf5fe7e3b5a92fc21fc506b3c1c10f51ab308f0 diff --git a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html index 28256ba9c..3f753e2b9 100644 --- a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html +++ b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html @@ -15,7 +15,7 @@

创建 Ingress 模版

-
+
@@ -31,7 +31,12 @@

创建 Ingress 模版

- + + {{svc.name}} + + @@ -44,7 +49,7 @@

创建 Ingress 模版

-
+
@@ -52,19 +57,24 @@

创建 Ingress 模版

- - + + + {{secret.name}} +
-
- - - -
+
+
+ + + +
diff --git a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts index 5e99781a0..c626c9289 100644 --- a/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts +++ b/src/frontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts @@ -15,7 +15,10 @@ import { IngressService } from '../../../shared/client/v1/ingress.service'; import { IngressTplService } from '../../../shared/client/v1/ingresstpl.service'; import { AuthService } from '../../../shared/auth/auth.service'; import { CreateEditResourceTemplate } from '../../../shared/base/resource/create-edit-resource-template'; -import { KubeIngress, IngressRule, IngressPath } from '../../../shared/model/v1/kubernetes/ingress'; +import { ServiceService } from '../../../../../lib/shared/client/v1/service.service'; +import { Service } from '../../../../../lib/shared/model/service'; +import { SecretService } from '../../../shared/client/v1/secret.service'; +import { Secret } from '../../../shared/model/v1/secret'; @Component({ @@ -25,10 +28,13 @@ import { KubeIngress, IngressRule, IngressPath } from '../../../shared/model/v1/ }) export class CreateEditIngressTplComponent extends CreateEditResourceTemplate implements OnInit { actionType: ActionType; - + svcs: Service[]; + secrets: Secret[]; constructor(private ingressTplService: IngressTplService, private ingressService: IngressService, + private serviceService: ServiceService, + private secretService: SecretService, public location: Location, public router: Router, public appService: AppService, @@ -65,6 +71,8 @@ export class CreateEditIngressTplComponent extends CreateEditResourceTemplate im const observables = Array( this.appService.getById(appId, namespaceId), this.ingressService.getById(ingressId, appId), + this.serviceService.getNames(appId), + this.secretService.getNames(appId) ); if (tplId) { this.actionType = ActionType.EDIT; @@ -76,7 +84,9 @@ export class CreateEditIngressTplComponent extends CreateEditResourceTemplate im response => { this.app = response[0].data; this.resource = response[1].data; - const tpl = response[2]; + this.svcs = response[2].data; + this.secrets = response[3].data; + const tpl = response[4]; if (tpl) { this.template = tpl.data; this.template.description = null; @@ -150,14 +160,17 @@ export class CreateEditIngressTplComponent extends CreateEditResourceTemplate im } onAddPath(idx: number) { - this.kubeResource.spec.rules[idx].http.paths.push({ backend: { serviceName: '', servicePort: 80}, path: '/'}); + this.kubeResource.spec.rules[idx].http.paths.push({backend: {serviceName: '', servicePort: 80}, path: '/'}); } + onDeletePath(i: number, j: number) { this.kubeResource.spec.rules[i].http.paths.splice(j, 1); } + onAddTLS() { this.kubeResource.spec.tls.push({hosts: [''], secretName: ''}); } + onDeleteTLS(i: number) { this.kubeResource.spec.tls.splice(i, 1); } From 0fa7931361111020ca070ed80bd7f806681f28b9 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 17:49:25 +0800 Subject: [PATCH 103/112] frontend: fix tpl error --- src/frontend/lib | 2 +- .../create-edit-autoscaletpl.component.html | 2 +- .../create-edit-ingresstpl.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/lib b/src/frontend/lib index 3cf5fe7e3..32b5deded 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 3cf5fe7e3b5a92fc21fc506b3c1c10f51ab308f0 +Subproject commit 32b5dededbef8c84a966963b23a32e83b61d2840 diff --git a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html index de78e288e..b073e5bfc 100644 --- a/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html +++ b/src/frontend/src/app/portal/autoscale/create-edit-autoscaletpl/create-edit-autoscaletpl.component.html @@ -29,7 +29,7 @@

{{'HPA.CREATE_TEMPLATE' | translate}}

-
+
From e4a1537b29c9f75be534ef49be7d4b8e24264c6a Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Thu, 14 Feb 2019 18:49:12 +0800 Subject: [PATCH 104/112] frontend: fix pod log container i18 error --- src/frontend/src/assets/i18n/zh-Hans.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/src/assets/i18n/zh-Hans.json b/src/frontend/src/assets/i18n/zh-Hans.json index 0313c36f6..ed2f0aa74 100644 --- a/src/frontend/src/assets/i18n/zh-Hans.json +++ b/src/frontend/src/assets/i18n/zh-Hans.json @@ -431,6 +431,7 @@ "ALL_CONTENT": "所有内容", "AVAIL_ITEM": "可选项", "BELONG_APP": "所属项目", + "CONTAINER": "容器", "CHOOSED_ITEM": "已选项", "CLUSTER": "机房", "COLLECTED": "已收藏", From 5dc4a75074711fd2d9aefd98c5d83f9d0b545fb0 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 15 Feb 2019 11:22:37 +0800 Subject: [PATCH 105/112] fix bad version info --- src/backend/controllers/openapi/openapi.go | 2 +- src/backend/main.go | 2 +- src/frontend/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/controllers/openapi/openapi.go b/src/backend/controllers/openapi/openapi.go index f01a9a943..0a791421e 100644 --- a/src/backend/controllers/openapi/openapi.go +++ b/src/backend/controllers/openapi/openapi.go @@ -14,7 +14,7 @@ // Schemes: https // Host: localhost // BasePath: /openapi/v1/gateway/action -// Version: v1.2.0 +// Version: 1.3.2 // // Consumes: // - application/json diff --git a/src/backend/main.go b/src/backend/main.go index 65569b38c..bd252b6da 100644 --- a/src/backend/main.go +++ b/src/backend/main.go @@ -4,7 +4,7 @@ import ( "github.com/Qihoo360/wayne/src/backend/cmd" ) -const Version = "v1.2.0" +const Version = "1.3.2" func main() { cmd.Version = Version diff --git a/src/frontend/package.json b/src/frontend/package.json index 5d9abcc82..416a3f573 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "v1.2.0", + "version": "1.3.2", "license": "MIT", "scripts": { "ng": "ng", From 873c6f2883ca61e16113f5fb0e25428e0d2ed007 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 15 Feb 2019 11:35:47 +0800 Subject: [PATCH 106/112] Add github_changelog_generator to create changelog --- hack/bump.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hack/bump.sh b/hack/bump.sh index 48dc7e919..31b5e2de7 100755 --- a/hack/bump.sh +++ b/hack/bump.sh @@ -1,6 +1,8 @@ #!/bin/sh # Bump project version - +# 代码版本号格式: x.y.z ,该格式参照的是 https://semver.org/ 标准 +# 版本对应的 tag 格式为 vx.y.z +# 依赖工具 git changelog github_changelog_generator git pull @@ -51,6 +53,10 @@ else fi RELEASE_BRANCH="release/v$V_MAJOR.$V_MINOR" +if [ "$CHANGELOG_GITHUB_TOKEN" = "" ]; then + read -p "Please insert the CHANGELOG_GITHUB_TOKEN environment variable to your 40 digit token: " CHANGELOG_GITHUB_TOKEN +fi + read -p "Change branch to [$RELEASE_BRANCH]? (Y): " CONFIRM0 if [ "$CONFIRM0" = "" ]; then CONFIRM0="Y"; fi if [ "$CONFIRM0" = "y" ]; then CONFIRM0="Y"; fi @@ -79,7 +85,7 @@ if [ "$CONFIRM1" = "Y" ]; then sed -i "s/$VERSION/$NEXT_VERSION/" $GO_MAIN sed -i 's/\("version": "\)'$VERSION'/\1'$NEXT_VERSION'/' $PACKAGE_JSON sed -i 's/\(Version: \)'$VERSION'/\1'$NEXT_VERSION'/' $SWAGGER_VERSION_GO - git changelog --no-merges --tag $NEXT_VERSION $CHANGELOG + github_changelog_generator -u Qihoo360 -p wayne --token $CHANGELOG_GITHUB_TOKEN --unreleased-label=$NEXT_VERSION COMMITLOG=" Release v$NEXT_VERSION From 326b484ce96df255f8364f38a8451d738d9be974 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 15 Feb 2019 14:43:06 +0800 Subject: [PATCH 107/112] frontend: Secret template support set type --- .../create-edit-secrettpl.component.html | 39 ++++++++++++++++++- .../create-edit-secrettpl.component.ts | 4 +- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html index 2da7bad40..dc02c50f3 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html +++ b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html @@ -6,7 +6,8 @@

{{'SECRET.CREATE_TMP' | translate}}

- {{'SECRET.CREATE_EDIT.CLUSTER_MESSAGE' | translate}} + {{'SECRET.CREATE_EDIT.CLUSTER_MESSAGE' | translate}}
@@ -24,6 +25,42 @@

{{'SECRET.CREATE_TMP' | translate}}

required>
+
+ +
+ +
+
diff --git a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts index b756b52d8..76804ace9 100644 --- a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts +++ b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts @@ -120,6 +120,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe disabled = true; } this.currentForm = this.fb.group({ + type: 'Opaque', description: this.secretTpl.description, datas: this.fb.array([ this.fb.group({ @@ -267,7 +268,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe } kubeSecret.kind = 'Secret'; kubeSecret.apiVersion = 'v1'; - kubeSecret.type = 'Opaque'; + kubeSecret.type = formValue.type; kubeSecret.metadata.name = this.secret.name; kubeSecret.metadata.labels = this.buildLabels(kubeSecret.metadata.labels); if (formValue.datas && formValue.datas.length > 0) { @@ -294,6 +295,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe dataValue: Base64.decode(kubeSecret.data[key]), })); }); + this.currentForm.setControl('type', this.fb.control(this.kubeSecret.type)); this.currentForm.setControl('datas', this.fb.array(datas)); } } From 6124aa32d2b2507ce8a380701470bb288d2bfbca Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 15 Feb 2019 15:01:59 +0800 Subject: [PATCH 108/112] frontend: service type support LoadBalancer --- src/frontend/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/lib b/src/frontend/lib index 32b5deded..893fd9e60 160000 --- a/src/frontend/lib +++ b/src/frontend/lib @@ -1 +1 @@ -Subproject commit 32b5dededbef8c84a966963b23a32e83b61d2840 +Subproject commit 893fd9e60175514fcc116258da1707b0bf2ffd77 From d7429637049d4e5828603635f06bdb7af7f6fe17 Mon Sep 17 00:00:00 2001 From: chengyumeng <792400644@qq.com> Date: Fri, 15 Feb 2019 15:35:57 +0800 Subject: [PATCH 109/112] don't exec github_changelog_generator when bump --- hack/bump.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/bump.sh b/hack/bump.sh index 31b5e2de7..3c9f6e041 100755 --- a/hack/bump.sh +++ b/hack/bump.sh @@ -53,9 +53,9 @@ else fi RELEASE_BRANCH="release/v$V_MAJOR.$V_MINOR" -if [ "$CHANGELOG_GITHUB_TOKEN" = "" ]; then - read -p "Please insert the CHANGELOG_GITHUB_TOKEN environment variable to your 40 digit token: " CHANGELOG_GITHUB_TOKEN -fi +#if [ "$CHANGELOG_GITHUB_TOKEN" = "" ]; then +# read -p "Please insert the CHANGELOG_GITHUB_TOKEN environment variable to your 40 digit token: " CHANGELOG_GITHUB_TOKEN +#fi read -p "Change branch to [$RELEASE_BRANCH]? (Y): " CONFIRM0 if [ "$CONFIRM0" = "" ]; then CONFIRM0="Y"; fi @@ -85,7 +85,7 @@ if [ "$CONFIRM1" = "Y" ]; then sed -i "s/$VERSION/$NEXT_VERSION/" $GO_MAIN sed -i 's/\("version": "\)'$VERSION'/\1'$NEXT_VERSION'/' $PACKAGE_JSON sed -i 's/\(Version: \)'$VERSION'/\1'$NEXT_VERSION'/' $SWAGGER_VERSION_GO - github_changelog_generator -u Qihoo360 -p wayne --token $CHANGELOG_GITHUB_TOKEN --unreleased-label=$NEXT_VERSION +# github_changelog_generator -u Qihoo360 -p wayne --token $CHANGELOG_GITHUB_TOKEN --unreleased-label=$NEXT_VERSION COMMITLOG=" Release v$NEXT_VERSION From cc76f809f45ed4164c2046675f1c4393890e4bd7 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 15 Feb 2019 16:10:13 +0800 Subject: [PATCH 110/112] backend: fix pod list create time ref error --- src/backend/resources/pod/pod.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/backend/resources/pod/pod.go b/src/backend/resources/pod/pod.go index 0d7d9ace5..f502e90f1 100644 --- a/src/backend/resources/pod/pod.go +++ b/src/backend/resources/pod/pod.go @@ -177,9 +177,7 @@ func toPod(kpod *v1.Pod) *Pod { State: getPodStatus(kpod), } - if kpod.Status.StartTime != nil { - pod.StartTime = kpod.Status.StartTime.Local() - } + pod.StartTime = kpod.CreationTimestamp.Time status := make([]ContainerStatus, 0) From b69a7a976fe62b49d21224bfcbe99a5d53a19fbe Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 15 Feb 2019 18:08:18 +0800 Subject: [PATCH 111/112] Release v1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * backend: fix pod list create time ref error * don't exec github_changelog_generator when bump * frontend: service type support LoadBalancer * frontend: Secret template support set type * Add github_changelog_generator to create changelog * fix bad version info * frontend: fix pod log container i18 error * frontend: fix tpl error * frontend: ingress name selectable * frontend:Different resource states by label of different colors * frontend: hpa name selectable * frontend: fix container terminal error * frontend:Refine list-pod to share component * frontend: fix normal user edit resource error * frontend: add list-job i18 end_time * frontend: fix robin url new-line character error * frontend: fix url new-line character error * frontend: fix portal configmap get status error * frontend: fix log detail error * frontend: admin add kubernetes secret resource * backend: proxy kubernetes resource list support secret and configmap * Fix get pod info API bug that label should be a key not a map * frontend: fit admin kubernetes pv action button * frontend: admin add kubernetes configmap resource * frontend: rename kubernetes base migration * frontend: admin kubernetes service migration * frontend: admin kubernetes service add view endpoint detail * frontend: admin kubernetes add endpoint * backend: proxy kubernetes resource compatible endpoint * frontend: admin kubernetes service add type column * frontend: admin add kubernetes service * frontend: add force delete pod action * backend: kubernetes resource delete add force option * frontend: add deletion dialog module * frontend: add create pod * frontend: kubernetes pod add i18n * frontend: update kubepod model * frontend: add kubernetes pod resource * frontend: add kubernetes namespaced resource base class * frontend: update confirmation-dialog target int to any * frontend: add kubernetes pod object * frontend: update kubernetes proxy client * backend: kubernetes resource list and get names add sort by name * backend: add kubernetes resource param builder * frontend: service add route link * frontend: remove app idFilterInit var * frontend: update admin route link breadcrumb * frontend: app add route link * frontend: statefulset add route link * frontend: secret add route link * frontend: daemonset add route link * frontend: cronjob add route link * frontend: ingress add route link * frontend: pvc add route link * frontend: configmap add route link * frontend: admin deployment add route link * frontend: remove app route link * frontend: app list add filter param * frontend: fix create hpa error * frontend: move sidenav to wayne repo * frontend: update frontend-plugin * frontend: fix param annot * frontend: change DOCUMENT import way * frontend: add throwError from rxjs * frontend: hpa adapt * frontend: update frontend-plugin * frontend:fix for tslint * frontend: add form scss * frontend: form checkbox adapt * frontend: adapt bootstrap ui * frontend: ui fix * frontend:fix create HPA bug * frontend:update frontend lib * frontend:Add i18n for HPA * frontend: paginate fix * frontend:Add frontend page of HPA Admin Template * frontend:Add backend HPA list * backend:Add HPA get names API * frontend:Add backend resource basic class * frontend: fix combineLaest import * frontend: update webpack && adapter clr/checkbox * frontend: update @cli/angular * i18n: 俩个 应为 两个 * frontend: update augular rxjs * frontend: update angular/cli * frontend:fix error route in jump url * backend:Prevent users from changing default system variables * Upgrade Deployment API can add env * frontend: change variable name * frontend: change json query * frontend: fix i18n json file cache * frontend: backend daemonsettpl i18n * frontend: backend cronjobtpl i18n * frontend: backend cronjob i18n * frontend:fix ingress remove bug in trash * frontend:fix service route bug * frontend:fix ingress route bug * update lib * frontend: update lib * frontend:update lib * backend:update travis and add fronten lint * frontend:fix all tslint error * frontend * should translate DEPLOYMENT_TMP_LIST * frontend:fix const/let etc * frontend:update init flow * frontend:remove //[end] * frontend:update let to const * frontend:remove share/switch * frontend:add {} to if result --- CHANGELOG.md | 46 +++++++++++++++++++++- src/backend/controllers/openapi/openapi.go | 2 +- src/backend/main.go | 2 +- src/frontend/package.json | 2 +- 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fbe1b72d..e94a072d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,51 @@ # Change Log -## [v1.3.1](https://github.com/Qihoo360/wayne/tree/HEAD) +## [v1.4.0](https://github.com/Qihoo360/wayne/tree/v1.4.0) (2019-02-15) +[Full Changelog](https://github.com/Qihoo360/wayne/compare/v1.3.2...v1.4.0) + +**Implemented enhancements:** + +- Name selectable exist name list [\#252](https://github.com/Qihoo360/wayne/issues/252) +- support for updating environment variables is added to the open interface of the upgrade deployment. [\#238](https://github.com/Qihoo360/wayne/issues/238) +- Service type support LoadBalancer [\#276](https://github.com/Qihoo360/wayne/pull/276) ([wilhelmguo](https://github.com/wilhelmguo)) +- Secret template support set type [\#275](https://github.com/Qihoo360/wayne/pull/275) ([wilhelmguo](https://github.com/wilhelmguo)) +- Name selectable [\#271](https://github.com/Qihoo360/wayne/pull/271) ([wilhelmguo](https://github.com/wilhelmguo)) +- Different resource states by label of different colors [\#270](https://github.com/Qihoo360/wayne/pull/270) ([chengyumeng](https://github.com/chengyumeng)) +- Support HPA mangement [\#171](https://github.com/Qihoo360/wayne/issues/171) +- 支持Endpoint [\#146](https://github.com/Qihoo360/wayne/issues/146) +- Support Kubernetes Pod resource management [\#136](https://github.com/Qihoo360/wayne/issues/136) +- Migration Secret from exist kubernetes clusters [\#134](https://github.com/Qihoo360/wayne/issues/134) +- Migration ConfigMap from exist kubernetes clusters [\#133](https://github.com/Qihoo360/wayne/issues/133) +- Migration Service from exist kubernetes clusters [\#132](https://github.com/Qihoo360/wayne/issues/132) +- migration from exist kubernetes clusters [\#68](https://github.com/Qihoo360/wayne/issues/68) +- Add kubernetes secret resource [\#259](https://github.com/Qihoo360/wayne/pull/259) ([wilhelmguo](https://github.com/wilhelmguo)) +- Feature/add kubernetes configmap [\#256](https://github.com/Qihoo360/wayne/pull/256) ([wilhelmguo](https://github.com/wilhelmguo)) +- Add kubernetes service and endpoint resource [\#255](https://github.com/Qihoo360/wayne/pull/255) ([wilhelmguo](https://github.com/wilhelmguo)) +- Feature/add kubernetes pod resource [\#254](https://github.com/Qihoo360/wayne/pull/254) ([wilhelmguo](https://github.com/wilhelmguo)) +- Feature: Add HPA in admin page. [\#247](https://github.com/Qihoo360/wayne/pull/247) ([chengyumeng](https://github.com/chengyumeng)) + +**Fixed bugs:** + +- Wayne Get Pod Info Open API can't be used [\#260](https://github.com/Qihoo360/wayne/issues/260) +- Fix pod list create time ref error [\#278](https://github.com/Qihoo360/wayne/pull/278) ([wilhelmguo](https://github.com/wilhelmguo)) +- Fix pod log container i18 error [\#272](https://github.com/Qihoo360/wayne/pull/272) ([wilhelmguo](https://github.com/wilhelmguo)) +- Fix portal configmap get status error [\#266](https://github.com/Qihoo360/wayne/pull/266) ([wilhelmguo](https://github.com/wilhelmguo)) +- View Pod log error [\#263](https://github.com/Qihoo360/wayne/issues/263) +- When click “进入容器”, can not enter the pod. [\#240](https://github.com/Qihoo360/wayne/issues/240) +- 后台管理的ingress中，回收站里的模板也不能删除和恢复 [\#225](https://github.com/Qihoo360/wayne/issues/225) +- 后台管理中的负载均衡和ingress列表，点击“名称”和“项目”全部跳转404页面? [\#224](https://github.com/Qihoo360/wayne/issues/224) +- Fix log detail error [\#261](https://github.com/Qihoo360/wayne/pull/261) ([wilhelmguo](https://github.com/wilhelmguo)) +- Fix get pod info API bug that label should be a key not a map [\#258](https://github.com/Qihoo360/wayne/pull/258) ([chengyumeng](https://github.com/chengyumeng)) +- frontend:fix error route in jump url [\#239](https://github.com/Qihoo360/wayne/pull/239) ([chengyumeng](https://github.com/chengyumeng)) + +## [v1.3.2](https://github.com/Qihoo360/wayne/tree/v1.3.2) (2019-02-12) +[Full Changelog](https://github.com/Qihoo360/wayne/compare/v1.3.1...v1.3.2) + +**Fixed bugs:** +- Wayne Get Pod Info Open API error [\#260](https://github.com/Qihoo360/wayne/pull/258) ([chengyumeng](https://github.com/chengyumeng)) + +## [v1.3.1](https://github.com/Qihoo360/wayne/tree/v1.3.1) (2019-01-11) [Full Changelog](https://github.com/Qihoo360/wayne/compare/v1.3.0...v1.3.1) **Fixed bugs:** diff --git a/src/backend/controllers/openapi/openapi.go b/src/backend/controllers/openapi/openapi.go index 0a791421e..57c0be641 100644 --- a/src/backend/controllers/openapi/openapi.go +++ b/src/backend/controllers/openapi/openapi.go @@ -14,7 +14,7 @@ // Schemes: https // Host: localhost // BasePath: /openapi/v1/gateway/action -// Version: 1.3.2 +// Version: 1.4.0 // // Consumes: // - application/json diff --git a/src/backend/main.go b/src/backend/main.go index bd252b6da..fdfea2b67 100644 --- a/src/backend/main.go +++ b/src/backend/main.go @@ -4,7 +4,7 @@ import ( "github.com/Qihoo360/wayne/src/backend/cmd" ) -const Version = "1.3.2" +const Version = "1.4.0" func main() { cmd.Version = Version diff --git a/src/frontend/package.json b/src/frontend/package.json index 416a3f573..7a3d17036 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "1.3.2", + "version": "1.4.0", "license": "MIT", "scripts": { "ng": "ng", From 72db278cbf7b8082e39626969ae8cb2c23616d24 Mon Sep 17 00:00:00 2001 From: wilhelmguo Date: Fri, 15 Feb 2019 18:12:37 +0800 Subject: [PATCH 112/112] Release v1.4.0 --- hack/bump.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/hack/bump.sh b/hack/bump.sh index 3c9f6e041..18dcc3e52 100755 --- a/hack/bump.sh +++ b/hack/bump.sh @@ -89,8 +89,6 @@ if [ "$CONFIRM1" = "Y" ]; then COMMITLOG=" Release v$NEXT_VERSION - -$(git changelog -x -n -p -l) " git commit -ae -m "$COMMITLOG"