Skip to content

Commit 525afda

Browse files
vertigo17vertigo17
committed
Fixed active display on robot execution. fixed #2618 
1 parent 528ca55 commit 525afda

1 file changed

Lines changed: 57 additions & 56 deletions

File tree

‎source/src/main/webapp/include/transversal/TestCaseSimpleExecution.html‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Choose en
9898

9999
<template x-for="env in filteredEnvs()" :key="env.uiId">
100100
<button @click="toggleEnv(env)" class="w-full rounded-lg p-3 transition border text-left group"
101-
:class="isEnvSelected(env) ? 'bg-blue-50/80 dark:bg-blue-950 border-blue-400 shadow-sm' : 'hover:bg-slate-50 dark:hover:bg-slate-800 border-slate-200 dark:border-slate-700'">
101+
:class="isEnvSelected(env) ? 'bg-blue-50/80 dark:bg-blue-950 border-blue-400 shadow-sm' : 'hover:bg-slate-50 dark:hover:bg-slate-800 border-slate-200 dark:border-slate-700'">
102102

103103
<div class="flex items-center justify-between gap-3">
104104

@@ -122,14 +122,14 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Choose en
122122
<div class="flex gap-1.5 shrink-0">
123123

124124
<span class="px-2 py-0.5 text-[10px] font-semibold rounded
125-
bg-blue-100 text-blue-700
126-
dark:bg-blue-900 dark:text-blue-300"
125+
bg-blue-100 text-blue-700
126+
dark:bg-blue-900 dark:text-blue-300"
127127
x-text="env.country">
128128
</span>
129129

130130
<span class="px-2 py-0.5 text-[10px] font-semibold rounded
131-
bg-green-100 text-green-700
132-
dark:bg-green-900 dark:text-green-300"
131+
bg-green-100 text-green-700
132+
dark:bg-green-900 dark:text-green-300"
133133
x-text="env.environment">
134134
</span>
135135

@@ -163,9 +163,9 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Choose ro
163163

164164
<template x-for="robot in filteredRobots()" :key="robot.robot">
165165
<button
166-
@click="toggleRobot(robot.robot)"
167-
class="w-full flex items-center justify-between rounded-lg p-3 transition border"
168-
:class="selectedRobots.includes(robot.robot) ? 'bg-blue-50 dark:bg-blue-950 border-blue-400 dark:border-blue-600 shadow-sm' : 'hover:bg-slate-50 dark:hover:bg-slate-800 border-slate-200 dark:border-slate-700'">
166+
@click="toggleRobot(robot.robot)"
167+
class="w-full flex items-center justify-between rounded-lg p-3 transition border"
168+
:class="selectedRobots.includes(robot.robot) ? 'bg-blue-50 dark:bg-blue-950 border-blue-400 dark:border-blue-600 shadow-sm' : 'hover:bg-slate-50 dark:hover:bg-slate-800 border-slate-200 dark:border-slate-700'">
169169

170170
<!-- LEFT -->
171171
<div class="flex items-center gap-3">
@@ -191,9 +191,9 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Choose ro
191191

192192
<!-- STATUS -->
193193
<span
194-
class="px-2 py-0.5 rounded-full text-[10px] font-semibold"
195-
:class="robot.active ? 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300' : 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300'"
196-
x-text="robot.active ? 'ACTIVE' : 'INACTIVE'">
194+
class="px-2 py-0.5 rounded-full text-[10px] font-semibold"
195+
:class="robot.active ? 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300' : 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300'"
196+
x-text="robot.active ? 'ACTIVE' : 'INACTIVE'">
197197
</span>
198198

199199
<!-- EXECUTORS -->
@@ -218,7 +218,7 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Choose ro
218218
</div>
219219
<h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution settings</h4>
220220
<button @click="saveSettings()"
221-
class="ml-auto text-green-600 hover:text-green-500 cursor-pointer">
221+
class="ml-auto text-green-600 hover:text-green-500 cursor-pointer">
222222
<i data-lucide="save" class="w-4 h-4"></i>
223223
</button>
224224
</div>
@@ -239,12 +239,12 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
239239
class="flex-1 h-10 border rounded-md px-3 py-2 text-sm bg-white dark:bg-slate-800 border-slate-300 dark:border-slate-600 text-slate-900 dark:text-slate-300 hover:bg-slate-50 dark:hover:bg-slate-700 transition-all focus:outline-none focus:ring-1 focus:ring-blue-500"/>
240240

241241
<button
242-
x-show="lastDispatchedTag"
243-
x-transition.opacity.scale.duration.150ms
244-
@click="settings.tag = lastDispatchedTag"
245-
type="button"
246-
title="Set the last tag"
247-
class="h-8 w-8 flex items-center justify-center rounded-lg text-slate-400 hover:text-blue-600 hover:bg-slate-100 dark:hover:bg-slate-800 transition">
242+
x-show="lastDispatchedTag"
243+
x-transition.opacity.scale.duration.150ms
244+
@click="settings.tag = lastDispatchedTag"
245+
type="button"
246+
title="Set the last tag"
247+
class="h-8 w-8 flex items-center justify-center rounded-lg text-slate-400 hover:text-blue-600 hover:bg-slate-100 dark:hover:bg-slate-800 transition">
248248

249249
<i data-lucide="corner-up-left"
250250
class="w-4 h-4 text-blue-600 dark:text-blue-300"></i>
@@ -260,14 +260,14 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
260260
</div>
261261
<div class="flex-1 flex rounded-lg bg-slate-100 dark:bg-slate-800 p-1">
262262
<button @click="settings.verbose=0"
263-
:class="settings.verbose===0 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
264-
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Minimum">Minimum</button>
263+
:class="settings.verbose===0 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
264+
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="No Screenshot, Video, Page Source, Robot logs, Console logs">Minimum</button>
265265
<button @click="settings.verbose=1"
266-
:class="settings.verbose===1 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
267-
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Standard">Standard</button>
266+
:class="settings.verbose===1 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
267+
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Automatic Screenshot, Video, Page Source, Robot logs, Console logs">Standard</button>
268268
<button @click="settings.verbose=2"
269-
:class="settings.verbose===2 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
270-
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Maximum">Maximum</button>
269+
:class="settings.verbose===2 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
270+
class="flex-1 px-3 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Systematic Screenshot, Video, Page Source, Robot logs, Console logs">Maximum</button>
271271
</div>
272272
</div>
273273

@@ -291,8 +291,8 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
291291
<div class="flex rounded-lg bg-slate-100 dark:bg-slate-800 p-1">
292292
<template x-for="i in 4" :key="i">
293293
<button @click="settings.retries=i-1"
294-
:class="settings.retries===i-1 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
295-
class="w-10 h-9 text-sm font-medium rounded-md transition-all duration-200" :title="i-1">
294+
:class="settings.retries===i-1 ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
295+
class="w-10 h-9 text-sm font-medium rounded-md transition-all duration-200" :title="i-1">
296296
<span x-text="i-1"></span>
297297
</button>
298298
</template>
@@ -318,11 +318,11 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
318318
</div>
319319
<div class="flex bg-slate-100 dark:bg-slate-800 rounded-lg p-1">
320320
<button @click="settings.manual='Y'"
321-
:class="settings.manual=='Y' ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
322-
class="px-4 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Manual">Manual</button>
321+
:class="settings.manual=='Y' ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
322+
class="px-4 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Manual">Manual</button>
323323
<button @click="settings.manual='N'"
324-
:class="settings.manual=='N' ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
325-
class="px-4 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Auto">Auto</button>
324+
:class="settings.manual=='N' ? 'bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 shadow-sm' : 'text-slate-500 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'"
325+
class="px-4 py-2 text-sm font-medium rounded-md transition-all duration-200" title="Auto">Auto</button>
326326
</div>
327327
</div>
328328
</div>
@@ -338,12 +338,12 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
338338
<!-- FOOTER -->
339339
<div class="flex justify-end gap-2 px-6 py-3 shrink-0">
340340
<button @click="close()"
341-
class="px-4 py-2 rounded-md border border-slate-300 dark:border-slate-600 text-sm text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700 transition">
341+
class="px-4 py-2 rounded-md border border-slate-300 dark:border-slate-600 text-sm text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700 transition">
342342
Close
343343
</button>
344344

345345
<button @click="submit()"
346-
class="px-4 py-2 rounded-md bg-blue-600 text-white text-sm hover:bg-blue-700 transition flex items-center gap-1.5">
346+
class="px-4 py-2 rounded-md bg-blue-600 text-white text-sm hover:bg-blue-700 transition flex items-center gap-1.5">
347347
<i data-lucide="play" class="w-3.5 h-3.5"></i> Run
348348
</button>
349349
</div>
@@ -422,20 +422,21 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
422422

423423
saveSettings() {
424424
localStorage.setItem(
425-
'executionSettings',
426-
JSON.stringify(this.settings)
427-
);
425+
'executionSettings',
426+
JSON.stringify(this.settings)
427+
);
428428
notifyInModal(
429-
"success",
430-
"Settings successfully saved",
431-
"#modalNotify"
432-
);
429+
"success",
430+
"Settings successfully saved",
431+
"#modalNotify"
432+
);
433433
},
434434

435435
loadSettings() {
436436
try {
437437
const raw = localStorage.getItem('executionSettings');
438-
if (!raw) throw 'empty';
438+
if (!raw)
439+
throw 'empty';
439440

440441
const parsed = JSON.parse(raw);
441442

@@ -466,16 +467,16 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
466467
async loadEnvs() {
467468
try {
468469
const r = await fetch(
469-
'ReadCountryEnvironmentParameters?system=&application='+encodeURIComponent(this.application)
470-
);
470+
'ReadCountryEnvironmentParameters?system=&application=' + encodeURIComponent(this.application)
471+
);
471472

472473
const text = await r.text();
473474
const json = JSON.parse(text);
474475

475476
this.envs = (json.contentTable || []).map((e, index) => ({
476-
...e,
477-
uiId: e.country + '|' + e.environment + '|' + e.application + '|' + index
478-
}));
477+
...e,
478+
uiId: e.country + '|' + e.environment + '|' + e.application + '|' + index
479+
}));
479480

480481
// auto select if only one (legacy behaviour)
481482
if (this.envs.length === 1) {
@@ -514,7 +515,7 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
514515

515516
return {
516517
...r,
517-
active: r.isActive,
518+
active: r.active,
518519
activeExecutorsCount: activeExecutors.length
519520
};
520521
});
@@ -538,8 +539,8 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
538539

539540
return this.envs.filter(e =>
540541
(e.ip + e.country + e.environment)
541-
.toLowerCase()
542-
.includes(f)
542+
.toLowerCase()
543+
.includes(f)
543544
);
544545
},
545546

@@ -548,8 +549,8 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
548549

549550
return this.robots.filter(r =>
550551
(r.robot + r.platform + r.browser + r.version)
551-
.toLowerCase()
552-
.includes(f)
552+
.toLowerCase()
553+
.includes(f)
553554
);
554555
},
555556

@@ -582,8 +583,8 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
582583

583584
btn(active) {
584585
return active
585-
? 'crb_btn_selected'
586-
: 'crb_btn';
586+
? 'crb_btn_selected'
587+
: 'crb_btn';
587588
},
588589

589590
/* ---------------- SUBMIT ---------------- */
@@ -641,15 +642,15 @@ <h4 class="font-semibold text-base text-slate-900 dark:text-slate-100">Execution
641642

642643
if (data.messageType === 'OK' && data.nbExe === 1) {
643644
window.location.href =
644-
'TestCaseExecution.jsp?executionQueueId=' +
645-
data.queueList[0].queueId;
645+
'TestCaseExecution.jsp?executionQueueId=' +
646+
data.queueList[0].queueId;
646647
return;
647648
}
648649

649650
if (data.messageType === 'OK' && data.nbExe > 1) {
650651
window.location.href =
651-
'ReportingExecutionByTag.jsp?Tag=' +
652-
encodeURIComponent(data.tag);
652+
'ReportingExecutionByTag.jsp?Tag=' +
653+
encodeURIComponent(data.tag);
653654
return;
654655
}
655656

0 commit comments

Comments
 (0)