+
{it.href} : {it.rel}
);
@@ -133,4 +115,4 @@ export class BaseDetail extends Base {
}
}
-export default inject("rootStore")(observer(BaseDetail))
\ No newline at end of file
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/container-service/containers/Capsules/Detail/index.jsx b/src/pages/container-service/containers/Capsules/Detail/index.jsx
index 3fad79a0..457c8707 100644
--- a/src/pages/container-service/containers/Capsules/Detail/index.jsx
+++ b/src/pages/container-service/containers/Capsules/Detail/index.jsx
@@ -14,8 +14,9 @@
import { inject, observer } from 'mobx-react';
import Base from 'containers/TabDetail';
-import BaseDetail from './BaseDetail';
import globalCapsulesStore from 'src/stores/zun/capsules';
+import { capsuleStatus } from 'resources/zun/capsule';
+import BaseDetail from './BaseDetail';
export class CapsulesDetail extends Base {
init() {
@@ -27,7 +28,7 @@ export class CapsulesDetail extends Base {
}
get listUrl() {
- return this.getRoutePath('capsules');
+ return this.getRoutePath('zunCapsules');
}
get policy() {
@@ -38,7 +39,22 @@ export class CapsulesDetail extends Base {
return [
{
title: t('Name'),
- dataIndex: 'name',
+ dataIndex: 'meta_name',
+ },
+ {
+ title: t('Status'),
+ dataIndex: 'status',
+ render: (value) => capsuleStatus[value] || value,
+ },
+ {
+ title: t('Created At'),
+ dataIndex: 'created_at',
+ valueRender: 'toLocalTime',
+ },
+ {
+ title: t('Updated At'),
+ dataIndex: 'updated_at',
+ valueRender: 'toLocalTime',
},
];
}
@@ -54,4 +70,4 @@ export class CapsulesDetail extends Base {
}
}
-export default inject("rootStore")(observer(CapsulesDetail))
\ No newline at end of file
+export default inject('rootStore')(observer(CapsulesDetail));
diff --git a/src/pages/container-service/containers/Capsules/actions/Create.jsx b/src/pages/container-service/containers/Capsules/actions/Create.jsx
index 44fc8663..fe0b1072 100644
--- a/src/pages/container-service/containers/Capsules/actions/Create.jsx
+++ b/src/pages/container-service/containers/Capsules/actions/Create.jsx
@@ -36,7 +36,7 @@ export class Create extends ModalAction {
}
get name() {
- return t('Create Capsules');
+ return t('Create Capsule');
}
static policy = 'container:capsule:create';
@@ -76,4 +76,4 @@ export class Create extends ModalAction {
};
}
-export default inject("rootStore")(observer(Create))
\ No newline at end of file
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/container-service/containers/Capsules/actions/Delete.jsx b/src/pages/container-service/containers/Capsules/actions/Delete.jsx
index bf5019b1..94d3612b 100644
--- a/src/pages/container-service/containers/Capsules/actions/Delete.jsx
+++ b/src/pages/container-service/containers/Capsules/actions/Delete.jsx
@@ -10,21 +10,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { inject, observer } from 'mobx-react';
import { ConfirmAction } from 'containers/Action';
import globalCapsulesStore from 'src/stores/zun/capsules';
-export class DeleteCapsules extends ConfirmAction {
+export default class DeleteCapsule extends ConfirmAction {
get id() {
return 'delete';
}
get title() {
- return t('Delete Capsules');
+ return t('Delete Capsule');
}
get actionName() {
- return t('Delete Capsules');
+ return t('Delete Capsule');
+ }
+
+ get buttonText() {
+ return t('Delete');
}
get buttonType() {
@@ -37,5 +40,3 @@ export class DeleteCapsules extends ConfirmAction {
onSubmit = (data) => globalCapsulesStore.delete({ id: data.uuid });
}
-
-export default inject("rootStore")(observer(DeleteCapsules))
\ No newline at end of file
diff --git a/src/pages/container-service/containers/Capsules/actions/index.jsx b/src/pages/container-service/containers/Capsules/actions/index.jsx
index 4e5e9dc2..7aa4bcac 100644
--- a/src/pages/container-service/containers/Capsules/actions/index.jsx
+++ b/src/pages/container-service/containers/Capsules/actions/index.jsx
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import Create from './Create';
-import DeleteCapsules from './Delete';
+import DeleteCapsule from './Delete';
const actionConfigs = {
rowActions: {
- firstAction: DeleteCapsules,
+ firstAction: DeleteCapsule,
},
- batchActions: [DeleteCapsules],
+ batchActions: [DeleteCapsule],
primaryActions: [Create],
};
diff --git a/src/pages/container-service/containers/Capsules/index.jsx b/src/pages/container-service/containers/Capsules/index.jsx
index c6fa6fba..6d277c34 100644
--- a/src/pages/container-service/containers/Capsules/index.jsx
+++ b/src/pages/container-service/containers/Capsules/index.jsx
@@ -14,8 +14,9 @@
import Base from 'containers/List';
import { inject, observer } from 'mobx-react';
+import globalCapsulesStore from 'stores/zun/capsules';
+import { capsuleStatus } from 'resources/zun/capsule';
import actionConfigs from './actions';
-import globalCapsulesStore from 'src/stores/zun/capsules';
export class Capsules extends Base {
init() {
@@ -40,13 +41,14 @@ export class Capsules extends Base {
title: t('ID/Name'),
dataIndex: 'meta_name',
isLink: true,
- routeName: this.getRouteName('capsulesDetail'),
+ routeName: this.getRouteName('zunCapsuleDetail'),
idKey: 'uuid',
},
{
title: t('Status'),
isHideable: true,
dataIndex: 'status',
+ render: (value) => capsuleStatus[value] || value,
},
{
title: t('CPU'),
@@ -61,4 +63,4 @@ export class Capsules extends Base {
];
}
-export default inject("rootStore")(observer(Capsules))
\ No newline at end of file
+export default inject('rootStore')(observer(Capsules));
diff --git a/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx b/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx
index 7750b530..76292d32 100644
--- a/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx
+++ b/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx
@@ -28,18 +28,6 @@ export class BaseDetail extends Base {
get baseInfoCard() {
const options = [
- {
- label: t('ID'),
- dataIndex: 'uuid',
- },
- {
- label: t('Name'),
- dataIndex: 'name',
- },
- {
- label: t('Status'),
- dataIndex: 'status',
- },
{
label: t('Status Detail'),
dataIndex: 'status_detail',
@@ -83,7 +71,7 @@ export class BaseDetail extends Base {
{
label: t('Environment'),
dataIndex: 'environment',
- content
+ content,
},
{
label: t('Interactive'),
@@ -98,7 +86,11 @@ export class BaseDetail extends Base {
{
label: t('Links'),
dataIndex: 'links',
- render: (value) =>
{JSON.stringify(value, null, 4)}
+ render: (value) => (
+
+
{JSON.stringify(value, null, 4)}
+
+ ),
},
];
@@ -145,7 +137,11 @@ export class BaseDetail extends Base {
{
label: t('Restart Policy'),
dataIndex: 'restart_policy',
- render: (value) =>
{JSON.stringify(value, null, 4)}
+ render: (value) => (
+
+
{JSON.stringify(value, null, 4)}
+
+ ),
},
{
label: t('Auto Remove'),
@@ -158,17 +154,29 @@ export class BaseDetail extends Base {
{
label: t('Addresses'),
dataIndex: 'addresses',
- render: (value) =>
{JSON.stringify(value, null, 4)}
+ render: (value) => (
+
+
{JSON.stringify(value, null, 4)}
+
+ ),
},
{
label: t('Ports'),
dataIndex: 'ports',
- render: (value) =>
{JSON.stringify(value, null, 4)}
+ render: (value) => (
+
+
{JSON.stringify(value, null, 4)}
+
+ ),
},
{
label: t('Security Groups'),
dataIndex: 'security_groups',
- render: (value) =>
{JSON.stringify(value, null, 4)}
+ render: (value) => (
+
+
{JSON.stringify(value, null, 4)}
+
+ ),
},
];
@@ -180,4 +188,4 @@ export class BaseDetail extends Base {
}
}
-export default inject("rootStore")(observer(BaseDetail))
\ No newline at end of file
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/container-service/containers/Containers/Detail/index.jsx b/src/pages/container-service/containers/Containers/Detail/index.jsx
index fffc4370..4700d917 100644
--- a/src/pages/container-service/containers/Containers/Detail/index.jsx
+++ b/src/pages/container-service/containers/Containers/Detail/index.jsx
@@ -12,20 +12,21 @@
import { inject, observer } from 'mobx-react';
import Base from 'containers/TabDetail';
-import BaseDetail from './BaseDetail';
import globalContainersStore from 'src/stores/zun/containers';
+import { containerStatus } from 'resources/zun/container';
+import BaseDetail from './BaseDetail';
-export class ContainersDetail extends Base {
+export class ContainerDetail extends Base {
init() {
this.store = globalContainersStore;
}
get name() {
- return t('Containers Detail');
+ return t('Container Detail');
}
get listUrl() {
- return this.getRoutePath('containers');
+ return this.getRoutePath('zunContainers');
}
get policy() {
@@ -38,6 +39,11 @@ export class ContainersDetail extends Base {
title: t('Name'),
dataIndex: 'name',
},
+ {
+ title: t('Status'),
+ dataIndex: 'status',
+ render: (value) => containerStatus[value] || value,
+ },
];
}
@@ -52,4 +58,4 @@ export class ContainersDetail extends Base {
}
}
-export default inject("rootStore")(observer(ContainersDetail))
\ No newline at end of file
+export default inject('rootStore')(observer(ContainerDetail));
diff --git a/src/pages/container-service/containers/Containers/actions/Delete.jsx b/src/pages/container-service/containers/Containers/actions/Delete.jsx
index 1c143bd7..ed6d2571 100644
--- a/src/pages/container-service/containers/Containers/actions/Delete.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Delete.jsx
@@ -15,13 +15,13 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class DeleteContainers extends ConfirmAction {
+export default class DeleteContainer extends ConfirmAction {
get id() {
return 'delete';
}
get title() {
- return t('Delete Container')
+ return t('Delete Container');
}
get actionName() {
@@ -40,6 +40,5 @@ export default class DeleteContainers extends ConfirmAction {
allowedCheckFunc = () => true;
- onSubmit = (data) =>
- globalContainersStore.delete({ id: data.uuid });
+ onSubmit = (data) => globalContainersStore.delete({ id: data.uuid });
}
diff --git a/src/pages/container-service/containers/Containers/actions/Pause.jsx b/src/pages/container-service/containers/Containers/actions/Pause.jsx
index 6c2bd7dd..606a7e8c 100644
--- a/src/pages/container-service/containers/Containers/actions/Pause.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Pause.jsx
@@ -13,19 +13,23 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class PauseContainers extends ConfirmAction {
+export default class PauseContainer extends ConfirmAction {
get id() {
return 'pause';
}
get title() {
- return t('Pause Container')
+ return t('Pause Container');
}
get actionName() {
return t('Pause Container');
}
+ get buttonText() {
+ return t('Pause');
+ }
+
policy = 'container:container:pause';
allowedCheckFunc = () => true;
diff --git a/src/pages/container-service/containers/Containers/actions/Reboot.jsx b/src/pages/container-service/containers/Containers/actions/Reboot.jsx
index f3bb8771..9861590c 100644
--- a/src/pages/container-service/containers/Containers/actions/Reboot.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Reboot.jsx
@@ -13,19 +13,23 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class RebootContainers extends ConfirmAction {
+export default class RebootContainer extends ConfirmAction {
get id() {
return 'reboot';
}
get title() {
- return t('Reboot Container')
+ return t('Reboot Container');
}
get actionName() {
return t('Reboot Container');
}
+ get buttonText() {
+ return t('Reboot');
+ }
+
policy = 'container:container:reboot';
allowedCheckFunc = () => true;
diff --git a/src/pages/container-service/containers/Containers/actions/Start.jsx b/src/pages/container-service/containers/Containers/actions/Start.jsx
index d15365ce..f59dcf08 100644
--- a/src/pages/container-service/containers/Containers/actions/Start.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Start.jsx
@@ -13,19 +13,23 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class StartContainers extends ConfirmAction {
+export default class StartContainer extends ConfirmAction {
get id() {
return 'start';
}
get title() {
- return t('Start Container')
+ return t('Start Container');
}
get actionName() {
return t('Start Container');
}
+ get buttonText() {
+ return t('Start');
+ }
+
policy = 'container:container:start';
allowedCheckFunc = () => true;
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
index 5ff841da..cefe0a3b 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
@@ -10,59 +10,59 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import Base from "components/Form";
-import { inject, observer } from "mobx-react";
+import Base from 'components/Form';
+import { inject, observer } from 'mobx-react';
export class StepInfo extends Base {
get title() {
- return t("Info")
+ return t('Info');
}
get name() {
- return t("Info")
+ return t('Info');
}
get formItems() {
return [
{
- name: "clusterName",
- label: t("Cluster Name"),
- type: "input",
- placeholder: t("Cluster Name"),
- required: true
+ name: 'containerName',
+ label: t('Container Name'),
+ type: 'input',
+ placeholder: t('Container Name'),
+ required: true,
},
{
- name: "image",
- label: t("Image"),
- type: "input",
- placeholder: t("Name or ID og the container image"),
- required: true
+ name: 'image',
+ label: t('Image'),
+ type: 'input',
+ placeholder: t('Name or ID og the container image'),
+ required: true,
},
{
- name: "imageDriver",
- label: t("Image Driver"),
- placeholder: t("Image Driver"),
- type: "select",
+ name: 'imageDriver',
+ label: t('Image Driver'),
+ placeholder: t('Image Driver'),
+ type: 'select',
options: [
{
- label: t("Docker"),
- value: "docker"
+ label: t('Docker'),
+ value: 'docker',
},
{
- label: t("Glance"),
- value: "glance"
- }
+ label: t('Glance'),
+ value: 'glance',
+ },
],
- allowClear: true
+ allowClear: true,
},
{
- name: "command",
- label: t("Command"),
- type: "input",
- placeholder: t("A command that will be sent to the container"),
+ name: 'command',
+ label: t('Command'),
+ type: 'input',
+ placeholder: t('A command that will be sent to the container'),
},
- ]
+ ];
}
}
-export default inject('rootStore')(observer(StepInfo));
\ No newline at end of file
+export default inject('rootStore')(observer(StepInfo));
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepMiscellaneous/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepMiscellaneous/index.jsx
index 07b21866..b8610c31 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepMiscellaneous/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepMiscellaneous/index.jsx
@@ -10,62 +10,61 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import Base from "components/Form";
-import { inject, observer } from "mobx-react";
+import Base from 'components/Form';
+import { inject, observer } from 'mobx-react';
import KeyValueInput from 'components/FormItem/KeyValueInput';
export class StepMiscellaneous extends Base {
-
get title() {
- return t("Miscellaneous")
+ return t('Miscellaneous');
}
get name() {
- return t("Miscellaneous")
+ return t('Miscellaneous');
}
get formItems() {
return [
{
- name: "workingDirectory",
- label: t("Working Directory"),
- type: "input",
- placeholder: t("The working directory for commands to run in")
+ name: 'workingDirectory',
+ label: t('Working Directory'),
+ type: 'input',
+ placeholder: t('The working directory for commands to run in'),
},
{
- name: "environmentVariables",
- label: t("Environment Variables"),
+ name: 'environmentVariables',
+ label: t('Environment Variables'),
type: 'add-select',
itemComponent: KeyValueInput,
addText: t('Add Environment Variable'),
},
{
- name: "enableInteractiveMode",
- label: t("Enable interactive mode"),
- type: "check"
+ name: 'enableInteractiveMode',
+ label: t('Enable interactive mode'),
+ type: 'check',
},
{
- type: "divider"
+ type: 'divider',
},
{
- name: "labels",
- label: t("Labels"),
+ name: 'labels',
+ label: t('Labels'),
type: 'add-select',
itemComponent: KeyValueInput,
addText: t('Add Label'),
},
{
- type: "divider"
+ type: 'divider',
},
{
- name: "hints",
- label: t("Scheduler Hints"),
- type: "select",
- mode: "tags",
- placeholder: t("Type to Scheduler Hints and press enter")
- }
- ]
+ name: 'hints',
+ label: t('Scheduler Hints'),
+ type: 'select',
+ mode: 'tags',
+ placeholder: t('Type to Scheduler Hints and press enter'),
+ },
+ ];
}
}
-export default inject('rootStore')(observer(StepMiscellaneous));
\ No newline at end of file
+export default inject('rootStore')(observer(StepMiscellaneous));
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
index 9560b6d4..5cb1c3fb 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
@@ -12,14 +12,16 @@
import { SecurityGroupStore } from 'stores/neutron/security-group';
import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter';
-import Base from "components/Form";
-import { inject, observer } from "mobx-react";
+import Base from 'components/Form';
+import { inject, observer } from 'mobx-react';
import globalNetworkStore from 'src/stores/neutron/network';
import { portColumns, portFilters } from 'src/resources/neutron/port';
-import { securityGroupColumns, securityGroupFilter } from 'src/resources/neutron/security-group';
+import {
+ securityGroupColumns,
+ securityGroupFilter,
+} from 'src/resources/neutron/security-group';
export class StepNetworks extends Base {
-
init() {
this.getNetworkStore();
this.portStore = new VirtualAdapterStore();
@@ -27,11 +29,11 @@ export class StepNetworks extends Base {
}
get title() {
- return t("Networks")
+ return t('Networks');
}
get name() {
- return t("Networks")
+ return t('Networks');
}
async getNetworkStore() {
@@ -61,7 +63,11 @@ export class StepNetworks extends Base {
columns: portColumns,
filterParams: portFilters,
backendPageStore: this.portStore,
- extraParams: { project_id: this.currentProjectId, device_owner: [''], admin_state_up: [true] }
+ extraParams: {
+ project_id: this.currentProjectId,
+ device_owner: [''],
+ admin_state_up: [true],
+ },
},
{
name: 'securityGroup',
@@ -71,10 +77,10 @@ export class StepNetworks extends Base {
extraParams: { project_id: this.currentProjectId },
columns: securityGroupColumns,
filterParams: securityGroupFilter,
- isMulti: true
- }
- ]
+ isMulti: true,
+ },
+ ];
}
}
-export default inject('rootStore')(observer(StepNetworks));
\ No newline at end of file
+export default inject('rootStore')(observer(StepNetworks));
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepSpec/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepSpec/index.jsx
index 3a2578a1..46dcceb8 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepSpec/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepSpec/index.jsx
@@ -10,9 +10,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import Base from "components/Form";
-import { inject, observer } from "mobx-react";
-import globalAvailabilityZoneStore from "src/stores/nova/zone";
+import Base from 'components/Form';
+import { inject, observer } from 'mobx-react';
+import globalAvailabilityZoneStore from 'src/stores/nova/zone';
export class StepSpec extends Base {
init() {
@@ -21,11 +21,11 @@ export class StepSpec extends Base {
}
get title() {
- return t("Spec");
+ return t('Spec');
}
get name() {
- return t("Spec");
+ return t('Spec');
}
async getAvailabilityZones() {
@@ -33,7 +33,8 @@ export class StepSpec extends Base {
}
get getAvailabilityZoneList() {
- return (globalAvailabilityZoneStore.list.data || []).filter((it) => it.zoneState.available)
+ return (globalAvailabilityZoneStore.list.data || [])
+ .filter((it) => it.zoneState.available)
.map((it) => ({
value: it.zoneName,
label: it.zoneName,
@@ -41,96 +42,96 @@ export class StepSpec extends Base {
}
onExitPolicyChange(value) {
- this.setState({ isMaxRetry: value === "on-failure" ? false : true })
+ this.setState({ isMaxRetry: value !== 'on-failure' });
}
get formItems() {
return [
{
- name: "hostname",
- label: t("Hostname"),
- type: "input",
- placeholder: t("The host name of this container"),
+ name: 'hostname',
+ label: t('Hostname'),
+ type: 'input',
+ placeholder: t('The host name of this container'),
},
{
- name: "runtime",
- label: t("Runtime"),
- type: "input",
- placeholder: t("The runtime to create container with"),
+ name: 'runtime',
+ label: t('Runtime'),
+ type: 'input',
+ placeholder: t('The runtime to create container with'),
},
{
- name: "cpu",
- label: t("CPU"),
- type: "input-number",
- placeholder: t("The number of virtual cpu for this container"),
+ name: 'cpu',
+ label: t('CPU'),
+ type: 'input-number',
+ placeholder: t('The number of virtual cpu for this container'),
min: 1,
- width: 300
+ width: 300,
},
{
- name: "memory",
- label: t("Memory"),
- type: "input-number",
- placeholder: t("The container memory size in MiB"),
+ name: 'memory',
+ label: t('Memory'),
+ type: 'input-number',
+ placeholder: t('The container memory size in MiB'),
min: 4,
- width: 300
+ width: 300,
},
{
- name: "disk",
- label: t("Disk"),
- type: "input-number",
- placeholder: t("The disk size in GİB for per container"),
+ name: 'disk',
+ label: t('Disk'),
+ type: 'input-number',
+ placeholder: t('The disk size in GİB for per container'),
min: 1,
- width: 300
+ width: 300,
},
{
- name: "availableZone",
- label: t("Availability Zone"),
- type: "select",
+ name: 'availableZone',
+ label: t('Availability Zone'),
+ type: 'select',
options: this.getAvailabilityZoneList,
allowClear: true,
- showSearch: true
+ showSearch: true,
},
{
- name: "exitPolicy",
- label: t("Exit Policy"),
- type: "select",
+ name: 'exitPolicy',
+ label: t('Exit Policy'),
+ type: 'select',
options: [
{
- label: t("No"),
- value: "no"
+ label: t('No'),
+ value: 'no',
},
{
- label: t("On failure"),
- value: "on-failure"
+ label: t('On failure'),
+ value: 'on-failure',
},
{
- label: t("Always"),
- value: "always"
+ label: t('Always'),
+ value: 'always',
},
{
- label: t("Unless Stopped"),
- value: "unless-stopped"
+ label: t('Unless Stopped'),
+ value: 'unless-stopped',
},
],
onChange: (val) => this.onExitPolicyChange(val),
allowClear: true,
- showSearch: true
+ showSearch: true,
},
{
- name: "maxRetry",
- label: t("Max Retry"),
- type: "input-number",
+ name: 'maxRetry',
+ label: t('Max Retry'),
+ type: 'input-number',
placeholder: t("Retry times for 'Restart on failure' policy"),
min: 1,
- disabled: this.state.isMaxRetry
+ disabled: this.state.isMaxRetry,
},
{
- name: "enableAutoHeal",
- label: t("Enable auto heal"),
- type: "check"
- }
- ]
+ name: 'enableAutoHeal',
+ label: t('Enable auto heal'),
+ type: 'check',
+ },
+ ];
}
}
-export default inject('rootStore')(observer(StepSpec));
\ No newline at end of file
+export default inject('rootStore')(observer(StepSpec));
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepVolumes/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepVolumes/index.jsx
index 6605acaf..27c617d4 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepVolumes/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepVolumes/index.jsx
@@ -10,13 +10,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import Base from "components/Form";
-import { inject, observer } from "mobx-react";
-import ZunVolume from "src/components/FormItem/ZunVolume";
-import globalVolumeStore from "src/stores/cinder/volume";
+import Base from 'components/Form';
+import { inject, observer } from 'mobx-react';
+import ZunVolume from 'src/components/FormItem/ZunVolume';
+import globalVolumeStore from 'src/stores/cinder/volume';
export class StepVolumes extends Base {
-
init() {
this.globalVolumeStore = globalVolumeStore;
this.getVolumeStore();
@@ -38,15 +37,18 @@ export class StepVolumes extends Base {
get formItems() {
return [
{
- name: "mounts",
- label: t("Type"),
+ name: 'mounts',
+ label: t('Type'),
type: 'add-select',
- optionsType: [{ label: "Existing Cinder Volume", value: "cinder-available" }, { label: "New Cinder Volume", value: "cinder-new" }],
+ optionsType: [
+ { label: 'Existing Cinder Volume', value: 'cinder-available' },
+ { label: 'New Cinder Volume', value: 'cinder-new' },
+ ],
optionsSource: this.cinderVolume,
itemComponent: ZunVolume,
},
- ]
+ ];
}
}
-export default inject('rootStore')(observer(StepVolumes));
\ No newline at end of file
+export default inject('rootStore')(observer(StepVolumes));
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/index.jsx
index b7e073cb..beb40641 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/index.jsx
@@ -10,38 +10,38 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+import { inject, observer } from 'mobx-react';
+import { StepAction } from 'src/containers/Action';
+import globalContainersStore from 'src/stores/zun/containers';
import StepInfo from './StepInfo';
import StepSpec from './StepSpec';
import StepVolumes from './StepVolumes';
import StepNetworks from './StepNetworks';
-import { inject, observer } from 'mobx-react';
import StepMiscellaneous from './StepMiscellaneous';
-import { StepAction } from 'src/containers/Action';
-import globalContainersStore from 'src/stores/zun/containers';
export class StepCreate extends StepAction {
init() {
this.store = globalContainersStore;
}
- static id = "create-container";
+ static id = 'create-container';
- static title = t("Create Container (Step)");
+ static title = t('Create Container');
- static path = "/container/containers/create";
+ static path = '/container/containers/create';
- static policy = "container:container:create";
+ static policy = 'container:container:create';
static allowed() {
return Promise.resolve(true);
}
get name() {
- return t("Create Container");
+ return t('Create Container');
}
get listUrl() {
- return this.getRoutePath("containers");
+ return this.getRoutePath('zunContainers');
}
get hasConfirmStep() {
@@ -51,80 +51,91 @@ export class StepCreate extends StepAction {
get steps() {
return [
{
- title: t("Info"),
- component: StepInfo
+ title: t('Info'),
+ component: StepInfo,
},
{
- title: t("Spec"),
- component: StepSpec
+ title: t('Spec'),
+ component: StepSpec,
},
{
- title: t("Volumes"),
- component: StepVolumes
+ title: t('Volumes'),
+ component: StepVolumes,
},
{
- title: t("Network Config"),
- component: StepNetworks
+ title: t('Network Config'),
+ component: StepNetworks,
},
{
- title: t("Miscellaneous"),
- component: StepMiscellaneous
- }
- ]
+ title: t('Miscellaneous'),
+ component: StepMiscellaneous,
+ },
+ ];
}
onSubmit = (values) => {
- const { environmentVariables, labels, mounts } = values
+ const { environmentVariables, labels, mounts } = values;
const requestEnviranment = {};
const requestLabels = {};
const requestValumes = [];
- environmentVariables !== null ? environmentVariables.forEach((item) => {
- const labelKey = item.value.key.toLowerCase().trim();
- const labelValue = item.value.value.toLowerCase().trim();
- requestEnviranment[labelKey] = labelValue;
- }) : null;
+ environmentVariables !== undefined
+ ? environmentVariables.forEach((item) => {
+ const labelKey = item.value.key.toLowerCase().trim();
+ const labelValue = item.value.value.toLowerCase().trim();
+ requestEnviranment[labelKey] = labelValue;
+ })
+ : undefined;
- labels !== null ? labels.forEach((item) => {
- const key = item.value.key.toLowerCase().trim();
- const value = item.value.value.toLowerCase().trim();
- requestLabels[key] = value;
- }) : null;
+ labels !== undefined
+ ? labels.forEach((item) => {
+ const key = item.value.key.toLowerCase().trim();
+ const value = item.value.value.toLowerCase().trim();
+ requestLabels[key] = value;
+ })
+ : undefined;
- mounts !== null ? mounts.forEach((item) => {
- const destination = item.value.destination;
- const source = item.value.source;
- const type = item.value.type;
- const cinderVolumeSize = item.value.cinderVolumeSize;
- item.value.isCinderVolume !== true ? requestValumes.push({
- destination: destination,
- source: source,
- type: type
- }) : requestValumes.push({
- destination: destination,
- cinderVolumeSize: cinderVolumeSize,
- type: type
- })
- }) : null;
+ mounts !== undefined
+ ? mounts.forEach((item) => {
+ const { destination } = item.value;
+ const { source } = item.value;
+ const { type } = item.value;
+ const { cinderVolumeSize } = item.value;
+ item.value.isCinderVolume !== true
+ ? requestValumes.push({
+ destination,
+ source,
+ type,
+ })
+ : requestValumes.push({
+ destination,
+ cinderVolumeSize,
+ type,
+ });
+ })
+ : undefined;
const networks = [];
const securityGroups = [];
- values.networkSelect.selectedRowKeys.forEach((item) => {
- networks.push({ network: item })
- })
+ values.networkSelect &&
+ values.networkSelect.selectedRowKeys.forEach((item) => {
+ networks.push({ network: item });
+ });
- values.ports.selectedRowKeys.forEach((item) => {
- networks.push({ port: item })
- })
+ values.ports &&
+ values.ports.selectedRowKeys.forEach((item) => {
+ networks.push({ port: item });
+ });
- values.securityGroup.selectedRowKeys.forEach((item) => {
- securityGroups.push(item)
- })
+ values.securityGroup &&
+ values.securityGroup.selectedRowKeys.forEach((item) => {
+ securityGroups.push(item);
+ });
return this.store.create({
- name: values.clusterName,
+ name: values.containerName,
image: values.image,
command: values.command,
cpu: values.cpu,
@@ -133,8 +144,8 @@ export class StepCreate extends StepAction {
labels: requestLabels,
environment: requestEnviranment,
restart_policy: {
- Name: values.exitPolicy === null ? 'no' : values.exitPolicy,
- MaximumRetryCount: values.maxRetry === null ? 0 : values.maxRetry,
+ Name: values.exitPolicy === undefined ? 'no' : values.exitPolicy,
+ MaximumRetryCount: values.maxRetry === undefined ? 0 : values.maxRetry,
},
interactive: values.enableInteractiveMode,
image_driver: values.imageDriver,
@@ -146,8 +157,8 @@ export class StepCreate extends StepAction {
availability_zone: values.availableZone,
hints: values.hints,
mounts: values.mounts,
- })
- }
+ });
+ };
}
-export default inject('rootStore')(observer(StepCreate));
\ No newline at end of file
+export default inject('rootStore')(observer(StepCreate));
diff --git a/src/pages/container-service/containers/Containers/actions/Stop.jsx b/src/pages/container-service/containers/Containers/actions/Stop.jsx
index a51126e7..a682ad78 100644
--- a/src/pages/container-service/containers/Containers/actions/Stop.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Stop.jsx
@@ -15,19 +15,23 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class StopContainers extends ConfirmAction {
+export default class StopContainer extends ConfirmAction {
get id() {
return 'start';
}
get title() {
- return t('Stop Container')
+ return t('Stop Container');
}
get actionName() {
return t('Stop Container');
}
+ get buttonText() {
+ return t('Stop');
+ }
+
policy = 'container:container:stop';
allowedCheckFunc = () => true;
diff --git a/src/pages/container-service/containers/Containers/actions/Unpause.jsx b/src/pages/container-service/containers/Containers/actions/Unpause.jsx
index 7c73a120..54ef08be 100644
--- a/src/pages/container-service/containers/Containers/actions/Unpause.jsx
+++ b/src/pages/container-service/containers/Containers/actions/Unpause.jsx
@@ -15,19 +15,23 @@
import { ConfirmAction } from 'containers/Action';
import globalContainersStore from 'src/stores/zun/containers';
-export default class UnpauseContainers extends ConfirmAction {
+export default class UnpauseContainer extends ConfirmAction {
get id() {
return 'Unpause';
}
get title() {
- return t('Unpause Container')
+ return t('Unpause Container');
}
get actionName() {
return t('Unpause Container');
}
+ get buttonText() {
+ return t('Unpause');
+ }
+
policy = 'container:container:unpause';
allowedCheckFunc = () => true;
diff --git a/src/pages/container-service/containers/Containers/actions/index.jsx b/src/pages/container-service/containers/Containers/actions/index.jsx
index 356a2e29..daf80c2b 100644
--- a/src/pages/container-service/containers/Containers/actions/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/index.jsx
@@ -21,9 +21,9 @@ import UnpauseContainer from './Unpause';
const actionConfigs = {
rowActions: {
+ firstAction: DeleteContainer,
moreActions: [
{ action: StartContainer },
- { action: DeleteContainer },
{ action: StopContainer },
{ action: PauseContainer },
{ action: RebootContainer },
diff --git a/src/pages/container-service/containers/Containers/index.jsx b/src/pages/container-service/containers/Containers/index.jsx
index c9bace7b..50b9ec9f 100644
--- a/src/pages/container-service/containers/Containers/index.jsx
+++ b/src/pages/container-service/containers/Containers/index.jsx
@@ -14,8 +14,9 @@
import Base from 'containers/List';
import { inject, observer } from 'mobx-react';
-import actionConfigs from './actions';
import globalContainersStore from 'src/stores/zun/containers';
+import { containerStatus, containerTaskStatus } from 'resources/zun/container';
+import actionConfigs from './actions';
export class Containers extends Base {
init() {
@@ -44,13 +45,14 @@ export class Containers extends Base {
title: t('ID/Name'),
dataIndex: 'name',
isLink: true,
- routeName: this.getRouteName('containerDetail'),
+ routeName: this.getRouteName('zunContainerDetail'),
idKey: 'uuid',
},
{
title: t('Status'),
isHideable: true,
dataIndex: 'status',
+ render: (value) => containerStatus[value] || value,
},
{
title: t('Image'),
@@ -61,8 +63,9 @@ export class Containers extends Base {
title: t('Task State'),
isHideable: true,
dataIndex: 'task_state',
+ render: (value) => containerTaskStatus[value] || value,
},
];
}
-export default inject("rootStore")(observer(Containers))
\ No newline at end of file
+export default inject('rootStore')(observer(Containers));
diff --git a/src/pages/container-service/routes/index.js b/src/pages/container-service/routes/index.js
index 5b46458d..ec6d40fb 100644
--- a/src/pages/container-service/routes/index.js
+++ b/src/pages/container-service/routes/index.js
@@ -28,7 +28,11 @@ export default [
routes: [
// Containers
{ path: `${PATH}/containers`, component: Containers, exact: true },
- { path: `${PATH}/containers/create`, component: StepCreateContainer, exact: true },
+ {
+ path: `${PATH}/containers/create`,
+ component: StepCreateContainer,
+ exact: true,
+ },
{
path: `${PATH}/containers/detail/:id`,
component: ContainersDetail,
diff --git a/src/resources/zun/capsule.js b/src/resources/zun/capsule.js
new file mode 100644
index 00000000..6ea24e54
--- /dev/null
+++ b/src/resources/zun/capsule.js
@@ -0,0 +1,8 @@
+export const capsuleStatus = {
+ Creating: t('Creating'),
+ Pending: t('Pending'),
+ Running: t('Running'),
+ Succeeded: t('Succeeded'),
+ Failed: t('Failed'),
+ Unknown: t('Unknown'),
+};
diff --git a/src/resources/zun/container.js b/src/resources/zun/container.js
new file mode 100644
index 00000000..53e69612
--- /dev/null
+++ b/src/resources/zun/container.js
@@ -0,0 +1,18 @@
+export const containerStatus = {
+ Creating: t('Creating'),
+ Created: t('Created'),
+ Running: t('Running'),
+ Stopped: t('Stopped'),
+ Paused: t('Paused'),
+ Restarting: t('Restarting'),
+ Deleting: t('Deleting'),
+};
+
+export const containerTaskStatus = {
+ null: t('No Task'),
+ container_creating: t('Container Creating'),
+ container_starting: t('Container Starting'),
+ container_stopping: t('Container Stopping'),
+ container_rebooting: t('Container Rebooting'),
+ container_deleting: t('Container Deleting'),
+};
diff --git a/src/stores/zun/containers.js b/src/stores/zun/containers.js
index 3ad667ac..d411dd51 100644
--- a/src/stores/zun/containers.js
+++ b/src/stores/zun/containers.js
@@ -58,4 +58,4 @@ export class ContainersStore extends Base {
}
const globalContainersStore = new ContainersStore();
-export default globalContainersStore;
\ No newline at end of file
+export default globalContainersStore;