Skip to content

Commit 9a27cf8

Browse files
Pearl1594yadvr
Pearl1594
and
yadvr
committed
plugin: add support for Cloudian (#163)
This adds support for Cloudian UI plugin and some basic quota plugin. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Co-authored-by: Rohit Yadav <rohit@apache.org>
1 parent f8c0261 commit 9a27cf8

7 files changed

Lines changed: 234 additions & 22 deletions

File tree

‎ui/src/assets/icons/cloudian.svg‎

Lines changed: 87 additions & 0 deletions
Loading

‎ui/src/config/router.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import iam from '@/config/section/iam'
2929
import infra from '@/config/section/infra'
3030
import offering from '@/config/section/offering'
3131
import config from '@/config/section/config'
32-
import plugin from '@/config/section/plugin'
32+
import quota from '@/config/section/plugin/quota'
33+
import cloudian from '@/config/section/plugin/cloudian'
3334

3435
export function generateRouterMap (section) {
3536
var map = {
@@ -201,7 +202,8 @@ export const asyncRouterMap = [
201202
generateRouterMap(infra),
202203
generateRouterMap(offering),
203204
generateRouterMap(config),
204-
generateRouterMap(plugin),
205+
generateRouterMap(quota),
206+
generateRouterMap(cloudian),
205207

206208
{
207209
path: '/exception',

ui/src/config/section/plugin.js renamed to ui/src/config/section/plugin/cloudian.js

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,12 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18+
import cloudian from '@/assets/icons/cloudian.svg?inline'
19+
1820
export default {
19-
name: 'plugin',
20-
title: 'Plugins',
21-
icon: 'heat-map',
22-
children: [
23-
{
24-
name: 'quota',
25-
title: 'Quota',
26-
icon: 'pie-chart',
27-
permission: ['quotaSummary', 'quotaIsEnabled']
28-
},
29-
{
30-
name: 'cloudian',
31-
title: 'Cloudian Storage',
32-
icon: 'cloud-download',
33-
permission: ['cloudianSsoLogin', 'cloudianIsEnabled']
34-
}
35-
]
21+
name: 'cloudian',
22+
title: 'Cloudian Storage',
23+
icon: cloudian,
24+
permission: ['cloudianSsoLogin'],
25+
component: () => import('@/views/plugins/CloudianPlugin.vue')
3626
}

‎ui/src/config/section/plugin/quota.js‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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+
name: 'quota',
20+
title: 'Quota',
21+
icon: 'pie-chart',
22+
permission: ['quotaSummary'],
23+
children: [
24+
{
25+
name: 'quotasummary',
26+
title: 'Summary',
27+
icon: 'bars',
28+
permission: ['quotaSummary'],
29+
columns: ['account', 'domain', 'state', 'currency', 'balance', 'quota'],
30+
details: ['account', 'domain', 'state', 'currency', 'balance', 'quota', 'startdate', 'enddate']
31+
},
32+
{
33+
name: 'quotatariff',
34+
title: 'Tariff',
35+
icon: 'credit-card',
36+
permission: ['quotaTariffList'],
37+
columns: ['usageName', 'description', 'usageUnit', 'tariffValue'],
38+
details: ['usageName', 'description', 'usageUnit', 'tariffValue']
39+
},
40+
{
41+
name: 'quotaemailtemplate',
42+
title: 'Email Template',
43+
icon: 'mail',
44+
permission: ['quotaEmailTemplateList'],
45+
columns: ['templatetype', 'templatesubject', 'templatebody'],
46+
details: ['templatetype', 'templatesubject', 'templatebody']
47+
}
48+
]
49+
}

‎ui/src/store/getters.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ const getters = {
3030
addRouters: state => state.permission.addRouters,
3131
multiTab: state => state.app.multiTab,
3232
asyncJobIds: state => state.user.asyncJobIds,
33-
isLdapEnabled: state => state.user.isLdapEnabled
33+
isLdapEnabled: state => state.user.isLdapEnabled,
34+
cloudian: state => state.user.cloudian
3435
}
3536

3637
export default getters

‎ui/src/store/modules/user.js‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ const user = {
3232
features: {},
3333
project: {},
3434
asyncJobIds: [],
35-
isLdapEnabled: false
35+
isLdapEnabled: false,
36+
cloudian: {}
3637
},
3738

3839
mutations: {
@@ -66,6 +67,9 @@ const user = {
6667
SET_LDAP: (state, isLdapEnabled) => {
6768
state.isLdapEnabled = isLdapEnabled
6869
},
70+
SET_CLOUDIAN: (state, cloudian) => {
71+
state.cloudian = cloudian
72+
},
6973
RESET_THEME: (state) => {
7074
Vue.ls.set(DEFAULT_THEME, 'light')
7175
}
@@ -137,20 +141,37 @@ const user = {
137141
}).catch(error => {
138142
reject(error)
139143
})
144+
145+
api('cloudianIsEnabled').then(response => {
146+
const cloudian = response.cloudianisenabledresponse.cloudianisenabled || {}
147+
commit('SET_CLOUDIAN', cloudian)
148+
}).catch(ignored => {
149+
})
140150
})
141151
},
152+
142153
Logout ({ commit, state }) {
143154
return new Promise((resolve) => {
155+
var cloudianUrl = null
156+
if (state.cloudian.url && state.cloudian.enabled) {
157+
cloudianUrl = state.cloudian.url + 'logout.htm?redirect=' + encodeURIComponent(window.location.href)
158+
}
159+
144160
commit('SET_TOKEN', '')
145161
commit('SET_PROJECT', {})
146162
commit('SET_APIS', {})
163+
commit('SET_CLOUDIAN', {})
147164
commit('RESET_THEME')
148165
Vue.ls.remove(CURRENT_PROJECT)
149166
Vue.ls.remove(ACCESS_TOKEN)
150167
Vue.ls.remove(ASYNC_JOB_IDS)
151168

152169
logout(state.token).then(() => {
153-
resolve()
170+
if (cloudianUrl) {
171+
window.location.href = cloudianUrl
172+
} else {
173+
resolve()
174+
}
154175
}).catch(() => {
155176
resolve()
156177
})

‎ui/src/views/plugins/CloudianPlugin.vue‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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+
<template>
19+
<div>
20+
<span v-if="showError">
21+
<a-alert type="error" message="Single-Sign-On failed for Cloudian Management Console. Please ask your administrator to fix integration issues." showIcon />
22+
<br/>
23+
<a-button @click="doSso()">Try Again</a-button>
24+
</span>
25+
<span v-else>
26+
<a-alert type="info" message="Cloudian Management Console should open in another window" showIcon />
27+
</span>
28+
<br/>
29+
</div>
30+
</template>
31+
32+
<script>
33+
import { api } from '@/api'
34+
35+
export default {
36+
name: 'CloudianPlugin',
37+
mounted () {
38+
this.doSso()
39+
},
40+
data () {
41+
return {
42+
showError: false
43+
}
44+
},
45+
methods: {
46+
doSso () {
47+
api('cloudianSsoLogin').then(json => {
48+
const url = json.cloudianssologinresponse.cloudianssologin.url
49+
const cmcWindow = window.open(url, 'CMCWindow')
50+
cmcWindow.focus()
51+
}).catch(error => {
52+
this.$notification.error({
53+
message: 'Single-Sign-On Failed',
54+
description: error.response.headers['x-description'] || 'Request Failed',
55+
duration: 0
56+
})
57+
this.showError = true
58+
})
59+
}
60+
}
61+
}
62+
</script>

0 commit comments

Comments
 (0)