[TOS-136],[TOS-121],[TOS-130] and code cleanUp

Author: shanmukha2000

server/src/main/java/com/testsigma/repository/ElementRepository.java

@@ -20,6 +20,5 @@ public interface ElementRepository extends BaseRepository<Element, Long> {
 
   List<Element> findByNameInAndWorkspaceVersionId(List<String> names, Long workspaceVersionId);
 
-  List<Element> findAllByWorkspaceVersionId(Long workspaceVersionId);
 }
 

server/src/main/java/com/testsigma/service/ElementService.java

@@ -72,9 +72,6 @@ public Page<Element> findAll(Specification<Element> specification, Pageable page
     return elementRepository.findAll(specification, pageable);
   }
 
-  public List<Element> findAllByWorkspaceVersionId(Long workspaceVersionId) {
-    return this.elementRepository.findAllByWorkspaceVersionId(workspaceVersionId);
-  }
 
   public Element create(Element element) {
     element = elementRepository.save(element);

server/src/main/java/com/testsigma/specification/AgentSpecification.java

@@ -6,7 +6,6 @@
 import java.sql.Timestamp;
 
 public class AgentSpecification extends BaseSpecification<Agent> {
-  private static final long dayInMillis = 86400000L;
   private static final long TEN_MIN_IN_MILLISECONDS = 600000L;
 
   public AgentSpecification(final SearchCriteria criteria) {

ui/src/app/agents/components/webcomponents/agents-auto-complete.component.ts

@@ -149,7 +149,7 @@ export class AgentsAutoCompleteComponent implements OnInit {
     if (term) {
       searchName = ",title:*" + term + "*";
     }
-    this.agentService.findAll(searchName).subscribe(res => {
+    this.agentService.findAll(searchName,"updatedDate,desc").subscribe(res => {
       if(searchName?.length == 0)
         this.agentsEmpty = res.empty;
       this.agents = res;

ui/src/app/components/webcomponents/dry-run-form.component.html

@@ -83,6 +83,13 @@
         <span class="p-10 text-left" [innerHTML]="'ad_hoc.invalid_url'| translate:{ fieldNames:invalidUrls.join(', ') }"></span>
       </div>
     </div>
+    <div class="theme-warning text-danger border-rds-4 px-10 py-5 fz-12 mt-2 mb-40 text-center"
+         *ngIf="isHybrid && zeroActiveAgents">
+      <div class="mx-auto w-fit-content d-flex align-items-center">
+        <i class="fa-warning fz-20 pl-15 pr-8"></i>
+        <span class="p-10 text-left" [innerHTML]="'ad_hoc.inactive_agents' | translate"></span>
+      </div>
+    </div>
     <app-dry-run-rest-form
       (closeDialog)="closeDialogTab()"
       *ngIf="dryExecutionForm && isRest && version"

ui/src/app/components/webcomponents/dry-run-form.component.ts

@@ -54,7 +54,7 @@ export class DryRunFormComponent extends BaseComponent implements OnInit {
   public searchAutoComplete = new FormControl();
   public filteredDryRunConfigs: AdhocRunConfiguration[] =[];
   public refresh: boolean=true;
-  public agentEmpty:boolean;
+  public zeroActiveAgents:boolean = false;
 
   constructor(
     public authGuard: AuthenticationGuard,
@@ -113,8 +113,15 @@ export class DryRunFormComponent extends BaseComponent implements OnInit {
       this.fetchVersion();
     });
     this.agentService.findAll().subscribe(res => {
-      this.agentEmpty = res.empty;
+      res.content.forEach(agent => {
+        if (!agent.isOnline()) {
+          this.zeroActiveAgents = true;
+        }else{
+          this.zeroActiveAgents = false;
+        }
+      })
     });
+
     this.searchAutoComplete.valueChanges.subscribe((term) => {
       this.searchDryRunConfigs(term);
     })
@@ -387,7 +394,7 @@ export class DryRunFormComponent extends BaseComponent implements OnInit {
 
   disableRunButton() {
     return this.saving || this.savingConfig || this.dryExecutionForm?.invalid || this.emptyElements.length>0
-      || (!this.isHybrid &&  this.invalidUrls.length>0) || (this.isHybrid && this.agentEmpty) ;
+      || (!this.isHybrid &&  this.invalidUrls.length>0) || (this.isHybrid && this.zeroActiveAgents) ;
   }
 
   private searchDryRunConfigs(term: any) {

ui/src/app/components/webcomponents/element-form.component.ts

@@ -385,12 +385,21 @@ export class ElementFormComponent extends BaseComponent implements OnInit {
   }
 
   saveOrUpdate() {
+    let screenName : ElementScreenName;
     if (!this.isInProgress) {
       this.formSubmitted = true;
       if (this.elementForm.invalid)
         return;
       if (this.element.screenNameId) {
-        (this.elementId) ? this.updateElement() : this.saveElement()
+        let updatedScreenName =this.elementForm.get("screen_name").value;
+        this.element.screenNameObj.name =  updatedScreenName;
+        screenName = new ElementScreenName();
+        screenName.name = updatedScreenName;
+        screenName.workspaceVersionId =this.element.workspaceVersionId;
+        this.elementScreenNameService.create(screenName).subscribe(screeNameObj => {
+          this.element.screenNameId = screeNameObj.id;
+          (this.elementId) ? this.updateElement() : this.saveElement()
+        });
       } else {
         let screenNameBean: ElementScreenName = new ElementScreenName();
         screenNameBean.name = this.elementForm.get('screen_name').value;

ui/src/app/components/webcomponents/jira-issue-details.component.html

@@ -112,7 +112,7 @@
       *ngFor="let formField of formFields"
       class="form-row" [ngSwitch]="true">
       <div class="pb-20"
-           *ngSwitchCase="formField.type != 'textarea'">
+           *ngSwitchCase="formField?.type != 'textarea'">
         <div
           class="rb-medium pb-4 pl-7"
           [textContent]="formField.name"></div>

ui/src/app/components/webcomponents/schedule-plan-form.component.ts

@@ -197,8 +197,8 @@ export class SchedulePlanFormComponent extends BaseComponent implements OnInit {
 
   setScheduleEntityValues() {
     this.scheduledPlan.scheduleTime = this.toUTCTime(this.getTimeDate());
-    this.scheduledPlan.testPlanId = this.testPlan.id;
-    this.scheduledPlan.scheduleType = this.scheduleForm.get('scheduleType').value;
+    this.scheduledPlan.testPlanId = this.testPlan?.id;
+    this.scheduledPlan.scheduleType = this.scheduleForm?.get('scheduleType')?.value;
     this.scheduledPlan.status = ScheduleStatus.ACTIVE;
   }
 

ui/src/assets/i18n/en.json

@@ -966,6 +966,7 @@
   "ad_hoc.saved_config.save_as": "Save As Favorite",
   "ad_hoc.empty_elements": "Unable to run the test. The test case contains steps with empty Elements - <span class='rb-semi-bold'>{{fieldNames}}</span>. Please update those and try running again.",
   "ad_hoc.invalid_url": "Unable to run the Test. The Test Case contains Navigate Step with Local URLs - <span class='f-semi-bold text-break'>{{fieldNames}}</span> which cannot be accessed using Test Lab Type 'Testsigma Lab'. Please select the 'Hybrid' option in Test Lab Type to run the tests locally. Learn more - <a href=\"https://testsigma.com/docs/faqs/web-apps/why-cloud-devices-cannot-access-local-apps/\" target=\"_blank\" class='text-link'>Why Cloud Test Environments can't access Locally hosted Applications?</a>",
+  "ad_hoc.inactive_agents": "Provided agent is Not Active Please choose another Test Machine to run the Test Case or Restart your agent.",
   "hint.message.ad_hoc.saved_config.list": "Manage Favorite Ad-hoc Run Configs",
   "ad_hoc.btn.create_run": "Run Now",
   "test_plan.enable_visual_testing": "Enable Visual Testing",