Added Tags for Organizational Management #369
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,6 +257,36 @@ | |
| @save="putFlag(flag)" | ||
| ></markdown-editor> | ||
| </el-row> | ||
| <el-row style="margin: 10px;"> | ||
| <h5> | ||
| <span style="margin-right: 10px;">Tags</span> | ||
| </h5> | ||
| </el-row> | ||
| <el-row> | ||
| <div class="tags-container-inner"> | ||
| <el-tag v-for="tag in flag.tags" | ||
| :key="tag.id" | ||
| closable | ||
| :type="warning" | ||
| @close="deleteTag(tag)"> | ||
| {{tag.value}} | ||
| </el-tag> | ||
| <el-autocomplete | ||
| class="tag-key-input" | ||
| v-if="tagInputVisible" | ||
| v-model="newTag.value" | ||
| ref="saveTagInput" | ||
| size="mini" | ||
| :trigger-on-focus="false" | ||
| :fetch-suggestions="queryTags" | ||
| @select="createTag" | ||
| @keyup.enter.native="createTag" | ||
| @keyup.esc.native="cancelCreateTag" | ||
| > | ||
| </el-autocomplete> | ||
| <el-button v-else class="button-new-tag" size="small" @click="showTagInput">+ New Tag</el-button> | ||
| </div> | ||
| </el-row> | ||
| </el-card> | ||
| </el-card> | ||
|
|
||
|
|
@@ -691,6 +721,10 @@ const DEFAULT_VARIANT = { | |
| key: "", | ||
| }; | ||
|
|
||
| const DEFAULT_TAG = { | ||
| value: "", | ||
| }; | ||
|
|
||
| const DEFAULT_DISTRIBUTION = { | ||
| bitmap: "", | ||
| variantID: 0, | ||
|
|
@@ -725,7 +759,9 @@ export default { | |
| dialogEditDistributionOpen: false, | ||
| dialogCreateSegmentOpen: false, | ||
| entityTypes: [], | ||
| allTags: [], | ||
| allowCreateEntityType: true, | ||
| tagInputVisible: false, | ||
| flag: { | ||
| createdBy: "", | ||
| dataRecordsEnabled: false, | ||
|
|
@@ -734,13 +770,15 @@ export default { | |
| enabled: false, | ||
| id: 0, | ||
| key: "", | ||
| tags:[], | ||
| segments: [], | ||
| updatedAt: "", | ||
| variants: [], | ||
| notes: "", | ||
| }, | ||
| newSegment: clone(DEFAULT_SEGMENT), | ||
| newVariant: clone(DEFAULT_VARIANT), | ||
| newTag: clone(DEFAULT_TAG), | ||
| selectedSegment: null, | ||
| newDistributions: {}, | ||
| operatorOptions: operators, | ||
|
|
@@ -896,6 +934,60 @@ export default { | |
| this.$message.success("variant updated"); | ||
| }, handleErr.bind(this)); | ||
| }, | ||
| createTag() { | ||
| Axios.post( | ||
| `${API_URL}/flags/${this.flagId}/tags`, | ||
| this.newTag | ||
| ).then((response) => { | ||
| let tag = response.data; | ||
| this.newTag = clone(DEFAULT_TAG); | ||
| if (!this.flag.tags.map((tag) => tag.value).includes(tag.value)) { | ||
| this.flag.tags.push(tag); | ||
| this.$message.success("new tag created"); | ||
| } | ||
| this.tagInputVisible = false; | ||
| this.loadAllTags(); | ||
| }, handleErr.bind(this)); | ||
| }, | ||
| cancelCreateTag() { | ||
| this.newTag = clone(DEFAULT_TAG); | ||
| this.tagInputVisible = false; | ||
| }, | ||
| queryTags(queryString, cb) { | ||
| let results = this.allTags.filter((tag) => tag.value.toLowerCase().includes(queryString.toLowerCase())); | ||
| cb(results); | ||
| }, | ||
| loadAllTags() { | ||
| Axios.get( | ||
| `${API_URL}/tags` | ||
|
There was a problem hiding this comment. I noticed that even when we delete the tag from across flags, it still shows up in the autocomplete. There was a problem hiding this comment. This is actually intended for the Flags delete, because it simply removes the reference to the Tag from the Flag and not the actual Tag itself because it could be referenced by another Flag. Let us know if there's another way you'd like to handle this. There was a problem hiding this comment. @zhouzhuojie, I was talking to @bradphilips and a couple of our other Flagr users, and we wondered if this would be a preferred way to handle this anyway. It would keep us from creating and deleting the same tag over and over if it goes in and out of use. Brad also mentioned an option to search for any flags with the removed tag and fully delete the tag if there aren't any. I can see an argument for doing that to prevent unused tags from sticking around. Personally, I like leaving them the way it's currently set up, but I don't think we'd argue if you want to fully delete the tags. |
||
| ).then((response) => { | ||
| let result = response.data; | ||
| this.allTags = result; | ||
| }, handleErr.bind(this)); | ||
| }, | ||
| showTagInput() { | ||
| this.tagInputVisible = true; | ||
| this.$nextTick(() => { | ||
| this.$refs.saveTagInput.$refs.input.focus(); | ||
| }); | ||
| }, | ||
| deleteTag(tag) { | ||
| if ( | ||
| !confirm( | ||
| `Are you sure you want to delete tag #${tag.value}` | ||
| ) | ||
| ) { | ||
| return; | ||
| } | ||
|
|
||
| Axios.delete( | ||
| `${API_URL}/flags/${this.flagId}/tags/${tag.id}` | ||
| ).then(() => { | ||
| this.$message.success("tag deleted"); | ||
| this.fetchFlag(); | ||
| this.loadAllTags(); | ||
| }, handleErr.bind(this)); | ||
| }, | ||
| createConstraint(segment) { | ||
| Axios.post( | ||
| `${API_URL}/flags/${this.flagId}/segments/${segment.id}/constraints`, | ||
|
|
@@ -1016,6 +1108,7 @@ export default { | |
| }, | ||
| mounted() { | ||
| this.fetchFlag(); | ||
| this.loadAllTags(); | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
@@ -1157,4 +1250,17 @@ ol.constraints-inner { | |
| .save-remove-variant-row { | ||
| padding-bottom: 5px; | ||
| } | ||
|
|
||
| .tag-key-input { | ||
| margin: 2.5px; | ||
| width: 20%; | ||
| } | ||
|
|
||
| .tags-container-inner { | ||
| margin-bottom: 10px; | ||
| } | ||
|
|
||
| .button-new-tag { | ||
| margin: 2.5px; | ||
| } | ||
| </style> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think if we set trigger-on-focus to true, it helps to standardize tags creation and reduce typos
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zhouzhuojie this was set to false because focus was triggering a save operation which we didn't want, requiring the saveTagInput method have to handle or ignore values that are empty but would still cancel your operation when tabbed away. This conflicts with entry process we're using with the save on enter and cancel.