Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
03a172c
add tungsten fabric
Oct 7, 2021
64f41ab
revert deleted file
Oct 14, 2021
1692c48
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Nov 16, 2021
57f2fcc
Merge branch 'main' into feature/ui-tungsten-intergation
Jan 19, 2022
6b01907
Merge branch 'main' into feature/ui-tungsten-intergation
Feb 15, 2022
f3e0c31
changes logical
Feb 17, 2022
ea2755a
Merge branch 'main' into feature/ui-tungsten-intergation
Feb 25, 2022
36bf0b6
add tungsten network routing policy
Feb 25, 2022
d62d102
fixes add routing policy
Feb 28, 2022
8462049
fixes
Mar 7, 2022
13f1128
fixes
Mar 7, 2022
5699072
add tungsten network service provider & hidden tabs
Mar 8, 2022
09374ac
fixes router link of tungsten
Mar 8, 2022
64730f6
fixes undefined table
Mar 8, 2022
3fa9a42
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 11, 2022
0bcf1ff
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 11, 2022
21d3e9b
fixes
Mar 11, 2022
c853532
fixes
Mar 11, 2022
26f3fe7
add default value
Mar 11, 2022
9daf037
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 14, 2022
dc96e25
fixes style, errors
Mar 14, 2022
e5bc3dd
fixes vue3 error
Mar 14, 2022
5836696
fixes
Mar 14, 2022
1d05776
fixes add routing policy
Mar 14, 2022
2c3acfd
fixes add routing policy term
Mar 14, 2022
44e96d1
fixes action detail
Mar 15, 2022
b71d212
fixes function name
Mar 15, 2022
f3a0ca0
fixes create tungsten zone
Mar 16, 2022
7fa296f
rename function
Mar 16, 2022
4d905df
fixes
Mar 16, 2022
96a6ac7
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 16, 2022
7a8cfcd
format en.json
Mar 16, 2022
7e87895
fixes
Mar 16, 2022
156a5f0
fixes
Mar 16, 2022
ed30889
fixes network routing policy
Mar 16, 2022
1abf264
translate message
Mar 16, 2022
a913d82
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 23, 2022
267b795
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Sep 15, 2022
d8d86af
fix conflit
Sep 16, 2022
2eddd7a
Merge branch 'main' into feature/ui-tungsten-intergation
Oct 6, 2022
96db9f3
update custom columns
Oct 7, 2022
16b0002
remove Tungsten Fabric Routing tab
Oct 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 257 additions & 28 deletions ui/public/locales/en.json

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions ui/src/assets/icons/tungsten.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions ui/src/components/view/ListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<a-menu>
<a-menu-item v-for="(column, idx) in columnKeys" :key="idx" @click="updateSelectedColumns(column)">
<a-checkbox :id="idx.toString()" :checked="selectedColumns.includes(getColumnKey(column))"/>
{{ $t('label.' + String(getColumnKey(column)).toLowerCase()) }}
{{ $t('label.' + String(getColumTitle(column)).toLowerCase()) }}
</a-menu-item>
</a-menu>
</div>
Expand Down Expand Up @@ -109,6 +109,15 @@
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
</span>
<span v-else-if="$route.path.startsWith('/tungstenfabric')">
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
</span>
<span v-else-if="isTungstenPath()">
<router-link :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: record.zoneid } }" v-if="record.uuid && record.zoneid">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: $route.query.zoneid } }" v-else-if="record.uuid && $route.query.zoneid">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
</span>
<span v-else>
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
Expand Down Expand Up @@ -510,14 +519,19 @@ export default {
}
},
methods: {
isTungstenPath () {
return ['/tungstennetworkroutertable', '/tungstenpolicy', '/tungsteninterfaceroutertable',
'/tungstenpolicyset', '/tungstenroutingpolicy', '/firewallrule', '/tungstenfirewallpolicy'].includes(this.$route.path)
},
quickViewEnabled () {
return new RegExp(['/vm', '/kubernetes', '/ssh', '/userdata', '/vmgroup', '/affinitygroup',
'/volume', '/snapshot', '/vmsnapshot', '/backup',
'/guestnetwork', '/vpc', '/vpncustomergateway',
'/template', '/iso',
'/project', '/account',
'/zone', '/pod', '/cluster', '/host', '/storagepool', '/imagestore', '/systemvm', '/router', '/ilbvm', '/annotation',
'/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering'].join('|'))
'/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering',
'/tungstenfabric'].join('|'))
.test(this.$route.path)
},
enableGroupAction () {
Expand Down Expand Up @@ -782,6 +796,12 @@ export default {
return host.state
},
getColumnKey (name) {
if (typeof name === 'object') {
name = Object.keys(name).includes('field') ? name.field : name.customTitle
}
return name
},
getColumTitle (name) {
if (typeof name === 'object') {
name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/view/NicNetworkSelectForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
v-model:value="searchQuery"
style="margin-bottom: 10px;"
@search="fetchNetworks"
autoFocus />
v-focus="true" />
<a-table
size="small"
style="overflow-y: auto"
Expand Down
9 changes: 7 additions & 2 deletions ui/src/components/view/ResourceView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
:tab="tabs[0].name" />
</keep-alive>
<a-tabs
v-else
style="width: 100%"
:class="[{ 'custom-tab': tabs.length > 9 }]"
:animated="false"
:activeKey="activeTab || tabs[0].name"
@change="onTabChange" >
Expand Down Expand Up @@ -187,5 +187,10 @@ export default {
}
</script>

<style lang="less" scoped>
<style lang="less">
.custom-tab {
.ant-tabs-bar {
display: grid;
}
}
</style>
2 changes: 1 addition & 1 deletion ui/src/components/view/StoragePoolSelectView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
v-model:value="searchQuery"
style="margin-bottom: 10px;"
@search="fetchStoragePools"
autoFocus />
v-focus="true" />
<a-table
size="small"
style="overflow-y: auto"
Expand Down
12 changes: 10 additions & 2 deletions ui/src/components/widgets/Breadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@
<a-breadcrumb class="breadcrumb">
<a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
<router-link
v-if="item && item.name"
v-if="item && item.name && !tungstenPaths.includes(item.path)"
:to="{ path: item.path === '' ? '/' : item.path }"
>
<render-icon v-if="index == 0" :icon="item.meta.icon" style="font-size: 16px" @click="resetToMainView" />
<span v-if="item.meta.title">{{ $t(item.meta.title) }}</span>
</router-link>
<router-link
v-else-if="tungstenPaths.includes(item.path)"
:to="{ path: item.path === '' ? '/' : item.path, query: { zoneid: $route.query.zoneid } }">
<render-icon v-if="index == 0" :icon="item.meta.icon" style="font-size: 16px" @click="resetToMainView" />
{{ $t(item.meta.title) }}
</router-link>
<span v-else-if="$route.params.id">
<label
v-if="'name' in resource &&
Expand Down Expand Up @@ -75,7 +81,9 @@ export default {
data () {
return {
name: '',
breadList: []
breadList: [],
tungstenPaths: ['/tungstennetworkroutertable', '/tungstenpolicy', '/tungsteninterfaceroutertable',
'/tungstenpolicyset', '/tungstenroutingpolicy', '/firewallrule', '/tungstenfirewallpolicy']
}
},
created () {
Expand Down
Loading