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

fix(docker/containers): show teaser for webhook

refactor/EE-2307/EE-5207/container-base-form
Chaim Lev-Ari 2023-09-26 10:16:21 +03:00
parent 3b96877616
commit 46c278ffc9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/docker/views/containers/create/createContainerController.js
View File

@ -1,7 +1,6 @@
import _ from 'lodash-es'; import _ from 'lodash-es';
import { confirmDestructive } from '@@/modals/confirm'; import { confirmDestructive } from '@@/modals/confirm';
import { FeatureId } from '@/react/portainer/feature-flags/enums';
import { buildConfirmButton } from '@@/modals/utils'; import { buildConfirmButton } from '@@/modals/utils';
import { commandsTabUtils } from '@/react/docker/containers/CreateView/CommandsTab'; import { commandsTabUtils } from '@/react/docker/containers/CreateView/CommandsTab';
@ -77,9 +76,9 @@ angular.module('portainer.docker').controller('CreateContainerController', [
$scope.create = create; $scope.create = create;
$scope.endpoint = endpoint; $scope.endpoint = endpoint;
$scope.containerWebhookFeature = FeatureId.CONTAINER_WEBHOOK;
$scope.isAdmin = Authentication.isAdmin(); $scope.isAdmin = Authentication.isAdmin();
const userDetails = this.Authentication.getUserDetails(); const userDetails = Authentication.getUserDetails();
$scope.formValues = { $scope.formValues = {
commands: commandsTabUtils.getDefaultViewModel(), commands: commandsTabUtils.getDefaultViewModel(),

2
app/react/docker/containers/CreateView/BaseForm/BaseForm.tsx
View File

@ -9,6 +9,7 @@ import { NodeSelector } from '@/react/docker/agent/NodeSelector';
import { useIsSwarm } from '@/react/docker/proxy/queries/useInfo'; import { useIsSwarm } from '@/react/docker/proxy/queries/useInfo';
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
import { isAgentEnvironment } from '@/react/portainer/environments/utils'; import { isAgentEnvironment } from '@/react/portainer/environments/utils';
import { FeatureId } from '@/react/portainer/feature-flags/enums';
import { FormControl } from '@@/form-components/FormControl'; import { FormControl } from '@@/form-components/FormControl';
import { FormSection } from '@@/form-components/FormSection'; import { FormSection } from '@@/form-components/FormSection';
@ -119,6 +120,7 @@ export function BaseForm({
onChange={(enableWebhook) => onChange={(enableWebhook) =>
onChange({ ...values, enableWebhook }) onChange({ ...values, enableWebhook })
} }
featureId={FeatureId.CONTAINER_WEBHOOK}
/> />
</div> </div>
</div> </div>