github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(app/endpoint-group): replace the tag dropdown by isteven-multi-select (#4714) 

* feat-app/endpoint-group): replace the tag dropdown by isteven-multi-select

* feat(app/endpoint-group): fix the dropdown height

* feat(app/tag-selector): remove the slice on filtered tags and add some style to fix the dropdown height
pull/4889/head
Alice Groux 2021-02-19 23:26:32 +01:00 committed by GitHub
parent 3339ed9509
commit 3b4afe838c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/css/app.css
View File

@ -1016,3 +1016,10 @@ json-tree .branch-preview {
.w-full { .w-full {
width: 100%; width: 100%;
} }
/* uib-typeahead override */
#scrollable-dropdown-menu .dropdown-menu {
max-height: 300px;
overflow-y: auto;
}
/* !uib-typeahead override */

2
app/portainer/components/tag-selector/tagSelector.html
View File

@ -15,7 +15,7 @@
<label for="tags" class="col-sm-3 col-lg-2 control-label text-left"> <label for="tags" class="col-sm-3 col-lg-2 control-label text-left">
Tags Tags
</label> </label>
<div class="col-sm-9 col-lg-10" ng-if="$ctrl.allowCreate || $ctrl.tags.length > 0"> <div class="col-sm-9 col-lg-10" id="scrollable-dropdown-menu" ng-if="$ctrl.allowCreate || $ctrl.tags.length > 0">
<input <input
type="text" type="text"
ng-model="$ctrl.state.selectedValue" ng-model="$ctrl.state.selectedValue"

6
app/portainer/components/tag-selector/tagSelectorController.js
View File

@ -29,16 +29,16 @@ class TagSelectorController {
filterTags(searchValue) { filterTags(searchValue) {
let filteredTags = _.filter(this.tags, (tag) => !_.includes(this.model, tag.Id)); let filteredTags = _.filter(this.tags, (tag) => !_.includes(this.model, tag.Id));
if (!searchValue) { if (!searchValue) {
return filteredTags.slice(0, 7); return filteredTags;
} }
const exactTag = _.find(this.tags, (tag) => tag.Name === searchValue); const exactTag = _.find(this.tags, (tag) => tag.Name === searchValue);
filteredTags = _.filter(filteredTags, (tag) => _.includes(tag.Name.toLowerCase(), searchValue.toLowerCase())); filteredTags = _.filter(filteredTags, (tag) => _.includes(tag.Name.toLowerCase(), searchValue.toLowerCase()));
if (exactTag || !this.allowCreate) { if (exactTag || !this.allowCreate) {
return filteredTags.slice(0, 7); return filteredTags;
} }
return filteredTags.slice(0, 6).concat({ Name: `Create "${searchValue}"`, create: true, value: searchValue }); return filteredTags.concat({ Name: `Create "${searchValue}"`, create: true, value: searchValue });
} }
generateSelectedTags(model, tags) { generateSelectedTags(model, tags) {