Skip to content

Commit 8ff6f28

Browse files
committed
address comments and some minor fixups
1 parent 87900a3 commit 8ff6f28

File tree

6 files changed

+48
-343
lines changed

6 files changed

+48
-343
lines changed

ui/public/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,6 +2202,7 @@
22022202
"label.usage.records.fetch.child.domains": "Fetch usage records for child domains",
22032203
"label.usage.records.usagetype.required": "Usage type is required with resource ID",
22042204
"label.usage.records.generate": "Generate usage records",
2205+
"label.usage.records.generated": "A job has been created to generate usage records.",
22052206
"label.usage.records.generate.description": "This will generate records only if there any records to be generated. i.e if the scheduled usage job was not run or failed",
22062207
"label.usage.records.purge": "Purge usage records",
22072208
"label.usage.records.purge.days": "Purge records older than",

ui/src/components/view/ListView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<router-link :to="{ path: createPathBasedOnVmType(record.vmtype, record.virtualmachineid) }">{{ text }}</router-link>
168168
</template>
169169
<template v-if="column.key === 'virtualmachinename'">
170-
<router-link :to="{ path: getVmRouteUsingType(record) + record.virtualmachineid }">{{ text ? text : record.name }}</router-link>
170+
<router-link :to="{ path: getVmRouteUsingType(record) + record.virtualmachineid }">{{ text }}</router-link>
171171
</template>
172172
<template v-if="column.key === 'volumename'">
173173
<router-link :to="{ path: '/volume/' + record.volumeid }">{{ text }}</router-link>

ui/src/config/router.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import zone from '@/config/section/zone'
3838
import offering from '@/config/section/offering'
3939
import config from '@/config/section/config'
4040
import tools from '@/config/section/tools'
41+
import usage from '@/config/section/usage'
4142
import quota from '@/config/section/plugin/quota'
4243
import cloudian from '@/config/section/plugin/cloudian'
4344

@@ -221,15 +222,7 @@ export function asyncRouterMap () {
221222
generateRouterMap(offering),
222223
generateRouterMap(config),
223224
generateRouterMap(tools),
224-
{
225-
path: '/usage',
226-
name: 'usage',
227-
title: 'label.usage.records',
228-
icon: 'ContainerOutlined',
229-
permission: ['listUsageRecords'],
230-
meta: { title: 'label.usage.records', icon: 'ContainerOutlined' },
231-
component: () => import('@/views/infra/UsageRecords.vue')
232-
},
225+
generateRouterMap(usage),
233226
generateRouterMap(quota),
234227
generateRouterMap(cloudian),
235228
{

ui/src/config/section/infra/usage.js

Lines changed: 0 additions & 328 deletions
This file was deleted.

ui/src/config/section/usage.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
export default {
19+
path: '/usage',
20+
name: 'usage',
21+
title: 'label.usage.records',
22+
icon: 'ContainerOutlined',
23+
permission: ['listUsageRecords'],
24+
meta: { title: 'label.usage.records', icon: 'ContainerOutlined' },
25+
component: () => import('@/views/infra/UsageRecords.vue')
26+
}

0 commit comments

Comments
 (0)