From c80cc6e26869ac93773517de753145ac65745d9e Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Thu, 30 Jan 2025 15:42:32 +1300
Subject: [PATCH] chore(automation): give unique selectors [r8s-168] (#345)

Co-authored-by: JamesPlayer <james.player@portainer.io>
---
 app/react/components/TagSelector/TagSelector.tsx              | 1 +
 app/react/components/UsersSelector/UsersSelector.tsx          | 1 +
 app/react/components/form-components/Input/Select.tsx         | 1 +
 app/react/components/form-components/PortainerSelect.tsx      | 2 ++
 app/react/components/form-components/ReactSelect.tsx          | 1 +
 .../CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx       | 2 ++
 .../containers/CreateView/VolumesTab/VolumeSelector.tsx       | 1 +
 .../AssignmentDialog/Selectors/CreatableSelector.tsx          | 1 +
 .../Datatable/AssignmentDialog/Selectors/GroupSelector.tsx    | 1 +
 .../CreateView/TemplateFieldset/TemplateSelector.tsx          | 1 +
 app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx  | 1 +
 .../edge/edge-stacks/components/PrivateRegistryFieldset.tsx   | 1 +
 .../application-services/ingress/AppIngressPathForm.tsx       | 1 +
 .../ConfigurationsFormSection/ConfigurationItem.tsx           | 1 +
 .../PersistedFoldersFormSection/PersistedFolderItem.tsx       | 3 +++
 .../components/PlacementFormSection/PlacementItem.tsx         | 2 ++
 .../ConfigureView/ConfigureForm/StorageAccessModeSelector.tsx | 1 +
 .../cluster/RegistryAccessView/NamespacesSelector.tsx         | 1 +
 .../kubernetes/ingresses/CreateIngressView/IngressForm.tsx    | 3 +++
 .../namespaces/AccessView/NamespaceAccessUsersSelector.tsx    | 1 +
 .../RegistriesFormSection/RegistriesSelector.tsx              | 1 +
 .../AccessManagement/PorAccessManagementUsersSelector.tsx     | 1 +
 app/react/portainer/access-control/EditDetails/TeamsField.tsx | 4 ++--
 app/react/portainer/access-control/EditDetails/UsersField.tsx | 4 ++--
 .../access-control/PorAccessControlForm/TeamsSelector.tsx     | 1 +
 .../access-control/PorAccessControlForm/UsersSelector.tsx     | 1 +
 .../common/TimeWindowPicker/TimeWindowPickerInputGroup.tsx    | 1 +
 .../environments/update-schedules/common/EdgeGroupsField.tsx  | 1 +
 .../portainer/gitops/AuthFieldset/CredentialSelector.tsx      | 1 +
 29 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app/react/components/TagSelector/TagSelector.tsx b/app/react/components/TagSelector/TagSelector.tsx
index 425337c64..80726e0a9 100644
--- a/app/react/components/TagSelector/TagSelector.tsx
+++ b/app/react/components/TagSelector/TagSelector.tsx
@@ -104,6 +104,7 @@ export function TagSelector({
           onCreateOption={handleCreateOption}
           aria-label="Tags"
           data-cy="environment-tags-selector"
+          id="environment-tags-selector"
         />
       </FormControl>
     </>
diff --git a/app/react/components/UsersSelector/UsersSelector.tsx b/app/react/components/UsersSelector/UsersSelector.tsx
index 88bbd6de0..99068c205 100644
--- a/app/react/components/UsersSelector/UsersSelector.tsx
+++ b/app/react/components/UsersSelector/UsersSelector.tsx
@@ -36,6 +36,7 @@ export function UsersSelector({
         onChange(selectedUsers.map((user) => user.Id))
       }
       data-cy={dataCy}
+      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}
diff --git a/app/react/components/form-components/Input/Select.tsx b/app/react/components/form-components/Input/Select.tsx
index 8c9d11b7b..1ba85fadf 100644
--- a/app/react/components/form-components/Input/Select.tsx
+++ b/app/react/components/form-components/Input/Select.tsx
@@ -18,6 +18,7 @@ export function Select<T extends number | string>({
   options,
   className,
   'data-cy': dataCy,
+  id,
   ...props
 }: Props<T> & SelectHTMLAttributes<HTMLSelectElement>) {
   return (
diff --git a/app/react/components/form-components/PortainerSelect.tsx b/app/react/components/form-components/PortainerSelect.tsx
index 04f9517a9..9ddf234da 100644
--- a/app/react/components/form-components/PortainerSelect.tsx
+++ b/app/react/components/form-components/PortainerSelect.tsx
@@ -111,6 +111,7 @@ export function SingleSelect<TValue = string>({
       onChange={(option) => onChange(option ? option.value : null)}
       isOptionDisabled={(option) => !!option.disabled}
       data-cy={dataCy}
+      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}
@@ -177,6 +178,7 @@ export function MultiSelect<TValue = string>({
       closeMenuOnSelect={false}
       onChange={(newValue) => onChange(newValue.map((option) => option.value))}
       data-cy={dataCy}
+      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       isDisabled={disabled}
diff --git a/app/react/components/form-components/ReactSelect.tsx b/app/react/components/form-components/ReactSelect.tsx
index 3ec4429b9..a9f4e6282 100644
--- a/app/react/components/form-components/ReactSelect.tsx
+++ b/app/react/components/form-components/ReactSelect.tsx
@@ -65,6 +65,7 @@ export function Select<
 }: Props<Option, IsMulti, Group> &
   AutomationTestingProps & {
     isItemVisible?: (item: Option, search: string) => boolean;
+    id: string;
   }) {
   const Component = isCreatable ? ReactSelectCreatable : ReactSelect;
   const { options } = props;
diff --git a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx
index 09d1fada8..7d1a3ae31 100644
--- a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx
+++ b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx
@@ -152,6 +152,7 @@ export function GpuFieldset({
               options={options}
               components={{ MultiValueRemove }}
               data-cy="docker-containers-gpu-select"
+              id="docker-containers-gpu-select"
             />
           </div>
         )}
@@ -173,6 +174,7 @@ export function GpuFieldset({
                 components={{ Option }}
                 onChange={onChangeSelectedCaps}
                 data-cy="docker-containers-gpu-capabilities-select"
+                id="docker-containers-gpu-capabilities-select"
               />
             </div>
           </div>
diff --git a/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx b/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx
index 22bf9df52..9cf8a2783 100644
--- a/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx
+++ b/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx
@@ -44,6 +44,7 @@ export function VolumeSelector({
       onChange={(vol) => onChange(vol?.Name)}
       inputId={inputId}
       data-cy="docker-containers-volume-selector"
+      id="docker-containers-volume-selector"
       size="sm"
     />
   );
diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/CreatableSelector.tsx b/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/CreatableSelector.tsx
index 5666b0260..ecb379086 100644
--- a/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/CreatableSelector.tsx
+++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/CreatableSelector.tsx
@@ -43,6 +43,7 @@ export function CreatableSelector({
       isDisabled={isLoading}
       closeMenuOnSelect={false}
       data-cy="edge-devices-assignment-selector"
+      id="edge-devices-assignment-selector"
     />
   );
 
diff --git a/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/GroupSelector.tsx b/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/GroupSelector.tsx
index d87abe1c1..79884178d 100644
--- a/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/GroupSelector.tsx
+++ b/app/react/edge/edge-devices/WaitingRoomView/Datatable/AssignmentDialog/Selectors/GroupSelector.tsx
@@ -45,6 +45,7 @@ export function GroupSelector() {
       placeholder="Select a group"
       isClearable
       data-cy="edge-devices-assignment-selector"
+      id="edge-devices-assignment-selector"
     />
   );
 
diff --git a/app/react/edge/edge-stacks/CreateView/TemplateFieldset/TemplateSelector.tsx b/app/react/edge/edge-stacks/CreateView/TemplateFieldset/TemplateSelector.tsx
index 3922c840c..176921856 100644
--- a/app/react/edge/edge-stacks/CreateView/TemplateFieldset/TemplateSelector.tsx
+++ b/app/react/edge/edge-stacks/CreateView/TemplateFieldset/TemplateSelector.tsx
@@ -50,6 +50,7 @@ export function TemplateSelector({
           onChange(getTemplate({ type, id: templateId }), type);
         }}
         data-cy="edge-stacks-create-template-selector"
+        id="edge-stacks-create-template-selector"
       />
       {isLoadingValues && (
         <InlineLoader>Loading template values...</InlineLoader>
diff --git a/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx b/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx
index 914274882..9bbcb0e3c 100644
--- a/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx
+++ b/app/react/edge/edge-stacks/components/EdgeGroupsSelector.tsx
@@ -97,6 +97,7 @@ function InnerSelector({
       placeholder="Select one or multiple group(s)"
       closeMenuOnSelect={false}
       data-cy="edge-stacks-groups-selector"
+      id="edge-stacks-groups-selector"
       inputId={inputId}
     />
   ) : (
diff --git a/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx b/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
index f6d952201..7a1703ffc 100644
--- a/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
+++ b/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
@@ -102,6 +102,7 @@ export function PrivateRegistryFieldset({
                   onChange={(value) => onSelect(value?.Id)}
                   className="w-full"
                   data-cy="private-registry-selector"
+                  id="private-registry-selector"
                 />
                 {method !== 'repository' && (
                   <Button
diff --git a/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx b/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx
index c427b7bec..9907f410d 100644
--- a/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx
+++ b/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx
@@ -122,6 +122,7 @@ export function AppIngressPathForm({
               onChangeIngressPath(newIngressPath);
             }}
             data-cy="k8sAppCreate-ingressPathHostSelect"
+            id="k8sAppCreate-ingressPathHostSelect"
           />
           <InputGroup.ButtonWrapper>
             <Button
diff --git a/app/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigurationItem.tsx b/app/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigurationItem.tsx
index 6c51cabf8..1a5e17291 100644
--- a/app/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigurationItem.tsx
+++ b/app/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigurationItem.tsx
@@ -60,6 +60,7 @@ export function ConfigurationItem({
               onChange={onSelectConfigMap}
               size="sm"
               data-cy={`k8sAppCreate-add${configurationType}Select_${index}`}
+              id={`k8sAppCreate-add${configurationType}Select_${index}`}
             />
           </InputGroup>
           {formikError?.selectedConfiguration && (
diff --git a/app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx b/app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx
index 14290977c..5e3353d4e 100644
--- a/app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx
+++ b/app/react/kubernetes/applications/components/PersistedFoldersFormSection/PersistedFolderItem.tsx
@@ -144,6 +144,7 @@ export function PersistedFolderItem({
                   applicationValues.Containers.length > 1
                 }
                 data-cy={`k8sAppCreate-persistentFolderSizeUnitSelect_${index}`}
+                id={`k8sAppCreate-persistentFolderSizeUnitSelect_${index}`}
               />
             </InputGroup>
             {formikError?.size && <FormError>{formikError?.size}</FormError>}
@@ -175,6 +176,7 @@ export function PersistedFolderItem({
                 storageClasses.length <= 1
               }
               data-cy={`k8sAppCreate-storageSelect_${index}`}
+              id={`k8sAppCreate-storageSelect_${index}`}
             />
           </InputGroup>
         </>
@@ -207,6 +209,7 @@ export function PersistedFolderItem({
               availableVolumes.length < 1
             }
             data-cy={`k8sAppCreate-pvcSelect_${index}`}
+            id={`k8sAppCreate-pvcSelect_${index}`}
           />
         </InputGroup>
       )}
diff --git a/app/react/kubernetes/applications/components/PlacementFormSection/PlacementItem.tsx b/app/react/kubernetes/applications/components/PlacementFormSection/PlacementItem.tsx
index b3ec7ccdf..e5cf3e1fb 100644
--- a/app/react/kubernetes/applications/components/PlacementFormSection/PlacementItem.tsx
+++ b/app/react/kubernetes/applications/components/PlacementFormSection/PlacementItem.tsx
@@ -49,6 +49,7 @@ export function PlacementItem({
             className={clsx({ striked: !!item.needsDeletion })}
             isDisabled={!!item.needsDeletion}
             data-cy={`k8sAppCreate-placementLabel_${index}`}
+            id={`k8sAppCreate-placementLabel_${index}`}
           />
           {placementError?.label && (
             <FormError>{placementError.label}</FormError>
@@ -65,6 +66,7 @@ export function PlacementItem({
             className={clsx({ striked: !!item.needsDeletion })}
             isDisabled={!!item.needsDeletion}
             data-cy={`k8sAppCreate-placementName_${index}`}
+            id={`k8sAppCreate-placementName_${index}`}
           />
           {placementError?.value && (
             <FormError>{placementError.value}</FormError>
diff --git a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/StorageAccessModeSelector.tsx b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/StorageAccessModeSelector.tsx
index 6f01ad877..06759a044 100644
--- a/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/StorageAccessModeSelector.tsx
+++ b/app/react/kubernetes/cluster/ConfigureView/ConfigureForm/StorageAccessModeSelector.tsx
@@ -35,6 +35,7 @@ export function StorageAccessModeSelector({
       inputId={inputId}
       placeholder="Not configured"
       data-cy={`kubeSetup-storageAccessSelect${storageClassName}`}
+      id={`kubeSetup-storageAccessSelect${storageClassName}`}
     />
   );
 }
diff --git a/app/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector.tsx b/app/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector.tsx
index 57c650221..4c16ecaac 100644
--- a/app/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector.tsx
+++ b/app/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector.tsx
@@ -43,6 +43,7 @@ export function NamespacesSelector({
         onChange(selectedTeams.map((namespace) => namespace.name))
       }
       data-cy={dataCy}
+      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
     />
diff --git a/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
index 230d08a42..4038b1064 100644
--- a/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
+++ b/app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
@@ -184,6 +184,7 @@ export function IngressForm({
                       }
                       noOptionsMessage={() => 'No namespaces available'}
                       data-cy="k8sAppCreate-namespaceSelect"
+                      id="k8sAppCreate-namespaceSelect"
                     />
                   )}
                 </div>
@@ -266,6 +267,7 @@ export function IngressForm({
                         }
                         noOptionsMessage={() => 'No ingress classes available'}
                         data-cy="k8sAppCreate-ingressClassSelect"
+                        id="k8sAppCreate-ingressClassSelect"
                       />
                       {errors.className && (
                         <FormError className="error-inline mt-1">
@@ -464,6 +466,7 @@ export function IngressForm({
                           noOptionsMessage={() => 'No TLS secrets available'}
                           size="sm"
                           data-cy={`k8sAppCreate-tlsSelect_${hostIndex}`}
+                          id={`k8sAppCreate-tlsSelect_${hostIndex}`}
                         />
                         {!host.NoHost && (
                           <div className="input-group-btn">
diff --git a/app/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector.tsx b/app/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector.tsx
index f3d9f02f1..1a48bfbfc 100644
--- a/app/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector.tsx
+++ b/app/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector.tsx
@@ -35,6 +35,7 @@ export function NamespaceAccessUsersSelector({
       closeMenuOnSelect={false}
       onChange={onChange}
       data-cy={dataCy}
+      id={dataCy}
       inputId={inputId}
       placeholder={placeholder}
       components={{ MultiValueLabel, Option: OptionComponent }}
diff --git a/app/react/kubernetes/namespaces/components/NamespaceForm/RegistriesFormSection/RegistriesSelector.tsx b/app/react/kubernetes/namespaces/components/NamespaceForm/RegistriesFormSection/RegistriesSelector.tsx
index 4cf9d5f8f..2100da57a 100644
--- a/app/react/kubernetes/namespaces/components/NamespaceForm/RegistriesFormSection/RegistriesSelector.tsx
+++ b/app/react/kubernetes/namespaces/components/NamespaceForm/RegistriesFormSection/RegistriesSelector.tsx
@@ -67,6 +67,7 @@ export function RegistriesSelector({
       onChange={onChange}
       inputId={inputId}
       data-cy="namespaceCreate-registrySelect"
+      id="namespaceCreate-registrySelect"
       placeholder="Select one or more registries"
       isDisabled={isEditingDisabled}
     />
diff --git a/app/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector.tsx b/app/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector.tsx
index 2151ee977..87a19a837 100644
--- a/app/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector.tsx
+++ b/app/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector.tsx
@@ -37,6 +37,7 @@ export function PorAccessManagementUsersSelector({
             closeMenuOnSelect={false}
             onChange={onChange}
             data-cy="component-selectUser"
+            id="component-selectUser"
             inputId="users-selector"
             placeholder="Select one or more users and/or teams"
             components={{ MultiValueLabel, Option: OptionComponent }}
diff --git a/app/react/portainer/access-control/EditDetails/TeamsField.tsx b/app/react/portainer/access-control/EditDetails/TeamsField.tsx
index 8e8f46d14..b6bfc474f 100644
--- a/app/react/portainer/access-control/EditDetails/TeamsField.tsx
+++ b/app/react/portainer/access-control/EditDetails/TeamsField.tsx
@@ -30,7 +30,7 @@ export function TeamsField({
             'You can select which team(s) will be able to manage this resource.'
           : undefined
       }
-      inputId="teams-selector"
+      inputId="authorized-teams-selector"
       errors={errors}
     >
       {teams.length > 0 ? (
@@ -39,7 +39,7 @@ export function TeamsField({
           teams={teams}
           onChange={onChange}
           value={value}
-          inputId="teams-selector"
+          inputId="authorized-teams-selector"
           dataCy="teams-selector"
         />
       ) : (
diff --git a/app/react/portainer/access-control/EditDetails/UsersField.tsx b/app/react/portainer/access-control/EditDetails/UsersField.tsx
index bdb65f148..b0e9c0670 100644
--- a/app/react/portainer/access-control/EditDetails/UsersField.tsx
+++ b/app/react/portainer/access-control/EditDetails/UsersField.tsx
@@ -21,7 +21,7 @@ export function UsersField({ name, users, value, onChange, errors }: Props) {
           ? 'You can select which user(s) will be able to manage this resource.'
           : undefined
       }
-      inputId="users-selector"
+      inputId="authorized-users-selector"
       errors={errors}
     >
       {users.length > 0 ? (
@@ -30,7 +30,7 @@ export function UsersField({ name, users, value, onChange, errors }: Props) {
           users={users}
           onChange={onChange}
           value={value}
-          inputId="users-selector"
+          inputId="authorized-users-selector"
           dataCy="users-selector"
         />
       ) : (
diff --git a/app/react/portainer/access-control/PorAccessControlForm/TeamsSelector.tsx b/app/react/portainer/access-control/PorAccessControlForm/TeamsSelector.tsx
index 5b3fd89fb..945c582aa 100644
--- a/app/react/portainer/access-control/PorAccessControlForm/TeamsSelector.tsx
+++ b/app/react/portainer/access-control/PorAccessControlForm/TeamsSelector.tsx
@@ -26,6 +26,7 @@ export function PorAccessControlFormTeamSelector({
       closeMenuOnSelect={false}
       onChange={onChange}
       data-cy="portainer-selectTeamAccess"
+      id="portainer-selectTeamAccess"
       inputId={inputId}
       placeholder="Select one or more teams"
     />
diff --git a/app/react/portainer/access-control/PorAccessControlForm/UsersSelector.tsx b/app/react/portainer/access-control/PorAccessControlForm/UsersSelector.tsx
index 395a0da83..31eb80ae5 100644
--- a/app/react/portainer/access-control/PorAccessControlForm/UsersSelector.tsx
+++ b/app/react/portainer/access-control/PorAccessControlForm/UsersSelector.tsx
@@ -26,6 +26,7 @@ export function PorAccessControlFormUserSelector({
       closeMenuOnSelect={false}
       onChange={onChange}
       data-cy="portainer-selectUserAccess"
+      id="portainer-selectUserAccess"
       inputId={inputId}
       placeholder="Select one or more users"
     />
diff --git a/app/react/portainer/environments/common/TimeWindowPicker/TimeWindowPickerInputGroup.tsx b/app/react/portainer/environments/common/TimeWindowPicker/TimeWindowPickerInputGroup.tsx
index a02a699a6..291ea4019 100644
--- a/app/react/portainer/environments/common/TimeWindowPicker/TimeWindowPickerInputGroup.tsx
+++ b/app/react/portainer/environments/common/TimeWindowPicker/TimeWindowPickerInputGroup.tsx
@@ -112,6 +112,7 @@ export function TimeWindowPickerInputGroup({
             onChangeTimeZone(newTimeZone.value);
           }}
           data-cy="time-window-picker-timezone-select"
+          id="time-window-picker-timezone-select"
         />
       </div>
       {errors?.StartTime && <FormError>{errors.StartTime}</FormError>}
diff --git a/app/react/portainer/environments/update-schedules/common/EdgeGroupsField.tsx b/app/react/portainer/environments/update-schedules/common/EdgeGroupsField.tsx
index 87818814b..9052a7311 100644
--- a/app/react/portainer/environments/update-schedules/common/EdgeGroupsField.tsx
+++ b/app/react/portainer/environments/update-schedules/common/EdgeGroupsField.tsx
@@ -54,6 +54,7 @@ export function EdgeGroupsField({
           closeMenuOnSelect={false}
           isDisabled={disabled}
           data-cy="update-schedules-edge-groups-select"
+          id="update-schedules-edge-groups-select"
         />
       </FormControl>
       <TextTip color="blue">
diff --git a/app/react/portainer/gitops/AuthFieldset/CredentialSelector.tsx b/app/react/portainer/gitops/AuthFieldset/CredentialSelector.tsx
index 13d53e896..01a4f49de 100644
--- a/app/react/portainer/gitops/AuthFieldset/CredentialSelector.tsx
+++ b/app/react/portainer/gitops/AuthFieldset/CredentialSelector.tsx
@@ -41,6 +41,7 @@ export function CredentialSelector({
             noOptionsMessage={() => 'no saved credentials'}
             inputId="git-creds-selector"
             data-cy="git-credentials-selector"
+            id="git-credentials-selector"
           />
         </FormControl>
       </div>