ci: Fixing remaining 4 failing cypress test cases

app/client/cypress/fixtures/PartialImportExport/PartialImportExportSampleApp.json

@@ -2208,7 +2208,7 @@
           "selfReferencingDataPaths": [],
           "jsArguments": []
         },
-        "executeOnLoad": false,
+        "runBehavior": "MANUAL",
         "clientSideExecution": true,
         "dynamicBindingPathList": [{ "key": "body" }],
         "isValid": true,
@@ -2264,7 +2264,7 @@
           "selfReferencingDataPaths": [],
           "jsArguments": [{ "name": "a" }, { "name": "b" }]
         },
-        "executeOnLoad": false,
+        "runBehavior": "MANUAL",
         "dynamicBindingPathList": [{ "key": "body" }],
         "isValid": true,
         "invalids": [],
@@ -2318,7 +2318,7 @@
           "selfReferencingDataPaths": [],
           "pluginSpecifiedTemplates": [{ "value": true }]
         },
-        "executeOnLoad": false,
+        "runBehavior": "MANUAL",
         "isValid": true,
         "invalids": [],
         "messages": [],
@@ -2383,7 +2383,7 @@
           "selfReferencingDataPaths": [],
           "pluginSpecifiedTemplates": [{ "value": true }]
         },
-        "executeOnLoad": false,
+        "runBehavior": "MANUAL",
         "isValid": true,
         "invalids": [],
         "messages": [],
@@ -2447,7 +2447,7 @@
           "selfReferencingDataPaths": [],
           "pluginSpecifiedTemplates": [{ "value": true }]
         },
-        "executeOnLoad": false,
+        "runBehavior": "MANUAL",
         "isValid": true,
         "invalids": [],
         "messages": [],
@@ -2499,7 +2499,7 @@
           "selfReferencingDataPaths": [],
           "pluginSpecifiedTemplates": [{ "value": false }]
         },
-        "executeOnLoad": true,
+        "runBehavior": "ON_PAGE_LOAD",
         "isValid": true,
         "invalids": [],
         "messages": [],

app/client/cypress/fixtures/PartialImportExport/QueriesExportedOnly.json

@@ -1 +1 @@
-{"artifactJsonType":"APPLICATION","clientSchemaVersion":1,"serverSchemaVersion":7,"actionList":[{"id":"Home_InsertQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"InsertQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"INSERT INTO public.\"users\" (\n\t\"gender\",\n\t\"latitude\",\n\t\"longitude\",\n\t\"dob\",\n\t\"phone\",\n\t\"email\",\n\t\"image\",\n\t\"country\",\n\t\"name\",\n\t\"created_at\",\n\t\"updated_at\"\n)\nVALUES (\n\t'{{insert_form.formData.gender}}',\n\t'{{insert_form.formData.latitude}}',\n\t'{{insert_form.formData.longitude}}',\n\t'{{insert_form.formData.dob}}',\n\t'{{insert_form.formData.phone}}',\n\t'{{insert_form.formData.email}}',\n\t'{{insert_form.formData.image}}',\n\t'{{insert_form.formData.country}}',\n\t'{{insert_form.formData.name}}',\n\t'{{insert_form.formData.created_at}}',\n\t'{{insert_form.formData.updated_at}}'\n);","pluginSpecifiedTemplates":[{"value":true}]},"executeOnLoad":false,"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["insert_form.formData.dob","insert_form.formData.image","insert_form.formData.gender","insert_form.formData.email","insert_form.formData.name","insert_form.formData.longitude","insert_form.formData.updated_at","insert_form.formData.phone","insert_form.formData.latitude","insert_form.formData.created_at","insert_form.formData.country"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_DeleteQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"DeleteQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"DELETE FROM public.\"users\"\n  WHERE \"id\" = {{data_table.triggeredRow.id}};","pluginSpecifiedTemplates":[{"value":true}]},"executeOnLoad":false,"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["data_table.triggeredRow.id"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_UpdateQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"UpdateQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"UPDATE public.\"users\" SET\n\t\t\"gender\" = '{{update_form.fieldState.gender.isVisible ? update_form.formData.gender : update_form.sourceData.gender}}',\n\t\t\"latitude\" = '{{update_form.fieldState.latitude.isVisible ? update_form.formData.latitude : update_form.sourceData.latitude}}',\n    \"longitude\" = '{{update_form.fieldState.longitude.isVisible ? update_form.formData.longitude : update_form.sourceData.longitude}}',\n\t\t\"dob\" = '{{update_form.fieldState.dob.isVisible ? update_form.formData.dob : update_form.sourceData.dob}}',\n\t\t\"phone\" = '{{update_form.fieldState.phone.isVisible ? update_form.formData.phone : update_form.sourceData.phone}}',\n\t\t\"email\" = '{{update_form.fieldState.email.isVisible ? update_form.formData.email : update_form.sourceData.email}}',\n\t\t\"image\" = '{{update_form.fieldState.image.isVisible ? update_form.formData.image : update_form.sourceData.image}}',\n\t\t\"country\" = '{{update_form.fieldState.country.isVisible ? update_form.formData.country : update_form.sourceData.country}}',\n\t\t\"name\" = '{{update_form.fieldState.name.isVisible ? update_form.formData.name : update_form.sourceData.name}}',\n\t\t\"created_at\" = '{{update_form.fieldState.created_at.isVisible ? update_form.formData.created_at : update_form.sourceData.created_at}}',\n\t\t\"updated_at\" = '{{update_form.fieldState.updated_at.isVisible ? update_form.formData.updated_at : update_form.sourceData.updated_at}}'\n\tWHERE \"id\" = {{data_table.selectedRow.id}};","pluginSpecifiedTemplates":[{"value":true}]},"executeOnLoad":false,"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["update_form.fieldState.latitude.isVisible ? update_form.formData.latitude : update_form.sourceData.latitude","update_form.fieldState.image.isVisible ? update_form.formData.image : update_form.sourceData.image","data_table.selectedRow.id","update_form.fieldState.country.isVisible ? update_form.formData.country : update_form.sourceData.country","update_form.fieldState.longitude.isVisible ? update_form.formData.longitude : update_form.sourceData.longitude","update_form.fieldState.updated_at.isVisible ? update_form.formData.updated_at : update_form.sourceData.updated_at","update_form.fieldState.email.isVisible ? update_form.formData.email : update_form.sourceData.email","update_form.fieldState.created_at.isVisible ? update_form.formData.created_at : update_form.sourceData.created_at","update_form.fieldState.dob.isVisible ? update_form.formData.dob : update_form.sourceData.dob","update_form.fieldState.name.isVisible ? update_form.formData.name : update_form.sourceData.name","update_form.fieldState.gender.isVisible ? update_form.formData.gender : update_form.sourceData.gender","update_form.fieldState.phone.isVisible ? update_form.formData.phone : update_form.sourceData.phone"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_SelectQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"SelectQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"SELECT * FROM public.\"users\"\nWHERE \"gender\" ilike '%{{data_table.searchText || \"\"}}%'\nORDER BY \"{{data_table.sortOrder.column || 'id'}}\" {{data_table.sortOrder.order || 'ASC'}}\nLIMIT {{data_table.pageSize}}\nOFFSET {{(data_table.pageNo - 1) * data_table.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"executeOnLoad":true,"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["data_table.sortOrder.column || 'id'","data_table.sortOrder.order || 'ASC'","data_table.pageSize","data_table.searchText || \"\"","(data_table.pageNo - 1) * data_table.pageSize"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"messages":[],"confirmBeforeExecute":false,"userPermissions":[]}}],"widgets":""}
+{"artifactJsonType":"APPLICATION","clientSchemaVersion":1,"serverSchemaVersion":7,"actionList":[{"id":"Home_InsertQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"InsertQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"INSERT INTO public.\"users\" (\n\t\"gender\",\n\t\"latitude\",\n\t\"longitude\",\n\t\"dob\",\n\t\"phone\",\n\t\"email\",\n\t\"image\",\n\t\"country\",\n\t\"name\",\n\t\"created_at\",\n\t\"updated_at\"\n)\nVALUES (\n\t'{{insert_form.formData.gender}}',\n\t'{{insert_form.formData.latitude}}',\n\t'{{insert_form.formData.longitude}}',\n\t'{{insert_form.formData.dob}}',\n\t'{{insert_form.formData.phone}}',\n\t'{{insert_form.formData.email}}',\n\t'{{insert_form.formData.image}}',\n\t'{{insert_form.formData.country}}',\n\t'{{insert_form.formData.name}}',\n\t'{{insert_form.formData.created_at}}',\n\t'{{insert_form.formData.updated_at}}'\n);","pluginSpecifiedTemplates":[{"value":true}]},"runBehavior":"MANUAL","isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["insert_form.formData.dob","insert_form.formData.image","insert_form.formData.gender","insert_form.formData.email","insert_form.formData.name","insert_form.formData.longitude","insert_form.formData.updated_at","insert_form.formData.phone","insert_form.formData.latitude","insert_form.formData.created_at","insert_form.formData.country"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"runBehavior":"MANUAL","messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_DeleteQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"DeleteQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"DELETE FROM public.\"users\"\n  WHERE \"id\" = {{data_table.triggeredRow.id}};","pluginSpecifiedTemplates":[{"value":true}]},"runBehavior":"MANUAL","isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["data_table.triggeredRow.id"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"runBehavior":"MANUAL","messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_UpdateQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"UpdateQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"UPDATE public.\"users\" SET\n\t\t\"gender\" = '{{update_form.fieldState.gender.isVisible ? update_form.formData.gender : update_form.sourceData.gender}}',\n\t\t\"latitude\" = '{{update_form.fieldState.latitude.isVisible ? update_form.formData.latitude : update_form.sourceData.latitude}}',\n    \"longitude\" = '{{update_form.fieldState.longitude.isVisible ? update_form.formData.longitude : update_form.sourceData.longitude}}',\n\t\t\"dob\" = '{{update_form.fieldState.dob.isVisible ? update_form.formData.dob : update_form.sourceData.dob}}',\n\t\t\"phone\" = '{{update_form.fieldState.phone.isVisible ? update_form.formData.phone : update_form.sourceData.phone}}',\n\t\t\"email\" = '{{update_form.fieldState.email.isVisible ? update_form.formData.email : update_form.sourceData.email}}',\n\t\t\"image\" = '{{update_form.fieldState.image.isVisible ? update_form.formData.image : update_form.sourceData.image}}',\n\t\t\"country\" = '{{update_form.fieldState.country.isVisible ? update_form.formData.country : update_form.sourceData.country}}',\n\t\t\"name\" = '{{update_form.fieldState.name.isVisible ? update_form.formData.name : update_form.sourceData.name}}',\n\t\t\"created_at\" = '{{update_form.fieldState.created_at.isVisible ? update_form.formData.created_at : update_form.sourceData.created_at}}',\n\t\t\"updated_at\" = '{{update_form.fieldState.updated_at.isVisible ? update_form.formData.updated_at : update_form.sourceData.updated_at}}'\n\tWHERE \"id\" = {{data_table.selectedRow.id}};","pluginSpecifiedTemplates":[{"value":true}]},"runBehavior":"MANUAL","isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["update_form.fieldState.latitude.isVisible ? update_form.formData.latitude : update_form.sourceData.latitude","update_form.fieldState.image.isVisible ? update_form.formData.image : update_form.sourceData.image","data_table.selectedRow.id","update_form.fieldState.country.isVisible ? update_form.formData.country : update_form.sourceData.country","update_form.fieldState.longitude.isVisible ? update_form.formData.longitude : update_form.sourceData.longitude","update_form.fieldState.updated_at.isVisible ? update_form.formData.updated_at : update_form.sourceData.updated_at","update_form.fieldState.email.isVisible ? update_form.formData.email : update_form.sourceData.email","update_form.fieldState.created_at.isVisible ? update_form.formData.created_at : update_form.sourceData.created_at","update_form.fieldState.dob.isVisible ? update_form.formData.dob : update_form.sourceData.dob","update_form.fieldState.name.isVisible ? update_form.formData.name : update_form.sourceData.name","update_form.fieldState.gender.isVisible ? update_form.formData.gender : update_form.sourceData.gender","update_form.fieldState.phone.isVisible ? update_form.formData.phone : update_form.sourceData.phone"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"runBehavior":"MANUAL","messages":[],"confirmBeforeExecute":false,"userPermissions":[]}},{"id":"Home_SelectQuery","pluginType":"DB","pluginId":"postgres-plugin","unpublishedAction":{"name":"SelectQuery","datasource":{"userPermissions":[],"name":"Users","pluginId":"postgres-plugin","messages":[],"isValid":true},"pageId":"Home","actionConfiguration":{"timeoutInMillisecond":10000,"paginationType":"NONE","encodeParamsToggle":true,"body":"SELECT * FROM public.\"users\"\nWHERE \"gender\" ilike '%{{data_table.searchText || \"\"}}%'\nORDER BY \"{{data_table.sortOrder.column || 'id'}}\" {{data_table.sortOrder.order || 'ASC'}}\nLIMIT {{data_table.pageSize}}\nOFFSET {{(data_table.pageNo - 1) * data_table.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"runBehavior":"ON_PAGE_LOAD","isValid":true,"invalids":[],"messages":[],"jsonPathKeys":["data_table.sortOrder.column || 'id'","data_table.sortOrder.order || 'ASC'","data_table.pageSize","data_table.searchText || \"\"","(data_table.pageNo - 1) * data_table.pageSize"],"confirmBeforeExecute":false,"userPermissions":[]},"publishedAction":{"datasource":{"userPermissions":[],"messages":[],"isValid":true},"runBehavior":"MANUAL","messages":[],"confirmBeforeExecute":false,"userPermissions":[]}}],"widgets":""}

app/client/cypress/support/Pages/ApiPage.ts

@@ -105,7 +105,8 @@ export class ApiPage {
   private apiNameInput = this.locator._activeEntityTabInput;
   public pageList = ".ads-v2-sub-menu > .ads-v2-menu__menu-item";
   public _runBehaviorDropdown = "[data-testid='t--dropdown-runBehavior']";
-  public _runBehaviorOption = ".rc-select-item-option-content";
+  public _runBehaviorOption = (runBehaviour: string) =>
+    `.rc-select-item-option-content [data-testid='t--label-${runBehaviour}']`;
 
   CreateApi(
     apiName = "",
@@ -511,14 +512,12 @@ export class ApiPage {
 
   ToggleOnPageLoadRunJsObject(runBehavior: "On page load" | "Manual") {
     // Navigate to Settings tab
-    this.SelectPaneTab("Settings");
+    this.agHelper.GetNClick(this.settingsTriggerLocator);
     // Set runBehavior to On page load
     this.agHelper.GetNClick(this._runBehaviorDropdown);
     this.agHelper.GetNClickByContains(
-      this._runBehaviorOption,
+      this._runBehaviorOption(runBehavior),
       runBehavior,
-      0,
-      true,
     );
   }
 
@@ -527,10 +526,8 @@ export class ApiPage {
     // Set runBehavior to On page load
     this.agHelper.GetNClick(this._runBehaviorDropdown);
     this.agHelper.GetNClickByContains(
-      this._runBehaviorOption,
+      this._runBehaviorOption(runBehavior),
       runBehavior,
-      0,
-      true,
     );
   }
 

app/client/cypress/support/Pages/JSEditor.ts

@@ -95,7 +95,8 @@ export class JSEditor {
   _addJSObj = '[data-testid="t--ide-tabs-add-button"]';
   _jsPageActions = ".entity-context-menu";
   _moreActions = '[data-testid="t--more-action-trigger"]';
-  _dropdownOption = ".rc-select-item-option-content";
+  _dropdownOption = (runBehaviour: string) =>
+    `.rc-select-item-option-content [data-testid='t--label-${runBehaviour}']`;
   //#endregion
 
   //#region constants
@@ -318,10 +319,8 @@ export class JSEditor {
     // Set runBehavior to On page load
     this.agHelper.GetNClick(this._runBehaviourSwitch(funName));
     this.agHelper.GetNClickByContains(
-      this._dropdownOption,
+      this._dropdownOption(runBehavior),
       runBehavior,
-      0,
-      true,
     );
     // Return to code tab
     this.toolbar.toggleSettings();

app/client/src/components/formControls/DropDownControl.tsx

@@ -520,7 +520,9 @@ function renderOptionWithIcon(option: SelectOptionProps) {
       <Flex flexDirection="column">
         <Flex>
           {option.icon && <Icon color={option.color} name={option.icon} />}
-          <OptionLabel>{option.label}</OptionLabel>
+          <OptionLabel data-testid={`t--label-${option.label}`}>
+            {option.label}
+          </OptionLabel>
         </Flex>
         <OptionSubText>{option.subText}</OptionSubText>
       </Flex>

app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx

@@ -99,7 +99,9 @@ const FunctionSettingRow = (props: FunctionSettingsRowProps) => {
             value={option.value}
           >
             <Flex flexDirection="column">
-              <OptionLabel>{option.label}</OptionLabel>
+              <OptionLabel data-testid={`t--label-${option.label}`}>
+                {option.label}
+              </OptionLabel>
               <OptionSubText>{option.subText}</OptionSubText>
             </Flex>
           </Option>