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

feat: add multi-enum support for survey variables #2754

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+30 −8
Open

feat: add multi-enum support for survey variables #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d3e66
feat: add multi-enum support for survey variables
Arielgordon123 Feb 19, 2025
8e3052c
fix: fix multi enum type
Arielgordon123 Feb 19, 2025
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
7 changes: 4 additions & 3 deletions db/Template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ func (t TemplateApp) IsTerraform() bool {
type SurveyVarType string

const (
SurveyVarStr TemplateType = ""
SurveyVarInt TemplateType = "int"
SurveyVarEnum TemplateType = "enum"
SurveyVarStr TemplateType = ""
SurveyVarInt TemplateType = "int"
SurveyVarEnum TemplateType = "enum"
SurveyVarMultiEnum TemplateType = "multi_enum"
)

type TerraformTemplateParams struct {
Expand Down
10 changes: 7 additions & 3 deletions web/src/components/SurveyVars.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
></v-select>

<v-data-table
v-if="editedVar.type === 'enum'"
v-if="editedVar.type === 'enum' || editedVar.type === 'multi_enum'"
:items="editedValues"
:items-per-page="-1"
class="elevation-1"
Expand Down Expand Up @@ -91,7 +91,8 @@

<v-btn
color="primary"
v-if="editedVar.type === 'enum'"
class="d-block"
v-if="editedVar.type === 'enum' || editedVar.type === 'multi_enum'"
@click="addEditedVarValue()"
>Add Value</v-btn>
</div>
Expand Down Expand Up @@ -186,6 +187,9 @@ export default {
}, {
id: 'enum',
name: 'Enum',
}, {
id: 'multi_enum',
name: 'Multi Enum',
}],
formError: null,
};
Expand Down Expand Up @@ -228,7 +232,7 @@ export default {
return;
}

if (this.editedVar.type === 'enum') {
if (this.editedVar.type === 'enum' || this.editedVar.type === 'multi_enum') {
if (this.editedValues.length === 0) {
this.formError = 'Enumeration must have values.';
return;
Expand Down
20 changes: 18 additions & 2 deletions web/src/components/TaskForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<v-select
clearable
v-else-if="v.type === 'enum'"
v-else-if="v.type === 'enum' || v.type === 'multi_enum'"
:label="v.title + (v.required ? ' *' : '')"
:hint="v.description"
v-model="editedEnvironment[v.name]"
Expand All @@ -76,7 +76,19 @@
:items="v.values"
item-text="name"
item-value="value"
/>
:multiple="v.type === 'multi_enum'"
:chips="v.type === 'multi_enum'"
>
<template v-if="v.type === 'multi_enum'" v-slot:selection="{ item, index }">
<v-chip
small
close
@click:close="deleteItem(v.name, index)"
>
{{ item.name }}
</v-chip>
</template>
</v-select>

<v-text-field
v-else
Expand Down Expand Up @@ -212,6 +224,10 @@ export default {
this.item.arguments = JSON.stringify(args || []);
},

deleteItem(name, index) {
this.editedEnvironment[name].splice(index, 1);
},

getTaskMessage(task) {
let buildTask = task;

Expand Down
1 change: 1 addition & 0 deletions web/src/lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export default {
key: '{expr}',
surveyVariables: 'Survey Variables',
addVariable: 'Add variable',
allowMultipleValues: 'Allow multiple values',
vaultName: 'Vault ID (optional)',
vaultNameDefault: 'Only one `default` (empty) name may exist',
vaultNameUnique: 'Must be unique',
Expand Down
Loading