Skip to content

Commit b75e198

Browse files
committed
fix selected tab on testcasescript page
1 parent f162e32 commit b75e198

File tree

2 files changed

+35
-22
lines changed

2 files changed

+35
-22
lines changed

source/src/main/webapp/TestCaseScript.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,23 @@
119119
<div class="clearfix"></div>
120120
</div>
121121
</div>
122-
<div x-data="{ tab: 'steps' }" class="w-full">
122+
<div x-data="testCaseScript()" x-init="init()" x-ref="tabsScriptEdit" class="w-full">
123123
<!-- Tabs -->
124124
<div class="w-full flex bg-slate-200 dark:bg-slate-700 p-1 rounded-lg shadow-sm mb-8 h-10">
125125
<!-- Steps -->
126-
<button @click="tab = 'steps'" id="editTabSteps"
126+
<button @click="setTab('steps')" id="editTabSteps"
127127
:class="tab === 'steps' ? 'bg-slate-50 font-semibold dark:bg-slate-900' : 'bg-slate-200 dark:bg-slate-700 text-slate-700 hover:text-slate-900 dark:text-slate-300 dark:hover:text-white'"
128128
class="flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-md transition-colors duration-200">
129129
<i data-lucide="users" class="w-4 h-4"></i>Steps
130130
</button>
131131
<!-- Properties -->
132-
<button @click="tab = 'properties'" id="editTabProperties"
132+
<button @click="setTab('properties')" id="editTabProperties"
133133
:class="tab === 'properties' ? 'bg-slate-50 font-semibold dark:bg-slate-900' : 'bg-slate-200 dark:bg-slate-700 text-slate-700 hover:text-slate-900 dark:text-slate-300 dark:hover:text-white'"
134134
class="flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-md transition-colors duration-200">
135135
<i data-lucide="lock" class="w-4 h-4"></i>Properties
136136
</button>
137137
<!-- Inherited Properties -->
138-
<button @click="tab = 'inhetitedproperties'" id="editTabInheritedProperties"
138+
<button @click="setTab('inheritedproperties')" id="editTabInheritedProperties"
139139
:class="tab === 'inhetitedproperties' ? 'bg-slate-50 font-semibold dark:bg-slate-900' : 'bg-slate-200 dark:bg-slate-700 text-slate-700 hover:text-slate-900 dark:text-slate-300 dark:hover:text-white'"
140140
class="flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-md transition-colors duration-200">
141141
<i data-lucide="lock" class="w-4 h-4"></i>Inherited Properties

source/src/main/webapp/js/pages/TestCaseScript.js

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -391,23 +391,6 @@ $.when($.getScript("js/global/global.js")
391391
$("a[name='" + tabactive + "']").click();
392392
}
393393

394-
$("a[name='tabProperties']").on("shown.bs.tab", function (e) {
395-
e.target; // newly activated tab
396-
e.relatedTarget; // previous active tab
397-
InsertURLInHistory("./TestCaseScript.jsp?" + ReplaceURLParameters("tabactive", "tabProperties"));
398-
399-
})
400-
$("a[name='tabSteps']").on("shown.bs.tab", function (e) {
401-
e.target; // newly activated tab
402-
e.relatedTarget; // previous active tab
403-
InsertURLInHistory("./TestCaseScript.jsp?" + ReplaceURLParameters("tabactive", "tabSteps"));
404-
})
405-
$("a[name='tabInheritedProperties']").on("shown.bs.tab", function (e) {
406-
e.target; // newly activated tab
407-
e.relatedTarget; // previous active tab
408-
InsertURLInHistory("./TestCaseScript.jsp?" + ReplaceURLParameters("tabactive", "tabInheritedProperties"));
409-
})
410-
411394
}
412395
// close all Navbar menu
413396
//closeEveryNavbarMenu();
@@ -671,7 +654,7 @@ function saveScript(queueid = 0, tag = "") {
671654
var stepHtml = $("#steps li.active");
672655
var stepData = stepHtml.data("item");
673656

674-
var tabActive = $("#tabsScriptEdit li.active a").attr("name");
657+
const tabActive = GetURLParameter('tabactive') || 'steps';
675658

676659
var parser = document.createElement('a');
677660
parser.href = window.location.href;
@@ -1959,4 +1942,34 @@ function tec_keyispressed(e) {
19591942
return false;
19601943
}
19611944
return true;
1945+
}
1946+
1947+
function testCaseScript() {
1948+
return {
1949+
tab: 'steps',
1950+
1951+
init() {
1952+
const fromURL = GetURLParameter("tabactive");
1953+
1954+
if (fromURL) {
1955+
this.setTab(fromURL);
1956+
}
1957+
1958+
this.updateHistory(this.tab);
1959+
},
1960+
1961+
setTab(name) {
1962+
this.tab = name;
1963+
this.updateHistory(name);
1964+
},
1965+
1966+
getActiveTab() {
1967+
return this.tab;
1968+
},
1969+
1970+
updateHistory(tabName) {
1971+
const url = "./TestCaseScript.jsp?" + ReplaceURLParameters("tabactive", tabName);
1972+
InsertURLInHistory(url);
1973+
}
1974+
}
19621975
}

0 commit comments

Comments
 (0)