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

chore(data-cy): require data-cy attributes [EE-6880] (#11453)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Details
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Details
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
Details
ci / build_manifests (push) Blocked by required conditions
Details
/ triage (push) Waiting to run
Details
Lint / Run linters (push) Waiting to run
Details
Test / test-client (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Details
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Details

Browse source
This commit is contained in:
Ali 2024-04-11 12:11:38 +12:00 • committed by GitHub
parent 3cad13388c
commit d38085a560
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
538 changed files with 2571 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/docker/components/container-restart-policy/container-restart-policy.html
View file

@ -5,7 +5,8 @@
<span>Name</span>
</td>
<td>
<select class="form-control" ng-model="$ctrl.state.editModel.name" disable-authorization="DockerContainerUpdate">
<select class="form-control" ng-model="$ctrl.state.editModel.name" disable-authorization="DockerContainerUpdate" data-cy="container-restart-policy-select">
>
<option value="no">None</option>
<option value="on-failure">On Failure</option>
<option value="always">Always</option>
@ -19,7 +20,7 @@
<tr ng-if="$ctrl.state.editModel.name === 'on-failure'">
<td class="col-md-3">Maximum Retry Count</td>
<td colspan="2">
<input type="number" class="form-control" ng-model="$ctrl.state.editModel.maximumRetryCount" />
<input type="number" class="form-control" ng-model="$ctrl.state.editModel.maximumRetryCount" data-cy="container-restart-max-retry-input" />
</td>
</tr>
</table>

3
app/docker/components/host-view-panels/node-availability-select/node-availability-select.html
View file

@ -1,5 +1,6 @@
<div class="input-group input-group-sm">
<select name="nodeAvailability" class="selectpicker form-control" ng-model="$ctrl.availability" ng-change="$ctrl.onChange()">
<select name="nodeAvailability" class="selectpicker form-control" ng-model="$ctrl.availability" ng-change="$ctrl.onChange()" data-cy="node-availability-select">
>
<option value="active">Active</option>
<option value="pause">Pause</option>
<option value="drain">Drain</option>

11
app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
View file

@ -4,11 +4,18 @@
<div ng-repeat="label in $ctrl.labels" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" ng-change="$ctrl.updateLabel(label)" />
<input
type="text"
class="form-control"
ng-model="label.key"
placeholder="e.g. com.example.foo"
ng-change="$ctrl.updateLabel(label)"
data-cy="node-label-input_{{ $index }}"
/>
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" ng-change="$ctrl.updateLabel(label)" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" ng-change="$ctrl.updateLabel(label)" data-cy="node-label-value_{{ $index }}" />
</div>
<button class="btn btn-light" type="button" ng-click="$ctrl.removeLabel($index)">
<pr-icon icon="'trash-2'" class-name="'icon-secondary icon-md'"></pr-icon>

13
app/docker/components/imageRegistry/por-image-registry.html
View file

@ -4,6 +4,7 @@
<label for="image_registry" class="control-label col-sm-3 col-lg-2 text-left" ng-class="$ctrl.labelClass"> Registry </label>
<div ng-class="$ctrl.inputClass" class="col-sm-8">
<select
data-cy="component-registrySelect"
ng-options="registry as registry.Name for registry in $ctrl.registries track by registry.Id"
ng-model="$ctrl.model.Registry"
id="image_registry"
@ -19,6 +20,7 @@
<span class="input-group-addon" id="registry-name">{{ $ctrl.displayedRegistryURL() }}</span>
<input
type="text"
data-cy="component-imageInput"
class="form-control"
aria-describedby="registry-name"
uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
@ -27,7 +29,6 @@
placeholder="e.g. my-image:my-tag"
ng-change="$ctrl.onImageChange()"
required
data-cy="component-imageInput"
/>
<span ng-if="$ctrl.isDockerHubRegistry()" class="input-group-btn">
<a
@ -51,7 +52,15 @@
</span>
<label for="image_name" ng-class="$ctrl.labelClass" class="control-label col-sm-3 col-lg-2 required text-left">Image </label>
<div ng-class="$ctrl.inputClass" class="col-sm-8">
<input type="text" class="form-control" ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. registry:port/my-image:my-tag" required />
<input
type="text"
class="form-control"
ng-model="$ctrl.model.Image"
name="image_name"
placeholder="e.g. registry:port/my-image:my-tag"
required
data-cy="component-imageInput"
/>
</div>
</div>
</div>

2
app/docker/components/network-macvlan-form/networkMacvlanForm.html
View file

@ -19,6 +19,7 @@
<div class="col-sm-9 col-lg-10">
<input
type="text"
data-cy="macvlan-network-card-input"
class="form-control"
name="network_card"
ng-model="$ctrl.data.ParentNetworkCard"
@ -69,6 +70,7 @@
ng-model="$ctrl.data.SelectedNetworkConfig"
name="config_network"
ng-required="$ctrl.requiredConfigSelection()"
data-cy="macvlanConfigNetworkSelector"
>
<option selected disabled hidden value="">Select a network</option>
</select>

25
app/docker/components/volumesCIFSForm/volumesCifsForm.html
View file

@ -6,7 +6,15 @@
<div class="form-group col-md-12">
<label for="cifs_address" class="col-sm-2 col-md-1 control-label required text-left">Address</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.serverAddress" name="cifs_address" placeholder="e.g. my.cifs-server.com OR xxx.xxx.xxx.xxx" required />
<input
type="text"
class="form-control"
ng-model="$ctrl.data.serverAddress"
name="cifs_address"
placeholder="e.g. my.cifs-server.com OR xxx.xxx.xxx.xxx"
required
data-cy="cifs-address-input"
/>
</div>
</div>
<div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_address.$invalid">
@ -21,7 +29,7 @@
<div class="form-group col-md-12">
<label for="cifs_share" class="col-sm-2 col-md-1 control-label required text-left">Share</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.share" name="cifs_share" placeholder="e.g. /myshare" required />
<input type="text" class="form-control" ng-model="$ctrl.data.share" name="cifs_share" placeholder="e.g. /myshare" required data-cy="cifs-share-input" />
</div>
</div>
<div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_share.$invalid">
@ -36,7 +44,14 @@
<div class="form-group col-md-12">
<label for="cifs_version" class="col-sm-2 col-md-1 control-label text-left">CIFS Version</label>
<div class="col-sm-10 col-md-11">
<select class="form-control" ng-model="$ctrl.data.version" name="cifs_version" ng-options="version for version in $ctrl.data.versions" required></select>
<select
class="form-control"
ng-model="$ctrl.data.version"
name="cifs_version"
ng-options="version for version in $ctrl.data.versions"
required
data-cy="cifs-version-select"
></select>
</div>
</div>
<div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_version.$invalid">
@ -51,7 +66,7 @@
<div class="form-group col-md-12">
<label for="cifs_username" class="col-sm-2 col-md-1 control-label required text-left">Username</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.username" name="cifs_username" required />
<input type="text" class="form-control" ng-model="$ctrl.data.username" name="cifs_username" required data-cy="cifs-username-input" />
</div>
</div>
<div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_username.$invalid">
@ -66,7 +81,7 @@
<div class="form-group col-md-12">
<label for="cifs_password" class="col-sm-2 col-md-1 control-label text-left">Password</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.password" name="cifs_password" required />
<input type="text" class="form-control" ng-model="$ctrl.data.password" name="cifs_password" required data-cy="cifs-password-input" />
</div>
</div>
<div class="form-group col-md-12" ng-show="cifsInformationForm.password.$invalid">

22
app/docker/components/volumesNFSForm/volumesnfsForm.html
View file

@ -6,7 +6,15 @@
<div class="form-group col-md-12">
<label for="nfs_address" class="col-sm-2 col-md-1 control-label required text-left">Address</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.serverAddress" name="nfs_address" placeholder="e.g. my.nfs-server.com OR xxx.xxx.xxx.xxx" required />
<input
type="text"
class="form-control"
ng-model="$ctrl.data.serverAddress"
name="nfs_address"
placeholder="e.g. my.nfs-server.com OR xxx.xxx.xxx.xxx"
required
data-cy="nfs-address-input"
/>
</div>
</div>
<div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_address.$invalid">
@ -21,7 +29,14 @@
<div class="form-group col-md-12">
<label for="nfs_version" class="col-sm-2 col-md-1 control-label text-left">NFS Version</label>
<div class="col-sm-10 col-md-11">
<select class="form-control" ng-model="$ctrl.data.version" name="nfs_version" ng-options="version for version in $ctrl.data.versions" required></select>
<select
class="form-control"
ng-model="$ctrl.data.version"
name="nfs_version"
ng-options="version for version in $ctrl.data.versions"
required
data-cy="nfs-version-select"
></select>
</div>
</div>
<div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_version.$invalid">
@ -38,6 +53,7 @@
<div class="col-sm-10 col-md-11">
<input
type="text"
data-cy="nfs-mountpoint-input"
class="form-control"
ng-model="$ctrl.data.mountPoint"
name="nfs_mountpoint"
@ -61,7 +77,7 @@
<portainer-tooltip message="'Comma separated list of options'"></portainer-tooltip>
</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="$ctrl.data.options" name="nfs_options" placeholder="e.g. rw,noatime,tcp ..." required />
<input type="text" class="form-control" ng-model="$ctrl.data.options" name="nfs_options" placeholder="e.g. rw,noatime,tcp ..." required data-cy="nfs-options-input" />
</div>
</div>
<div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_options.$invalid">

6
app/docker/views/configs/create/createconfig.html
View file

@ -9,7 +9,7 @@
<div class="form-group">
<label for="config_name" class="col-sm-1 control-label text-left">Name</label>
<div class="col-sm-11">
<input type="text" class="form-control" ng-model="ctrl.formValues.Name" id="config_name" placeholder="e.g. myConfig" />
<input type="text" class="form-control" ng-model="ctrl.formValues.Name" id="config_name" placeholder="e.g. myConfig" data-cy="config-name-input" />
</div>
</div>
<!-- !name-input -->
@ -37,11 +37,11 @@
<div ng-repeat="label in ctrl.formValues.Labels" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
<input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" data-cy="config-label-input_{{ $index }}" />
</div>
<div class="input-group col-sm-6 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" data-cy="config-label-value_{{ $index }}" />
<span class="input-group-btn">
<button class="btn btn-dangerlight" type="button" ng-click="ctrl.removeLabel($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>

18
app/docker/views/containers/console/exec.html
View file

@ -26,7 +26,7 @@
<pr-icon ng-if="imageOS == 'linux'" icon="'svg-linux'"></pr-icon>
<pr-icon ng-if="imageOS == 'windows'" icon="'layout-grid'"></pr-icon>
</span>
<select class="form-control" ng-model="formValues.command" id="command">
<select class="form-control" ng-model="formValues.command" id="command" data-cy="command-select">
<option value="ash" ng-if="imageOS == 'linux'">/bin/ash</option>
<option value="bash" ng-if="imageOS == 'linux'">/bin/bash</option>
<option value="sh" ng-if="imageOS == 'linux'">/bin/sh</option>
@ -35,7 +35,15 @@
<option ng-repeat="command in containerCommands" value="{{ command.command }}">{{ command.title }}: {{ command.command }}</option>
</select>
</div>
<input class="form-control" ng-if="formValues.isCustomCommand" type="text" name="custom-command" ng-model="formValues.customCommand" placeholder="e.g. ps aux" />
<input
class="form-control"
ng-if="formValues.isCustomCommand"
type="text"
name="custom-command"
ng-model="formValues.customCommand"
placeholder="e.g. ps aux"
data-cy="custom-command"
/>
</div>
</div>
<!-- !command-list -->
@ -53,7 +61,7 @@
<portainer-tooltip message="'Format is one of: user, user:group, uid or uid:gid'"></portainer-tooltip>
</label>
<div class="col-lg-11 col-sm-10">
<input class="form-control" type="text" ng-model="formValues.user" placeholder="root" />
<input class="form-control" type="text" ng-model="formValues.user" placeholder="root" data-cy="container-exec-user" />
</div>
</div>
<div class="form-group">
@ -70,8 +78,8 @@
</div>
<div ng-if="state !== states.disconnected">
<label
>Exec into container as <code class="!text-sm align-baseline">{{ ::formValues.user || 'default user' }}</code> using command
<code class="!text-sm align-baseline">{{ formValues.isCustomCommand ? formValues.customCommand : formValues.command }}</code>
>Exec into container as <code class="align-baseline !text-sm">{{ ::formValues.user || 'default user' }}</code> using command
<code class="align-baseline !text-sm">{{ formValues.isCustomCommand ? formValues.customCommand : formValues.command }}</code>
<terminal-tooltip class="align-sub"> </terminal-tooltip>
</label>
<button type="button" class="btn btn-primary" ng-click="disconnect()">

6
app/docker/views/containers/edit/container.html
View file

@ -72,7 +72,7 @@
<rd-widget>
<rd-widget-header icon="box" title-text="Container status"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<table class="table" data-cy="container-status-table">
<tbody>
<tr>
<td class="col-xs-6 col-sm-4 col-md-3 col-lg-3">ID</td>
@ -88,7 +88,7 @@
</td>
<td ng-if="container.edit">
<form ng-submit="renameContainer()">
<input type="text" class="containerNameInput" ng-model="container.newContainerName" />
<input type="text" class="containerNameInput" ng-model="container.newContainerName" data-cy="containerNameInput" />
<a href="" ng-click="container.edit = false;">
<pr-icon icon="'x'"></pr-icon>
</a>
@ -327,7 +327,7 @@
<rd-widget>
<rd-widget-header icon="database" title-text="Volumes"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<table class="table" data-cy="container-volumes-table">
<thead>
<tr>
<th>Host/volume</th>

2
app/docker/views/containers/stats/containerstats.html
View file

@ -27,7 +27,7 @@
<div class="form-group">
<label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left"> Refresh rate </label>
<div class="col-sm-3 col-md-2">
<select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control">
<select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control" data-cy="docker-containers-stats-refresh-rate">
<option value="1">1s</option>
<option value="3">3s</option>
<option value="5">5s</option>

19
app/docker/views/images/build/buildimage.html
View file

@ -40,7 +40,15 @@
<!-- name-input -->
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="item.Name" ng-change="checkName($index)" placeholder="e.g. my-image:my-tag" auto-focus />
<input
type="text"
class="form-control"
ng-model="item.Name"
ng-change="checkName($index)"
placeholder="e.g. my-image:my-tag"
auto-focus
data-cy="image-name-input"
/>
<span class="input-group-addon" ng-if="!item.Valid">
<pr-icon icon="'x'" mode="'danger'"></pr-icon>
</span>
@ -101,9 +109,7 @@
</span>
</div>
<button class="btn btn-sm btn-primary" ngf-select="selectAdditionalFiles($files)" ngf-multiple="true">Select files</button>
<span ng-repeat="item in formValues.AdditionalFiles track by $index" class="mx-2">
{{ item.name }}
</span>
<span ng-repeat="item in formValues.AdditionalFiles track by $index" class="mx-2"> {{ item.name }} </span>
</div>
</div>
</div>
@ -133,7 +139,7 @@
<div class="form-group">
<label for="image_path" class="col-sm-2 control-label text-left">Dockerfile path</label>
<div class="col-sm-10">
<input type="text" class="form-control" ng-model="formValues.Path" id="image_path" placeholder="Dockerfile" />
<input type="text" class="form-control" ng-model="formValues.Path" id="image_path" placeholder="Dockerfile" data-cy="image-path-input" />
</div>
</div>
</div>
@ -156,6 +162,7 @@
<div class="col-sm-10">
<input
type="text"
data-cy="image-url-input"
class="form-control"
ng-model="formValues.URL"
id="image_url"
@ -172,7 +179,7 @@
<div class="form-group">
<label for="image_path" class="col-sm-2 control-label text-left">Dockerfile path</label>
<div class="col-sm-10">
<input type="text" class="form-control" ng-model="formValues.Path" id="image_path" placeholder="Dockerfile" />
<input type="text" class="form-control" ng-model="formValues.Path" id="image_path" placeholder="Dockerfile" data-cy="image-path-input" />
</div>
</div>
</div>

90
app/docker/views/networks/create/createnetwork.html
View file

@ -9,7 +9,7 @@
<div class="form-group">
<label for="network_name" class="col-sm-2 col-lg-1 control-label text-left">Name</label>
<div class="col-sm-10 col-lg-11">
<input type="text" class="form-control" ng-model="config.Name" id="network_name" placeholder="e.g. myNetwork" />
<input type="text" class="form-control" ng-model="config.Name" id="network_name" placeholder="e.g. myNetwork" data-cy="network-name-input" />
</div>
</div>
<!-- !name-input -->
@ -18,10 +18,24 @@
<div class="form-group">
<label for="network_driver" class="col-sm-2 col-lg-1 control-label text-left">Driver</label>
<div class="col-sm-10 col-lg-11">
<select class="form-control" ng-options="driver for driver in availableNetworkDrivers" ng-model="config.Driver" ng-if="availableNetworkDrivers.length > 0">
<select
class="form-control"
ng-options="driver for driver in availableNetworkDrivers"
ng-model="config.Driver"
ng-if="availableNetworkDrivers.length > 0"
data-cy="network-driver-select"
>
<option disabled hidden value="">Select a driver</option>
</select>
<input type="text" class="form-control" ng-model="config.Driver" id="network_driver" placeholder="e.g. driverName" ng-if="availableNetworkDrivers.length === 0" />
<input
type="text"
class="form-control"
ng-model="config.Driver"
id="network_driver"
placeholder="e.g. driverName"
ng-if="availableNetworkDrivers.length === 0"
data-cy="network-driver-input"
/>
</div>
</div>
<!-- !driver-input -->
@ -38,11 +52,17 @@
<div ng-repeat="option in formValues.DriverOptions" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="option.name" placeholder="e.g. com.docker.network.bridge.enable_icc" />
<input
type="text"
class="form-control"
ng-model="option.name"
placeholder="e.g. com.docker.network.bridge.enable_icc"
data-cy="network-driver-option-name-input"
/>
</div>
<div class="input-group col-sm-6 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="option.value" placeholder="e.g. true" />
<input type="text" class="form-control" ng-model="option.value" placeholder="e.g. true" data-cy="network-driver-option-value-input" />
<span class="input-group-btn">
<button class="btn btn-dangerlight" type="button" ng-click="removeDriverOption($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>
@ -64,11 +84,25 @@
<div class="form-group">
<label for="ipv4_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV4.Subnet" id="ipv4_network_subnet" placeholder="e.g. 172.20.0.0/16" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV4.Subnet"
id="ipv4_network_subnet"
placeholder="e.g. 172.20.0.0/16"
data-cy="network-ipv4-subnet-input"
/>
</div>
<label for="ipv4_network_gateway" class="col-sm-2 col-lg-1 control-label text-left">Gateway</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV4.Gateway" id="ipv4_network_gateway" placeholder="e.g. 172.20.10.11" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV4.Gateway"
id="ipv4_network_gateway"
placeholder="e.g. 172.20.10.11"
data-cy="network-ipv4-gateway-input"
/>
</div>
</div>
<!-- !subnet-gateway-inputs -->
@ -76,7 +110,14 @@
<div class="form-group">
<label for="ipv4_network_iprange" class="col-sm-2 col-lg-1 control-label text-left">IP range</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV4.IPRange" id="ipv4_network_iprange" placeholder="e.g. 172.20.10.128/25" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV4.IPRange"
id="ipv4_network_iprange"
placeholder="e.g. 172.20.10.128/25"
data-cy="network-ipv4-iprange-input"
/>
</div>
</div>
<div ng-repeat="auxAddress in formValues.IPV4.AuxiliaryAddresses track by $index" class="form-group">
@ -84,6 +125,7 @@
<div class="col-sm-4 col-lg-5">
<input
type="text"
data-cy="network-ipv4-auxaddr-input"
class="form-control"
ng-model="formValues.IPV4.AuxiliaryAddresses[$index]"
ng-change="checkIPV4AuxiliaryAddress($index)"
@ -111,11 +153,25 @@
<div class="form-group">
<label for="ipv6_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.Subnet" id="ipv6_network_subnet" placeholder="e.g. 2001:db8::/48" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV6.Subnet"
id="ipv6_network_subnet"
placeholder="e.g. 2001:db8::/48"
data-cy="network-ipv6-subnet-input"
/>
</div>
<label for="ipv6_network_gateway" class="col-sm-2 col-lg-1 control-label text-left">Gateway</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.Gateway" id="ipv6_network_gateway" placeholder="e.g. 2001:db8::1" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV6.Gateway"
id="ipv6_network_gateway"
placeholder="e.g. 2001:db8::1"
data-cy="network-ipv6-gateway-input"
/>
</div>
</div>
<!-- !subnet-gateway-inputs -->
@ -123,7 +179,14 @@
<div class="form-group">
<label for="ipv6_network_iprange" class="col-sm-2 col-lg-1 control-label text-left">IP range</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.IPRange" id="ipv6_network_iprange" placeholder="e.g. 2001:db8::/64" />
<input
type="text"
class="form-control"
ng-model="formValues.IPV6.IPRange"
id="ipv6_network_iprange"
placeholder="e.g. 2001:db8::/64"
data-cy="network-ipv6-iprange-input"
/>
</div>
</div>
<div ng-repeat="auxAddress in formValues.IPV6.AuxiliaryAddresses track by $index" class="form-group">
@ -131,6 +194,7 @@
<div class="col-sm-4 col-lg-5">
<input
type="text"
data-cy="network-ipv6-auxaddr-input"
class="form-control"
ng-model="formValues.IPV6.AuxiliaryAddresses[$index]"
ng-change="checkIPV6AuxiliaryAddress($index)"
@ -160,11 +224,11 @@
<div ng-repeat="label in formValues.Labels" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" data-cy="network-label-key-input" />
</div>
<div class="input-group col-sm-6 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" data-cy="network-label-value-input" />
<span class="input-group-btn">
<button class="btn btn-dangerlight" type="button" ng-click="removeLabel($index)"> <pr-icon icon="'trash-2'" size="'md'"></pr-icon> </button
></span>

8
app/docker/views/secrets/create/createsecret.html
View file

@ -9,7 +9,7 @@
<div class="form-group">
<label for="secret_name" class="col-sm-2 control-label text-left">Name</label>
<div class="col-sm-10">
<input type="text" class="form-control" ng-model="formValues.Name" id="secret_name" placeholder="e.g. mySecret" />
<input type="text" class="form-control" ng-model="formValues.Name" id="secret_name" placeholder="e.g. mySecret" data-cy="createSecret-nameInput" />
</div>
</div>
<!-- !name-input -->
@ -17,7 +17,7 @@
<div class="form-group">
<label for="secret_data" class="col-sm-2 control-label text-left">Secret</label>
<div class="col-sm-10">
<textarea class="form-control" rows="5" ng-model="formValues.Data" ng-trim="false"></textarea>
<textarea class="form-control" rows="5" ng-model="formValues.Data" ng-trim="false" data-cy="createSecret-secretDataInput"></textarea>
</div>
</div>
<!-- !secret-data -->
@ -45,11 +45,11 @@
<div ng-repeat="label in formValues.Labels" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" data-cy="createSecret-labelNameInput" />
</div>
<div class="input-group col-sm-6 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" data-cy="createSecret-labelValueInput" />
<span class="input-group-btn">
<button class="btn btn-dangerlight" type="button" ng-click="removeLabel($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>

61
app/docker/views/services/create/createservice.html
View file

@ -9,7 +9,7 @@
<div class="form-group">
<label for="service_name" class="col-sm-2 control-label text-left">Name</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="formValues.Name" id="service_name" placeholder="e.g. myService" />
<input type="text" class="form-control" ng-model="formValues.Name" id="service_name" placeholder="e.g. myService" data-cy="service-name-input" />
</div>
</div>
<!-- !name-input -->
@ -42,7 +42,7 @@
<div>
<label class="control-label col-sm-2 text-left"> Replicas </label>
<div class="col-sm-8">
<input type="number" class="form-control" ng-model="formValues.Replicas" id="replicas" placeholder="e.g. 3" />
<input type="number" class="form-control" ng-model="formValues.Replicas" id="replicas" placeholder="e.g. 3" data-cy="docker-service-create-replica-count-input" />
</div>
</div>
</div>
@ -59,7 +59,7 @@
<!-- host-port -->
<div class="input-group col-sm-3 input-group-sm">
<span class="input-group-addon">host</span>
<input type="text" class="form-control" ng-model="portBinding.PublishedPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)" />
<input type="text" class="form-control" ng-model="portBinding.PublishedPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)" data-cy="host-port-input" />
</div>
<!-- !host-port -->
<span style="margin: 0 10px 0 10px">
@ -68,7 +68,7 @@
<!-- container-port -->
<div class="input-group col-sm-3 input-group-sm">
<span class="input-group-addon">container</span>
<input type="text" class="form-control" ng-model="portBinding.TargetPort" placeholder="e.g. 80" />
<input type="text" class="form-control" ng-model="portBinding.TargetPort" placeholder="e.g. 80" data-cy="container-port-input" />
</div>
<!-- !container-port -->
<!-- protocol-actions -->
@ -159,7 +159,14 @@
<div class="form-group">
<label for="service_command" class="col-sm-2 col-lg-1 control-label text-left">Command</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="formValues.Command" id="service_command" placeholder="e.g. /usr/bin/nginx -t -c /mynginx.conf" />
<input
type="text"
class="form-control"
ng-model="formValues.Command"
id="service_command"
placeholder="e.g. /usr/bin/nginx -t -c /mynginx.conf"
data-cy="service-command-input"
/>
</div>
</div>
<!-- !command-input -->
@ -167,7 +174,14 @@
<div class="form-group">
<label for="service_entrypoint" class="col-sm-2 col-lg-1 control-label text-left">Entrypoint</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="formValues.EntryPoint" id="service_entrypoint" placeholder="e.g. /bin/sh -c" />
<input
type="text"
class="form-control"
ng-model="formValues.EntryPoint"
id="service_entrypoint"
placeholder="e.g. /bin/sh -c"
data-cy="service-entrypoint-input"
/>
</div>
</div>
<!-- !entrypoint-input -->
@ -175,11 +189,11 @@
<div class="form-group">
<label for="service_workingdir" class="col-sm-2 col-lg-1 control-label text-left">Working Dir</label>
<div class="col-sm-4">
<input type="text" class="form-control" ng-model="formValues.WorkingDir" id="service_workingdir" placeholder="e.g. /myapp" />
<input type="text" class="form-control" ng-model="formValues.WorkingDir" id="service_workingdir" placeholder="e.g. /myapp" data-cy="service-workingdir-input" />
</div>
<label for="service_user" class="col-sm-1 control-label text-left">User</label>
<div class="col-sm-4">
<input type="text" class="form-control" ng-model="formValues.User" id="service_user" placeholder="e.g. nginx" />
<input type="text" class="form-control" ng-model="formValues.User" id="service_user" placeholder="e.g. nginx" data-cy="service-user-input" />
</div>
</div>
<!-- !workdir-user-input -->
@ -188,7 +202,7 @@
<div class="form-group">
<label for="log-driver" class="col-sm-2 col-lg-1 control-label text-left">Driver</label>
<div class="col-sm-4">
<select class="form-control" ng-model="formValues.LogDriverName" id="log-driver">
<select class="form-control" ng-model="formValues.LogDriverName" id="log-driver" data-cy="service-creation-logging-driver">
<option selected value="">Default logging driver</option>
<option ng-repeat="driver in availableLoggingDrivers" ng-value="driver">{{ driver }}</option>
<option value="none">none</option>
@ -226,11 +240,11 @@
<div ng-repeat="opt in formValues.LogDriverOpts" class="mt-1">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">option</span>
<input type="text" class="form-control" ng-model="opt.name" placeholder="e.g. FOO" />
<input type="text" class="form-control" ng-model="opt.name" placeholder="e.g. FOO" data-cy="service-creation-logging-driver-option" />
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="opt.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="opt.value" placeholder="e.g. bar" data-cy="service-creation-logging-driver-option-value" />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removeLogDriverOpt($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>
@ -264,7 +278,13 @@
<div class="input-group col-sm-6">
<div class="input-group input-group-sm w-full">
<span class="input-group-addon">container</span>
<input type="text" class="form-control" ng-model="volume.Target" placeholder="e.g. /path/in/container" />
<input
type="text"
class="form-control"
ng-model="volume.Target"
placeholder="e.g. /path/in/container"
data-cy="service-creation-volume-container-path"
/>
</div>
<div class="small text-warning" ng-show="!volume.Target"> <pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon> Target is required. </div>
</div>
@ -295,6 +315,7 @@
class="form-control"
ng-model="volume.Source"
ng-options="vol as ((vol.Id|truncate:30) + ' - ' + (vol.Driver|truncate:30)) for vol in availableVolumes"
data-cy="volume-source-select"
>
<option selected disabled value="">Select a volume</option>
</select>
@ -306,7 +327,7 @@
<div class="input-group input-group-sm col-sm-6" ng-if="volume.Type === 'bind'">
<div class="input-group input-group-sm w-full">
<span class="input-group-addon">host</span>
<input type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host" />
<input type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host" data-cy="service-creation-volume-host-path" />
</div>
<div class="small text-warning" ng-show="!volume.Source"> <pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon> Source is required. </div>
</div>
@ -337,7 +358,7 @@
<div class="form-group">
<label for="container_network" class="col-sm-2 col-lg-1 control-label text-left">Network</label>
<div class="col-sm-9">
<select class="form-control" ng-model="formValues.Network">
<select class="form-control" ng-model="formValues.Network" data-cy="create-service-network-select">
<option selected disabled hidden value="">Select a network</option>
<option ng-repeat="net in availableNetworks | orderBy: 'Name'" ng-value="net.Name">{{ net.Name }}</option>
</select>
@ -356,7 +377,7 @@
<!-- network-input-list -->
<div class="col-sm-12 form-inline" style="margin-top: 10px">
<div ng-repeat="network in formValues.ExtraNetworks" style="margin-top: 2px">
<select class="form-control" ng-model="network.Name">
<select class="form-control" ng-model="network.Name" data-cy="create-service-extra-network-select-{{ $index }}">
<option selected disabled hidden value="">Select a network</option>
<option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
</select>
@ -381,7 +402,7 @@
<div ng-repeat="variable in formValues.HostsEntries" style="margin-top: 2px">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="variable.value" placeholder="e.g. host:IP" />
<input type="text" class="form-control" ng-model="variable.value" placeholder="e.g. host:IP" data-cy="service-creation-hosts-entry" />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removeHostsEntry($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>
@ -421,11 +442,11 @@
<div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" data-cy="service-creation-label" />
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" data-cy="service-creation-label-value" />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removeLabel($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>
@ -448,11 +469,11 @@
<div ng-repeat="label in formValues.ContainerLabels" style="margin-top: 2px">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
<input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" data-cy="service-creation-container-label" />
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
<input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" data-cy="service-creation-container-label-value" />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removeContainerLabel($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>

8
app/docker/views/services/create/includes/config.html
View file

@ -14,7 +14,13 @@
<div ng-repeat="config in formValues.Configs" style="margin-top: 2px">
<div class="input-group col-sm-4 input-group-sm">
<span class="input-group-addon">config</span>
<select class="form-control" ng-change="checkIfConfigDuplicated()" ng-model="config.model" ng-options="config.Name for config in availableConfigs | orderBy: 'Name'">
<select
class="form-control"
ng-change="checkIfConfigDuplicated()"
ng-model="config.model"
ng-options="config.Name for config in availableConfigs | orderBy: 'Name'"
data-cy="docker-stack-configs-select"
>
<option value="" selected="selected">Select a config</option>
</select>
</div>

64
app/docker/views/services/create/includes/resources-placement.html
View file

@ -4,10 +4,17 @@
<div class="form-group">
<label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory reservation </label>
<div class="col-sm-3">
<slider model="formValues.MemoryReservation" floor="0" ceil="state.sliderMaxMemory" step="256" ng-if="state.sliderMaxMemory"></slider>
<slider
model="formValues.MemoryReservation"
floor="0"
ceil="state.sliderMaxMemory"
step="256"
ng-if="state.sliderMaxMemory"
data-cy="docker-services-create-memory-reservation-slider"
></slider>
</div>
<div class="col-sm-2">
<input type="number" min="0" class="form-control" ng-model="formValues.MemoryReservation" />
<input type="number" data-cy="docker-services-create-memory-reservation-input" min="0" class="form-control" ng-model="formValues.MemoryReservation" />
</div>
<div class="col-sm-4">
<p class="small text-muted" style="margin-top: 7px"> Minimum memory available on a node to run a task (<b>MB</b>) </p>
@ -18,10 +25,17 @@
<div class="form-group">
<label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory limit </label>
<div class="col-sm-3">
<slider model="formValues.MemoryLimit" floor="0" ceil="state.sliderMaxMemory" step="256" ng-if="state.sliderMaxMemory"></slider>
<slider
model="formValues.MemoryLimit"
floor="0"
ceil="state.sliderMaxMemory"
step="256"
ng-if="state.sliderMaxMemory"
data-cy="docker-services-create-memory-limit-slider"
></slider>
</div>
<div class="col-sm-2">
<input type="number" min="0" class="form-control" ng-model="formValues.MemoryLimit" />
<input type="number" data-cy="docker-services-create-memory-limit-input" min="0" class="form-control" ng-model="formValues.MemoryLimit" />
</div>
<div class="col-sm-4" style="margin-top: 7px">
<p class="small text-muted"> Maximum memory usage per task (<b>MB</b>) </p>
@ -32,7 +46,15 @@
<div class="form-group">
<label for="cpu-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU reservation </label>
<div class="col-sm-5">
<slider model="formValues.CpuReservation" floor="0" ceil="state.sliderMaxCpu" step="0.25" precision="2" ng-if="state.sliderMaxCpu"></slider>
<slider
model="formValues.CpuReservation"
floor="0"
ceil="state.sliderMaxCpu"
step="0.25"
precision="2"
ng-if="state.sliderMaxCpu"
data-cy="docker-services-create-cpu-reservation-slider"
></slider>
</div>
<div class="col-sm-4" style="margin-top: 20px">
<p class="small text-muted"> Minimum CPU available on a node to run a task </p>
@ -43,7 +65,15 @@
<div class="form-group">
<label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU limit </label>
<div class="col-sm-5">
<slider model="formValues.CpuLimit" floor="0" ceil="state.sliderMaxCpu" step="0.25" precision="2" ng-if="state.sliderMaxCpu"></slider>
<slider
model="formValues.CpuLimit"
floor="0"
ceil="state.sliderMaxCpu"
step="0.25"
precision="2"
ng-if="state.sliderMaxCpu"
data-cy="docker-services-create-cpu-limit-slider"
></slider>
</div>
<div class="col-sm-4" style="margin-top: 20px">
<p class="small text-muted"> Maximum CPU usage per task </p>
@ -63,17 +93,17 @@
<div ng-repeat="constraint in formValues.PlacementConstraints" style="margin-top: 2px">
<div class="input-group col-sm-4 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="constraint.key" placeholder="e.g. node.role" />
<input type="text" class="form-control" ng-model="constraint.key" placeholder="e.g. node.role" data-cy="docker-services-create-placement-constraint-name-{{ $index }}" />
</div>
<div class="input-group col-sm-1 input-group-sm">
<select name="constraintOperator" class="form-control" ng-model="constraint.operator">
<select name="constraintOperator" class="form-control" ng-model="constraint.operator" data-cy="docker-services-create-placement-constraint-operator-">
<option value="==">==</option>
<option value="!=">!=</option>
</select>
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="constraint.value" placeholder="e.g. manager" />
<input type="text" class="form-control" ng-model="constraint.value" placeholder="e.g. manager" data-cy="docker-services-create-placement-constraint-value-{{ $index }}" />
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removePlacementConstraint($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>
@ -94,11 +124,23 @@
<div ng-repeat="preference in formValues.PlacementPreferences" style="margin-top: 2px">
<div class="input-group col-sm-4 input-group-sm">
<span class="input-group-addon">strategy</span>
<input type="text" class="form-control" ng-model="preference.strategy" placeholder="e.g. spread" />
<input
type="text"
class="form-control"
ng-model="preference.strategy"
placeholder="e.g. spread"
data-cy="docker-services-create-placement-preference-strategy-{{ $index }}"
/>
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="preference.value" placeholder="e.g. node.labels.datacenter" />
<input
type="text"
class="form-control"
ng-model="preference.value"
placeholder="e.g. node.labels.datacenter"
data-cy="docker-services-create-placement-preference-value-{{ $index }}"
/>
</div>
<button class="btn btn-dangerlight" type="button" ng-click="removePlacementPreference($index)">
<pr-icon icon="'trash-2'" size="'md'"></pr-icon>

8
app/docker/views/services/create/includes/secret.html
View file

@ -20,7 +20,13 @@
<div ng-repeat="secret in formValues.Secrets track by $index" style="margin-top: 4px">
<div class="input-group col-sm-4 input-group-sm">
<span class="input-group-addon">secret</span>
<select class="form-control" ng-model="secret.model" ng-change="checkIfSecretDuplicated()" ng-options="secret.Name for secret in availableSecrets | orderBy: 'Name'">
<select
class="form-control"
ng-model="secret.model"
ng-change="checkIfSecretDuplicated()"
ng-options="secret.Name for secret in availableSecrets | orderBy: 'Name'"
data-cy="docker-stack-secrets-select"
>
<option value="" selected="selected">Select a secret</option>
</select>
</div>

41
app/docker/views/services/create/includes/update-restart.html
View file

@ -4,7 +4,7 @@
<div class="form-group">
<label for="parallelism" class="col-sm-3 col-lg-2 control-label text-left">Update parallelism</label>
<div class="col-sm-4 col-lg-3">
<input type="number" class="form-control" ng-model="formValues.Parallelism" id="parallelism" placeholder="e.g. 1" />
<input type="number" data-cy="docker-service-update-parallelism-input" class="form-control" ng-model="formValues.Parallelism" id="parallelism" placeholder="e.g. 1" />
</div>
<div class="col-sm-5">
<p class="small text-muted"> Maximum number of tasks to be updated simultaneously (0 to update all at once). </p>
@ -18,7 +18,15 @@
<portainer-tooltip message="'Supported format examples: 1h, 5m, 10s, 1000ms, 15us, 60ns.'"></portainer-tooltip>
</label>
<div class="col-sm-4 col-lg-3">
<input type="text" class="form-control" ng-model="formValues.UpdateDelay" id="update-delay" placeholder="e.g. 1m" ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i" />
<input
type="text"
class="form-control"
ng-model="formValues.UpdateDelay"
id="update-delay"
placeholder="e.g. 1m"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"
data-cy="docker-service-update-delay-input"
/>
</div>
<div class="col-sm-5">
<p class="small text-muted"> Amount of time between updates expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 0s, 0 seconds. </p>
@ -77,7 +85,15 @@
<portainer-tooltip message="'Supported format examples: 1h, 5m, 10s, 1000ms, 15us, 60ns.'"></portainer-tooltip>
</label>
<div class="col-sm-4 col-lg-3">
<input type="text" class="form-control" ng-model="formValues.RestartDelay" id="restart-delay" placeholder="e.g. 1m" ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i" />
<input
type="text"
class="form-control"
ng-model="formValues.RestartDelay"
id="restart-delay"
placeholder="e.g. 1m"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"
data-cy="docker-service-restart-delay-input"
/>
</div>
<div class="col-sm-5">
<p class="small text-muted"> Delay between restart attempts expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 5s, 5 seconds. </p>
@ -88,7 +104,14 @@
<div class="form-group">
<label for="restart-max-attempts" class="col-sm-3 col-lg-2 control-label text-left">Restart max attempts</label>
<div class="col-sm-4 col-lg-3">
<input type="number" class="form-control" ng-model="formValues.RestartMaxAttempts" id="restart-max-attempts" placeholder="e.g. 0" />
<input
type="number"
data-cy="docker-service-restart-max-attempts-input"
class="form-control"
ng-model="formValues.RestartMaxAttempts"
id="restart-max-attempts"
placeholder="e.g. 0"
/>
</div>
<div class="col-sm-5">
<p class="small text-muted"> Maximum attempts to restart a given task before giving up (default value is 0, which means unlimited). </p>
@ -102,7 +125,15 @@
<portainer-tooltip message="'Supported format examples: 1h, 5m, 10s, 1000ms, 15us, 60ns.'"></portainer-tooltip>
</label>
<div class="col-sm-4 col-lg-3">
<input type="text" class="form-control" ng-model="formValues.RestartWindow" id="restart-window" placeholder="e.g. 1m" ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i" />
<input
type="text"
class="form-control"
ng-model="formValues.RestartWindow"
id="restart-window"
placeholder="e.g. 1m"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"
data-cy="docker-service-restart-window-input"
/>
</div>
<div class="col-sm-5">
<p class="small text-muted">

7
app/docker/views/services/edit/includes/configs.html
View file

@ -4,7 +4,12 @@
<rd-widget-body classes="no-padding">
<div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
Add a config:
<select class="form-control !h-[30px] !text-[13px]" ng-options="config.Name for config in filterConfigs(configs) | orderBy: 'Name'" ng-model="newConfig">
<select
class="form-control !h-[30px] !text-[13px]"
ng-options="config.Name for config in filterConfigs(configs) | orderBy: 'Name'"
ng-model="newConfig"
data-cy="service-configs-select"
>
<option selected disabled hidden value="">Select a config</option>
</select>
<a class="btn btn-default btn-sm" ng-click="addConfig(service, newConfig)"> <pr-icon icon="'plus'"></pr-icon> add config </a>

3
app/docker/views/services/edit/includes/constraints.html
View file

@ -25,6 +25,7 @@
<div class="input-group input-group-sm">
<input
type="text"
data-cy="placement-constraint-key-input-{{ $index }}"
class="form-control"
ng-model="constraint.key"
placeholder="e.g. node.role"
@ -43,6 +44,7 @@
ng-change="updatePlacementConstraint(service, constraint)"
ng-disabled="isUpdating"
disable-authorization="DockerServiceUpdate"
data-cy="placement-constraint-operator=selectoer"
>
<option value="==">==</option>
<option value="!=">!=</option>
@ -53,6 +55,7 @@
<div class="input-group input-group-sm">
<input
type="text"
data-cy="placement-constraint-value-input-{{ $index }}"
class="form-control"
ng-model="constraint.value"
placeholder="e.g. manager"

2
app/docker/views/services/edit/includes/containerlabels.html
View file

@ -25,6 +25,7 @@
<span class="input-group-addon fit-text-size">name</span>
<input
type="text"
data-cy="container-label-key-{{ $index }}"
class="form-control"
ng-model="label.key"
placeholder="e.g. com.example.foo"
@ -39,6 +40,7 @@
<span class="input-group-addon fit-text-size">value</span>
<input
type="text"
data-cy="container-label-value_{{ $index }}"
class="form-control"
ng-model="label.value"
placeholder="e.g. bar"

2
app/docker/views/services/edit/includes/hosts.html
View file

@ -25,6 +25,7 @@
<input
type="text"
class="form-control"
data-cy="hosts-entry-hostname-input-{{ $index }}"
ng-model="entry.hostname"
placeholder="e.g. example.com"
ng-change="updateHostsEntry(service, entry)"
@ -37,6 +38,7 @@
<div class="input-group input-group-sm">
<input
type="text"
data-cy="hosts-entry-ip-input-{{ $index }}"
class="form-control"
ng-model="entry.ip"
placeholder="e.g. 10.0.1.1"

18
app/docker/views/services/edit/includes/logging.html
View file

@ -4,7 +4,13 @@
<rd-widget-body classes="no-padding">
<div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
Driver:
<select class="form-control !h-[30px] !text-[13px]" ng-model="service.LogDriverName" ng-change="updateLogDriverName(service)" ng-disabled="isUpdating">
<select
class="form-control !h-[30px] !text-[13px]"
ng-model="service.LogDriverName"
ng-change="updateLogDriverName(service)"
ng-disabled="isUpdating"
data-cy="logging-driver-selector"
>
<option selected value="">Default logging driver</option>
<option ng-repeat="driver in availableLoggingDrivers" ng-value="driver">{{ driver }}</option>
<option value="none">none</option>
@ -25,7 +31,14 @@
<td class="w-1/2">
<div class="input-group input-group-sm">
<span class="input-group-addon fit-text-size">name</span>
<input type="text" class="form-control" ng-model="option.key" ng-disabled="option.added || isUpdating" placeholder="e.g. FOO" />
<input
type="text"
data-cy="service-logging-driver-option-name-input-{{ $index }}"
class="form-control"
ng-model="option.key"
ng-disabled="option.added || isUpdating"
placeholder="e.g. FOO"
/>
</div>
</td>
<td>
@ -33,6 +46,7 @@
<span class="input-group-addon fit-text-size">value</span>
<input
type="text"
data-cy="service-logging-driver-option-value-input-{{ $index }}"
class="form-control"
ng-model="option.value"
ng-change="updateLogDriverOpt(service, option)"

4
app/docker/views/services/edit/includes/mounts.html
View file

@ -24,6 +24,7 @@
<td class="!pt-6 !align-top" ng-if="isAdmin || allowBindMounts">
<select
name="mountType"
data-cy="mount-type-selector"
class="form-control !h-[30px] !text-[13px]"
ng-model="mount.Type"
ng-change="onChangeMountType(service, mount)"
@ -43,11 +44,13 @@
ng-options="vol.Id as ((vol.Id|truncate:30) + ' - ' + (vol.Driver|truncate:30)) for vol in availableVolumes"
ng-if="mount.Type === 'volume'"
disable-authorization="DockerServiceUpdate"
data-cy="volume-selector"
>
<option selected disabled hidden value="">Select a volume</option>
</select>
<input
type="text"
data-cy="bind-mount-source-input-{{ index }}"
class="form-control !h-[30px] !text-[13px]"
name=""
ng-model="mount.Source"
@ -64,6 +67,7 @@
<td class="!pb-0 !pt-6 !align-top">
<input
type="text"
data-cy="mount-target-input-{{ index }}"
class="form-control mb-6 !h-[30px] !text-[13px]"
ng-model="mount.Target"
placeholder="e.g. /tmp/portainer/data"

5
app/docker/views/services/edit/includes/networks.html
View file

@ -29,6 +29,7 @@
ng-options="net.Id as net.Name for net in filterNetworks(swarmNetworks, network)"
disable-authorization="DockerServiceUpdate"
style="width: initial; min-width: 50%"
data-cy="network-selector_{{ network.Name }}"
>
<option disabled value="" selected>Select a network</option>
</select>
@ -37,9 +38,7 @@
<td>
<a ui-sref="docker.networks.network({id: network.Id})">{{ network.Id }}</a>
</td>
<td>
{{ network.Addr }}
</td>
<td> {{ network.Addr }} </td>
<td ng-if="network.Editable" authorization="DockerServiceUpdate">
<span class="input-group-btn">
<button class="btn btn-sm btn-dangerlight" type="button" ng-click="removeNetwork(service, $index)" ng-disabled="isUpdating">

2
app/docker/views/services/edit/includes/placementPreferences.html
View file

@ -24,6 +24,7 @@
<div class="input-group input-group-sm">
<input
type="text"
data-cy="placement-preference-strategy-input-{{ $index }}"
class="form-control"
ng-model="preference.strategy"
placeholder="e.g. node.role"
@ -37,6 +38,7 @@
<div class="input-group input-group-sm">
<input
type="text"
data-cy="placement-preference-value-input-{{ $index }}"
class="form-control"
ng-model="preference.value"
placeholder="e.g. manager"

4
app/docker/views/services/edit/includes/resources.html
View file

@ -10,6 +10,7 @@
<input
class="input-sm"
type="number"
data-cy="docker-service-memory-reservation-input"
step="0.125"
min="0"
ng-model="service.ReservationMemoryBytes"
@ -27,6 +28,7 @@
<input
class="input-sm"
type="number"
data-cy="docker-service-memory-limit-input"
step="0.125"
min="0"
ng-model="service.LimitMemoryBytes"
@ -44,6 +46,7 @@
</td>
<td>
<slider
data-cy="docker-service-cpu-reservation-slider"
model="service.ReservationNanoCPUs"
floor="0"
ceil="state.sliderMaxCpu"
@ -64,6 +67,7 @@
</td>
<td>
<slider
data-cy="docker-service-cpu-limit-slider"
model="service.LimitNanoCPUs"
floor="0"
ceil="state.sliderMaxCpu"

4
app/docker/views/services/edit/includes/restart.html
View file

@ -10,6 +10,7 @@
<div class="input-group input-group-sm">
<select
class="selectpicker form-control !rounded"
data-cy="docker-service-restart-condition-select"
ng-model="service.RestartCondition"
ng-change="updateServiceAttribute(service, 'RestartCondition')"
disable-authorization="DockerServiceUpdate"
@ -30,6 +31,7 @@
<input
class="input-sm"
type="text"
data-cy="docker-service-restart-delay-input"
ng-model="service.RestartDelay"
ng-change="updateServiceAttribute(service, 'RestartDelay')"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"
@ -48,6 +50,7 @@
<input
class="input-sm"
type="number"
data-cy="docker-service-restart-max-attempts-input"
ng-model="service.RestartMaxAttempts"
ng-change="updateServiceAttribute(service, 'RestartMaxAttempts')"
disable-authorization="DockerServiceUpdate"
@ -63,6 +66,7 @@
<input
class="input-sm"
type="text"
data-cy="docker-service-restart-window-input"
ng-model="service.RestartWindow"
ng-change="updateServiceAttribute(service, 'RestartWindow')"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"

7
app/docker/views/services/edit/includes/secrets.html
View file

@ -4,7 +4,12 @@
<rd-widget-body classes="no-padding">
<div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
Add a secret:
<select class="form-control !h-[30px] !text-[13px]" ng-options="secret.Name for secret in secrets | orderBy: 'Name'" ng-model="state.addSecret.secret">
<select
class="form-control !h-[30px] !text-[13px]"
ng-options="secret.Name for secret in secrets | orderBy: 'Name'"
ng-model="state.addSecret.secret"
data-cy="service-secrets-select"
>
<option selected disabled hidden value="">Select a secret</option>
</select>
<div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.3 && state.addSecret.override">

2
app/docker/views/services/edit/includes/servicelabels.html
View file

@ -23,6 +23,7 @@
<span class="input-group-addon fit-text-size">name</span>
<input
type="text"
data-cy="service-label-key-{{ $index }}"
class="form-control"
ng-model="label.key"
placeholder="e.g. com.example.foo"
@ -37,6 +38,7 @@
<span class="input-group-addon fit-text-size">value</span>
<input
type="text"
data-cy="service-label-value_{{ $index }}"
class="form-control"
ng-model="label.value"
placeholder="e.g. bar"

6
app/docker/views/services/edit/includes/updateconfig.html
View file

@ -10,6 +10,7 @@
<input
class="input-sm"
type="number"
data-cy="docker-service-update-parallelism-input"
ng-model="service.UpdateParallelism"
ng-change="updateServiceAttribute(service, 'UpdateParallelism')"
disable-authorization="DockerServiceUpdate"
@ -25,6 +26,7 @@
<input
class="input-sm"
type="text"
data-cy="docker-service-update-delay-input"
ng-model="service.UpdateDelay"
ng-change="updateServiceAttribute(service, 'UpdateDelay')"
ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i"
@ -43,6 +45,7 @@
<input
type="radio"
name="failure_action"
data-cy="update-failure-action-continue"
ng-model="service.UpdateFailureAction"
value="continue"
ng-change="updateServiceAttribute(service, 'UpdateFailureAction')"
@ -54,6 +57,7 @@
<input
type="radio"
name="failure_action"
data-cy="update-failure-action-pause"
ng-model="service.UpdateFailureAction"
value="pause"
ng-change="updateServiceAttribute(service, 'UpdateFailureAction')"
@ -75,6 +79,7 @@
<input
type="radio"
name="updateconfig_order"
data-cy="update-order-start-first"
ng-model="service.UpdateOrder"
value="start-first"
ng-change="updateServiceAttribute(service, 'UpdateOrder')"
@ -86,6 +91,7 @@
<input
type="radio"
name="updateconfig_order"
data-cy="update-order-stop-first"
ng-model="service.UpdateOrder"
value="stop-first"
ng-change="updateServiceAttribute(service, 'UpdateOrder')"

18
app/docker/views/services/edit/service.html
View file

@ -18,17 +18,20 @@
<tr>
<td class="w-1/5">Name</td>
<td ng-if="applicationState.endpoint.apiVersion <= 1.24">
<input type="text" class="form-control" ng-model="service.Name" ng-change="updateServiceAttribute(service, 'Name')" ng-disabled="isUpdating" />
</td>
<td ng-if="applicationState.endpoint.apiVersion >= 1.25">
{{ service.Name }}
<input
type="text"
class="form-control"
ng-model="service.Name"
ng-change="updateServiceAttribute(service, 'Name')"
ng-disabled="isUpdating"
data-cy="docker-service-edit-name"
/>
</td>
<td ng-if="applicationState.endpoint.apiVersion >= 1.25"> {{ service.Name }} </td>
</tr>
<tr>
<td>ID</td>
<td>
{{ service.Id }}
</td>
<td> {{ service.Id }} </td>
</tr>
<tr ng-if="service.CreatedAt">
<td>Created at</td>
@ -53,6 +56,7 @@
<input
class="input-sm"
type="number"
data-cy="docker-service-edit-replicas-input"
ng-model="service.Replicas"
ng-change="updateServiceAttribute(service, 'Replicas')"
disable-authorization="DockerServiceUpdate"

6
app/docker/views/swarm/visualizer/swarmvisualizer.html
View file

@ -57,7 +57,7 @@
<pr-icon id="refreshRateChange" icon="'check'" mode="'success'" size="'sm'" style="display: none"></pr-icon>
</label>
<div class="col-sm-2">
<select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control">
<select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control" data-cy="swarm-refreshRate-select">
<option value="5">5s</option>
<option value="10">10s</option>
<option value="30">30s</option>
@ -97,9 +97,7 @@
<div class="node_labels" ng-if="node.Labels.length > 0 && state.DisplayNodeLabels">
<div>Labels</div>
<div class="node_label" ng-repeat="label in node.Labels">
<span class="label_key">
{{ label.key }}
</span>
<span class="label_key"> {{ label.key }} </span>
<span class="label_value" ng-if="label.value"> = {{ label.value }} </span>
</div>
</div>

24
app/docker/views/volumes/create/createvolume.html
View file

@ -9,7 +9,7 @@
<div class="form-group">
<label for="volume_name" class="col-sm-2 col-md-1 control-label text-left">Name</label>
<div class="col-sm-10 col-md-11">
<input type="text" class="form-control" ng-model="formValues.Name" id="volume_name" placeholder="e.g. myVolume" />
<input type="text" class="form-control" ng-model="formValues.Name" id="volume_name" placeholder="e.g. myVolume" data-cy="volume-name-input" />
</div>
</div>
<!-- !name-input -->
@ -18,10 +18,24 @@
<div class="form-group">
<label for="volume_driver" class="col-sm-2 col-md-1 control-label text-left">Driver</label>
<div class="col-sm-10 col-md-11">
<select class="form-control" ng-options="driver for driver in availableVolumeDrivers" ng-model="formValues.Driver" ng-if="availableVolumeDrivers.length > 0">
<select
class="form-control"
ng-options="driver for driver in availableVolumeDrivers"
ng-model="formValues.Driver"
ng-if="availableVolumeDrivers.length > 0"
data-cy="volume-driver-select"
>
<option disabled hidden value="">Select a driver</option>
</select>
<input type="text" class="form-control" ng-model="formValues.Driver" id="volume_driver" placeholder="e.g. driverName" ng-if="availableVolumeDrivers.length === 0" />
<input
type="text"
class="form-control"
ng-model="formValues.Driver"
id="volume_driver"
placeholder="e.g. driverName"
ng-if="availableVolumeDrivers.length === 0"
data-cy="volume-driver-input"
/>
</div>
</div>
<!-- !driver-input -->
@ -41,11 +55,11 @@
<div ng-repeat="option in formValues.DriverOptions" style="margin-top: 2px">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">name</span>
<input type="text" class="form-control" ng-model="option.name" placeholder="e.g. mountpoint" />
<input type="text" class="form-control" ng-model="option.name" placeholder="e.g. mountpoint" data-cy="driver-option-name-input" />
</div>
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">value</span>
<input type="text" class="form-control" ng-model="option.value" placeholder="e.g. /path/on/host" />
<input type="text" class="form-control" ng-model="option.value" placeholder="e.g. /path/on/host" data-cy="driver-option-value-input" />
</div>
<button class="btn btn-sm btn-light" type="button" ng-click="removeDriverOption($index)">
<pr-icon icon="'trash-2'" class-name="'icon-secondary icon-md'"></pr-icon>