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

fix(edge-stack) always show edge group selector [EE-5157] (#8639)

pull/8647/head
cmeng 2023-03-10 10:48:44 +13:00 committed by GitHub
parent 31d956dbcb
commit 0ab7987684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/edge/react/components/index.ts
View File

@ -7,12 +7,13 @@ import { EdgeCheckinIntervalField } from '@/react/edge/components/EdgeCheckInInt
import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm'; import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm';
import { EdgeAsyncIntervalsForm } from '@/react/edge/components/EdgeAsyncIntervalsForm'; import { EdgeAsyncIntervalsForm } from '@/react/edge/components/EdgeAsyncIntervalsForm';
import { EdgeStackDeploymentTypeSelector } from '@/react/edge/edge-stacks/components/EdgeStackDeploymentTypeSelector'; import { EdgeStackDeploymentTypeSelector } from '@/react/edge/edge-stacks/components/EdgeStackDeploymentTypeSelector';
import { withUIRouter } from '@/react-tools/withUIRouter';
export const componentsModule = angular export const componentsModule = angular
.module('portainer.edge.react.components', []) .module('portainer.edge.react.components', [])
.component( .component(
'edgeGroupsSelector', 'edgeGroupsSelector',
r2a(withReactQuery(EdgeGroupsSelector), [ r2a(withUIRouter(withReactQuery(EdgeGroupsSelector)), [
'onChange', 'onChange',
'value', 'value',
'error', 'error',

1
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
View File

@ -86,7 +86,6 @@ export default class CreateEdgeStackViewController {
async $onInit() { async $onInit() {
try { try {
this.edgeGroups = await this.EdgeGroupService.groups(); this.edgeGroups = await this.EdgeGroupService.groups();
this.noGroups = this.edgeGroups.length === 0;
} catch (err) { } catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve Edge groups'); this.Notifications.error('Failure', err, 'Unable to retrieve Edge groups');
} }

2
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
View File

@ -39,7 +39,7 @@
</div> </div>
<!-- !name-input --> <!-- !name-input -->
<edge-groups-selector ng-if="!$ctrl.noGroups" value="$ctrl.formValues.Groups" on-change="($ctrl.onChangeGroups)" items="$ctrl.edgeGroups"></edge-groups-selector> <edge-groups-selector value="$ctrl.formValues.Groups" on-change="($ctrl.onChangeGroups)" items="$ctrl.edgeGroups"></edge-groups-selector>
<edge-stack-deployment-type-selector <edge-stack-deployment-type-selector
value="$ctrl.formValues.DeploymentType" value="$ctrl.formValues.DeploymentType"

6
app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx
View File

@ -64,11 +64,7 @@ function InnerSelector({
}) { }) {
const edgeGroupsQuery = useEdgeGroups(); const edgeGroupsQuery = useEdgeGroups();
if (!edgeGroupsQuery.data) { const items = (edgeGroupsQuery.data || []).filter(isGroupVisible);
return null;
}
const items = edgeGroupsQuery.data.filter(isGroupVisible);
const valueGroups = _.compact( const valueGroups = _.compact(
value.map((id) => items.find((item) => item.Id === id)) value.map((id) => items.find((item) => item.Id === id))