Issue #3271378 by Ryo Yamashita, yas, Xiaohua Guan, sekinet: Refactor the CxUD... (405cf165) · Commits · project / cloud

cloud.routing.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -283,8 +283,8 @@ entity.cloud_store.list_update:
		converter: 'paramconverter.entity'

		# Clour Store REST API.
		entity.cloud_store.entity.count:
		path: '/cloud_dashboard/{bundle}/entity/count'
		entity.cloud_store.count:
		path: '/cloud_dashboard/cloud_store/{bundle_id}/count'
		defaults:
		_controller: '\Drupal\cloud\Controller\CloudStoreController::getEntityCount'
		methods: [GET]

modules/cloud_dashboard/cloud_dashboard.routing.yml

+86 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,42 @@ cloud_dashboard.k8s.info:
		requirements:
		_permission: 'administer'

		# form for OpenStack
		cloud_dashboard.openstack.form:
		path: '/clouds/dashboard/openstack/{parameter}'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# info for OpenStack entity
		cloud_dashboard.openstack.info:
		path: '/clouds/dashboard/openstack/{parameter}/{parameter2}'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# form for VMware
		cloud_dashboard.vmware.form:
		path: '/clouds/dashboard/vmware/{parameter}'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# info for VMware entity
		cloud_dashboard.vmware.info:
		path: '/clouds/dashboard/vmware/{parameter}/{parameter2}'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# launch template
		cloud_dashboard.launch_template:
		path: '/clouds/dashboard/server_template/{parameter1}/{parameter2}'
		@@ -78,6 +114,56 @@ cloud_dashboard.launch_template_all:
		requirements:
		_permission: 'administer'

		# project view
		cloud_dashboard.project_view:
		path: '/clouds/dashboard/{parameter}/project'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		cloud_dashboard.project_view_all:
		path: '/clouds/dashboard/project/{parameter}'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# resource_store_template
		cloud_dashboard.resource_store_template.cost:
		path: '/clouds/dashboard/k8s_cost_store'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		cloud_dashboard.resource_store_template.namespace:
		path: '/clouds/dashboard/k8s_namespace_resource_store'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		cloud_dashboard.resource_store_template.node:
		path: '/clouds/dashboard/k8s_node_resource_store'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		cloud_dashboard.resource_store_template.pod:
		path: '/clouds/dashboard/k8s_pod_resource_store'
		defaults:
		_title: Cloud Dashboard
		_form: '\Drupal\cloud_dashboard\Form\React\CloudDashboardForm'
		requirements:
		_permission: 'administer'

		# Cloud Admin Settings.
		cloud_dashboard.settings:
		path: '/admin/config/services/cloud_dashboard/settings'

modules/cloud_dashboard/cloud_dashboard/src/molecules/DataTableRowWithOperationLinks.tsx

+3 −3

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ const getOperations = (dataRecord: DataRecord): [string, string][] => {

		const editData = (dataRecord: DataRecord) => {
		let urlParts = dataRecord.entityTypeId;
		const modules = ['aws_cloud', 'k8s'];
		const modules = ['aws_cloud', 'k8s', 'openstack', 'vmware'];
		for (const module of modules) {
		urlParts = urlParts.replace(`${module}_`, `${module}/`);
		}
		@@ -141,7 +141,7 @@ const editData = (dataRecord: DataRecord) => {

		const scaleData = (dataRecord: DataRecord) => {
		let urlParts = dataRecord.entityTypeId;
		const modules = ['aws_cloud', 'k8s'];
		const modules = ['aws_cloud', 'k8s', 'openstack', 'vmware'];
		for (const module of modules) {
		urlParts = urlParts.replace(`${module}_`, `${module}/`);
		}
		@@ -150,7 +150,7 @@ const scaleData = (dataRecord: DataRecord) => {

		const deleteData = (dataRecord: DataRecord) => {
		let urlParts = dataRecord.entityTypeId;
		const modules = ['aws_cloud', 'k8s'];
		const modules = ['aws_cloud', 'k8s', 'openstack', 'vmware'];
		for (const module of modules) {
		urlParts = urlParts.replace(`${module}_`, `${module}/`);
		}

modules/cloud_dashboard/cloud_dashboard/src/molecules/ItemCountLabel.tsx

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,8 @@ const getItemCount = async (

		// Create URL for REST API.
		const url = cloudContext.name === 'ALL'
		? `/cloud_dashboard/${cloudContext.cloudServiceProvider}/${entityTypeId}/entity/count`
		: `/cloud_dashboard/${cloudContext.cloudServiceProvider}/${cloudContext.name}/${entityTypeId}/entity/count`;
		? `/cloud_dashboard/${cloudContext.cloudServiceProvider}/${entityTypeId}/count`
		: `/cloud_dashboard/${cloudContext.cloudServiceProvider}/${cloudContext.name}/${entityTypeId}/count`;
		const filter: { [key: string]: string; } = {};
		if (namespace !== '') {
		filter['namespace'] = namespace;

modules/cloud_dashboard/cloud_dashboard/src/molecules/ResourceCountLabel.tsx

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ const getItemCount = async (
		) => {

		// Create URL for REST API.
		const url = `/cloud_dashboard/${bundleId}/entity/count`;
		const url = `/cloud_dashboard/cloud_store/${bundleId}/count`;

		// Download data.
		return (await getJsonData<{ count: number }>(url)).count;