Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1095/team settings #1101

Merged
merged 10 commits into from
Nov 18, 2021
Merged

1095/team settings #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da7cd48
implemented new custom inputs in automations dashboard and pager-duty…
stackoverfloweth Oct 28, 2021
7395752
implemented new custom inputs in team-settings
stackoverfloweth Oct 28, 2021
15f0884
code review changes
stackoverfloweth Nov 4, 2021
7d839f7
Merge branch 'master' into 1095/team-settings
zhen0 Nov 12, 2021
87e236a
code review fixes
stackoverfloweth Nov 16, 2021
27f1e61
code review changes
stackoverfloweth Nov 16, 2021
25513dc
Merge branch 'master' into 1095/team-settings
zhen0 Nov 17, 2021
b0b84e9
Merge branch 'master' into 1095/team-settings
zhen0 Nov 18, 2021
6069883
Merge branch 'master' into 1095/team-settings
zhen0 Nov 18, 2021
33803f4
Merge branch 'master' into 1095/team-settings
Nov 18, 2021
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
22 changes: 14 additions & 8 deletions src/pages/TeamSettings/Actions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import Alert from '@/components/Alert'
import ConfirmDialog from '@/components/ConfirmDialog'
import ExternalLink from '@/components/ExternalLink'
import ManagementLayout from '@/layouts/ManagementLayout'
import DictInput from '@/components/CustomInputs/DictInput'
import DictInput from '@/components/CustomInputs/DictInput2'
import { formatJson } from '@/utils/json'

export default {
components: {
Alert,
Expand Down Expand Up @@ -122,7 +124,9 @@ export default {
this.alertMessage = message
this.alertShow = true
},

formatItemValue(item) {
return formatJson(item?.action_config)
},
async removeAction() {
this.isRemovingAction = true
try {
Expand Down Expand Up @@ -264,17 +268,19 @@ export default {
</template>

<!-- ACTION CONFIG -->
<template v-slot:expanded-item="{ headers, item }">
<template #expanded-item="{ headers, item }">
<td
v-if="Object.keys(item.action_config).length"
:colspan="headers.length"
>
<DictInput
<dict-input
v-if="Object.keys(item.action_config).length"
:disableEdit="true"
disabled
:dict="item.action_config"
:rules="[1, 2]"
class="mt-3"
readonly-key
readonly-value
disable-add
disable-remove
:value="formatItemValue(item)"
zhen0 marked this conversation as resolved.
Show resolved Hide resolved
/>
</td>
<td v-else :colspan="headers.length">
Expand Down
Loading