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

fix(tags): get tags when loading associated endpoints selector EE-4140 (#7857)

pull/7865/head
matias-portainer 2022-10-13 11:03:19 -03:00 committed by GitHub
parent 7a6ff10268
commit 8f1ac38963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/portainer/components/associated-endpoints-selector/associatedEndpointsSelectorController.js
View File

@ -3,6 +3,7 @@ import _ from 'lodash-es';
import { EdgeTypes } from '@/portainer/environments/types'; import { EdgeTypes } from '@/portainer/environments/types';
import { getEnvironments } from '@/portainer/environments/environment.service'; import { getEnvironments } from '@/portainer/environments/environment.service';
import { getTags } from '@/portainer/tags/tags.service';
class AssoicatedEndpointsSelectorController { class AssoicatedEndpointsSelectorController {
/* @ngInject */ /* @ngInject */
@ -47,6 +48,7 @@ class AssoicatedEndpointsSelectorController {
} }
loadData() { loadData() {
this.getTags();
this.getAvailableEndpoints(); this.getAvailableEndpoints();
this.getAssociatedEndpoints(); this.getAssociatedEndpoints();
} }
@ -79,6 +81,14 @@ class AssoicatedEndpointsSelectorController {
this.setTableData('associated', response.value, response.totalCount); this.setTableData('associated', response.value, response.totalCount);
}); });
} }
getTags() {
return this.$async(async () => {
let tags = { value: [], totalCount: 0 };
tags = await getTags();
this.tags = tags;
});
}
/* #endregion */ /* #endregion */
/* #region On endpoint click (either available or associated) */ /* #region On endpoint click (either available or associated) */

2
app/portainer/helpers/tagHelper.js
View File

@ -1,7 +1,7 @@
import _ from 'lodash'; import _ from 'lodash';
export function idsToTagNames(tags, ids) { export function idsToTagNames(tags, ids) {
const filteredTags = _.filter(tags, (tag) => _.includes(ids, tag.Id)); const filteredTags = _.filter(tags, (tag) => _.includes(ids, tag.ID));
const tagNames = _.map(filteredTags, 'Name'); const tagNames = _.map(filteredTags, 'Name');
return tagNames; return tagNames;
} }