Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"sweetalert2": "^11.10.2",
"vue": "^3.4.0",
"vue-chartjs": "^5.3.1",
"vue-i18n": "11",
"vue-router": "^4.2.0",
"vue-socket.io-extended": "^4.2.0",
"vue3-apexcharts": "^1.5.2",
Expand Down
8 changes: 4 additions & 4 deletions client/src/components/accounts/index.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<v-container>
<v-tabs v-model="tab" background-color="primary" dark>
<v-tab>Users</v-tab>
<v-tab>Teams</v-tab>
<v-tab>Roles</v-tab>
<v-tab>Tokens</v-tab>
<v-tab>{{ $t('accounts.users') }}</v-tab>
<v-tab>{{ $t('accounts.teams') }}</v-tab>
<v-tab>{{ $t('accounts.roles') }}</v-tab>
<v-tab>{{ $t('accounts.tokens') }}</v-tab>
</v-tabs>
<v-tabs-window v-model="tab">
<v-tabs-window-item :value="0">
Expand Down
72 changes: 37 additions & 35 deletions client/src/components/accounts/roles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<template #top>
<v-text-field
v-model="search"
label="Search Roles"
:label="$t('roles.search')"
prepend-inner-icon="mdi-magnify"
single-line
hide-details
Expand Down Expand Up @@ -168,21 +168,21 @@
:disabled="!writeUserPermission"
>
<v-icon>mdi-plus</v-icon>
<span class="sr-only">Create Role</span>
<span class="sr-only">{{ $t('roles.actions.edit') }}</span>
</v-btn>
</div>

<!-- Dialog to edit a role -->
<v-dialog v-model="editDialog" max-width="500px">
<v-card>
<v-card-title>Edit Role</v-card-title>
<v-card-title>{{ $t('roles.actions.edit') }}</v-card-title>
<v-card-text>
<v-text-field v-model="editedRole.name" label="Role Name"></v-text-field>
<v-text-field v-model="editedRole.description" label="Descrioption"></v-text-field>
<v-table density="compact" class="mb-4">
<tbody>
<tr>
<td>App Permissions</td>
<td>{{ $t('roles.form.permissions.apps') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[0].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -192,7 +192,7 @@
</td>
</tr>
<tr>
<td>Pipeline Permissions</td>
<td>{{ $t('roles.form.permissions.pipelines') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[1].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -202,7 +202,7 @@
</td>
</tr>
<tr>
<td>User Permissions</td>
<td>{{ $t('roles.form.permissions.accounts') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[2].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -212,7 +212,7 @@
</td>
</tr>
<tr>
<td>Config Permissions</td>
<td>{{ $t('roles.form.permissions.settings') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[3].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -222,7 +222,7 @@
</td>
</tr>
<tr>
<td>Security Permissions</td>
<td>{{ $t('roles.form.permissions.security') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[4].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -232,7 +232,7 @@
</td>
</tr>
<tr>
<td>Token Permissions</td>
<td>{{ $t('roles.form.permissions.tokens') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="editedRole.permissions[5].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -242,25 +242,25 @@
</td>
</tr>
<tr>
<td>Audit</td>
<td>{{ $t('roles.form.permissions.audit') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="editedRole.permissions[6].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Console</td>
<td>{{ $t('roles.form.permissions.console') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="editedRole.permissions[7].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Logs</td>
<td>{{ $t('roles.form.permissions.logs') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="editedRole.permissions[8].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Reboot</td>
<td>{{ $t('roles.form.permissions.reboot') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="editedRole.permissions[9].action" label=""></v-switch>
</td>
Expand All @@ -286,7 +286,7 @@
<v-table density="compact" class="mb-4">
<tbody>
<tr>
<td>App Permissions</td>
<td>{{ $t('roles.form.permissions.apps') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[0].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -296,7 +296,7 @@
</td>
</tr>
<tr>
<td>Pipeline Permissions</td>
<td>{{ $t('roles.form.permissions.pipelines') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[1].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -306,7 +306,7 @@
</td>
</tr>
<tr>
<td>User Permissions</td>
<td>{{ $t('roles.form.permissions.accounts') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[2].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -316,7 +316,7 @@
</td>
</tr>
<tr>
<td>Config Permissions</td>
<td>{{ $t('roles.form.permissions.settings') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[3].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -326,7 +326,7 @@
</td>
</tr>
<tr>
<td>Security Permissions</td>
<td>{{ $t('roles.form.permissions.security') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[4].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -336,7 +336,7 @@
</td>
</tr>
<tr>
<td>Token Permissions</td>
<td>{{ $t('roles.form.permissions.tokens') }} {{ $t('roles.permission') }}</td>
<td>
<v-radio-group v-model="newRole.permissions[5].action" inline>
<v-radio label="none" value="none"></v-radio>
Expand All @@ -346,25 +346,25 @@
</td>
</tr>
<tr>
<td>Audit</td>
<td>{{ $t('roles.form.permissions.audit') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="newRole.permissions[6].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Console</td>
<td>{{ $t('roles.form.permissions.console') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="newRole.permissions[7].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Logs</td>
<td>{{ $t('roles.form.permissions.logs') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="newRole.permissions[8].action" label=""></v-switch>
</td>
</tr>
<tr>
<td>Reboot</td>
<td>{{ $t('roles.form.permissions.reboot') }}</td>
<td>
<v-switch color="primary" value="ok" false-value="none" v-model="newRole.permissions[9].action" label=""></v-switch>
</td>
Expand All @@ -386,10 +386,12 @@
import { defineComponent, ref, onMounted } from 'vue'
import axios from 'axios'
import { useAuthStore } from '../../stores/auth'
import { useI18n } from 'vue-i18n'

export default defineComponent({
name: 'RolesTable',
setup() {
const { t } = useI18n()
interface Role {
id: string | number;
name: string;
Expand Down Expand Up @@ -426,20 +428,20 @@ export default defineComponent({
const writeUserPermission = authStore.hasPermission('user:write')

const headers = [
{ title: 'Role', value: 'name' },
{ title: t('roles.name'), value: 'name' },
//{ title: 'Permissions', value: 'permissions' },
{ title: 'App', value: 'permissionsApp', align: 'center' as const },
{ title: 'Pipeline', value: 'permissionsPipeline', align: 'center' as const },
{ title: 'Accounts', value: 'permissionsAccount', align: 'center' as const},
{ title: 'Settings', value: 'permissionsConfig', align: 'center' as const},
{ title: 'Security', value: 'permissionsSecurity', align: 'center' as const},
{ title: 'Token', value: 'permissionsToken', align: 'center' as const},
{ title: 'Audit', value: 'permissionsAudit', align: 'center' as const},
{ title: 'Console', value: 'permissionsConsole', align: 'center' as const},
{ title: 'Logs', value: 'permissionsLogs', align: 'center' as const},
{ title: 'Reboot', value: 'permissionsReboot', align: 'center' as const},
{ title: t('roles.form.permissions.apps'), value: 'permissionsApp', align: 'center' as const },
{ title: t('roles.form.permissions.pipelines'), value: 'permissionsPipeline', align: 'center' as const },
{ title: t('roles.form.permissions.accounts'), value: 'permissionsAccount', align: 'center' as const},
{ title: t('roles.form.permissions.settings'), value: 'permissionsConfig', align: 'center' as const},
{ title: t('roles.form.permissions.security'), value: 'permissionsSecurity', align: 'center' as const},
{ title: t('roles.form.permissions.tokens'), value: 'permissionsToken', align: 'center' as const},
{ title: t('roles.form.permissions.audit'), value: 'permissionsAudit', align: 'center' as const},
{ title: t('roles.form.permissions.console'), value: 'permissionsConsole', align: 'center' as const},
{ title: t('roles.form.permissions.logs'), value: 'permissionsLogs', align: 'center' as const},
{ title: t('roles.form.permissions.reboot'), value: 'permissionsReboot', align: 'center' as const},

{ title: 'Actions', value: 'actions', sortable: false, align: 'end' as const },
{ title: '', value: 'actions', sortable: false, align: 'end' as const },
]

const loadRoles = async () => {
Expand Down
32 changes: 17 additions & 15 deletions client/src/components/accounts/teams.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<template #top>
<v-text-field
v-model="search"
label="Search Teams"
:label="$t('teams.search')"
prepend-inner-icon="mdi-magnify"
single-line
hide-details
Expand Down Expand Up @@ -75,50 +75,50 @@
:disabled="!writeUserPermission"
>
<v-icon>mdi-plus</v-icon>
<span class="sr-only">Create Team</span>
<span class="sr-only">{{ $t('teams.actions.create') }}</span>
</v-btn>
</div>

<!-- Dialog to edit a group -->
<v-dialog v-model="editDialog" max-width="500px">
<v-card>
<v-card-title>Edit Team</v-card-title>
<v-card-title>{{ $t('teams.actions.edit') }}</v-card-title>
<v-card-text>
<v-text-field v-model="editedTeam.name" label="Team Name"></v-text-field>
<v-text-field v-model="editedTeam.name" :label="$t('teams.form.name')"></v-text-field>
<v-text-field
v-model="editedTeam.description"
label="Description"
:label="$t('teams.form.description')"
type="text"
multiline
rows="2"
></v-text-field>
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn text @click="editDialog = false">Abort</v-btn>
<v-btn color="primary" @click="saveEdit">Save</v-btn>
<v-btn text @click="editDialog = false">{{ $t('global.abort') }}</v-btn>
<v-btn color="primary" @click="saveEdit">{{ $t('global.save') }}</v-btn>
</v-card-actions>
</v-card>
</v-dialog>

<!-- Dialog for a new Team -->
<v-dialog v-model="createDialog" max-width="500px">
<v-card>
<v-card-title>Create Team</v-card-title>
<v-card-title>{{ $t('teams.actions.create') }}</v-card-title>
<v-card-text>
<v-text-field v-model="newTeam.name" label="Team Name"></v-text-field>
<v-text-field v-model="newTeam.name" :label="$t('teams.form.name')"></v-text-field>
<v-text-field
v-model="newTeam.description"
label="Description"
:label="$t('teams.form.description')"
type="text"
multiline
rows="2"
></v-text-field>
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn text @click="createDialog = false">Abort</v-btn>
<v-btn color="primary" @click="saveCreate">Create</v-btn>
<v-btn text @click="createDialog = false">{{ $t('global.abort') }}</v-btn>
<v-btn color="primary" @click="saveCreate">{{ $t('global.create') }}</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
Expand All @@ -129,10 +129,12 @@
import { defineComponent, ref, onMounted } from 'vue'
import axios from 'axios'
import { useAuthStore } from '../../stores/auth'
import { useI18n } from 'vue-i18n'

export default defineComponent({
name: 'TeamsTable',
setup() {
const { t } = useI18n()
interface Team {
id?: string;
name: string;
Expand All @@ -150,9 +152,9 @@ export default defineComponent({
const writeUserPermission = authStore.hasPermission('user:write')

const headers = [
{ title: 'Team', value: 'name' },
{ title: 'Description', value: 'description' },
{ title: 'Actions', value: 'actions', sortable: false, align: 'end' as const },
{ title: t('teams.name'), value: 'name' },
{ title: t('teams.form.description'), value: 'description' },
{ title: '', value: 'actions', sortable: false, align: 'end' as const },
]

const loadTeams = async () => {
Expand Down
14 changes: 8 additions & 6 deletions client/src/components/accounts/tokens.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<template #top>
<v-text-field
v-model="search"
label="Search Tokens"
:label="$t('tokens.search')"
prepend-inner-icon="mdi-magnify"
single-line
hide-details
Expand Down Expand Up @@ -88,10 +88,12 @@
import { defineComponent, ref, onMounted } from 'vue'
import axios from 'axios'
import { useAuthStore } from '../../stores/auth'
import { useI18n } from 'vue-i18n'

export default defineComponent({
name: 'TokensTable',
setup() {
const { t } = useI18n()
interface Token {
id?: string;
token?: string;
Expand All @@ -113,11 +115,11 @@ export default defineComponent({
const writeUserPermission = ref(authStore.hasPermission('user:write'))

const headers = [
{ title: 'Token ID', value: 'token' },
{ title: 'Name', value: 'name' },
{ title: 'Owner', value: 'user.username' },
{ title: 'Expires At', value: 'expiresAt' },
{ title: 'Actions', value: 'actions', sortable: false, align: 'end' as const },
{ title: t('tokens.form.id'), value: 'token' },
{ title: t('tokens.form.name'), value: 'name' },
{ title: t('tokens.form.owner'), value: 'user.username' },
{ title: t('tokens.form.expiresAt'), value: 'expiresAt' },
{ title: '', value: 'actions', sortable: false, align: 'end' as const },
]

const loadTokens = async () => {
Expand Down
Loading
Loading