Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(edge): filtering of edge devices [EE-3210] (#7077)

Browse source 
* fix(edge): filtering of edge devices [EE-3210]

fixes [EE-3210]

changes:
- replaces `edgeDeviceFilter` with two filters:
	- `edgeDevice`
	- `edgeDeviceUntrusted`

these filters will only apply to the edge endpoints in the query (so it's possible to get both regular endpoints and edge devices).

if `edgeDevice` is true, will filter out edge agents which are not an edge device.
			false, will filter out edge devices

`edgeDeviceUntrusted` applies only when `edgeDevice` is true. then false (default) will hide the untrusted edge devices, true will show only untrusted edge devices.

fix(edge/job-create): retrieve only trusted endpoints + fix endpoint selector pagination limits onChange

fix(endpoint-groups): remove listing of untrusted edge envs (aka in waiting room)

refactor(endpoints): move filter to another function

feat(endpoints): separate edge filters

refactor(environments): change getEnv api

refactor(endpoints): use single getEnv

feat(groups): show error when failed loading envs

style(endpoints): remove unused endpointsByGroup

* chore(deps): update go to 1.18

* fix(endpoint): filter out untrusted by default

* fix(edge): show correct endpoints

* style(endpoints): fix typo

* fix(endpoints): fix swagger

* fix(admin): use new getEnv function

Co-authored-by: LP B <xAt0mZ@users.noreply.github.com>
This commit is contained in:
Chaim Lev-Ari 2022-07-19 18:00:45 +02:00 • committed by GitHub
parent 1a8fe82821
commit 05357ecce5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 868 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/NameField.tsx
View file

@ -2,7 +2,7 @@ import { Field, useField } from 'formik';
import { string } from 'yup';
import { debounce } from 'lodash';
import { getEndpoints } from '@/portainer/environments/environment.service';
import { getEnvironments } from '@/portainer/environments/environment.service';
import { FormControl } from '@@/form-components/FormControl';
import { Input } from '@@/form-components/Input';
@ -30,13 +30,13 @@ export function NameField({ readonly }: Props) {
);
}
async function isNameUnique(name?: string) {
export async function isNameUnique(name?: string) {
if (!name) {
return true;
}
try {
const result = await getEndpoints(0, 1, { name });
const result = await getEnvironments({ limit: 1, query: { name } });
if (result.totalCount > 0) {
return false;
}