Skip to content

Commit 71972f8

Browse files
Rohini-MicrosoftRohini-Microsoft
committed
resolved conflict
2 parents 9c02ee3 + 76f1d99 commit 71972f8

File tree

6 files changed

+56
-35
lines changed

6 files changed

+56
-35
lines changed

‎src/frontend/wwwroot/app.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
(() => {
22
window.headers = GetAuthDetails();
3-
const apiEndpoint = sessionStorage.getItem('apiEndpoint') || BACKEND_API_URL;
3+
const apiEndpoint = getStoredData('apiEndpoint') || BACKEND_API_URL;
44
const goHomeButton = document.getElementById("goHomeButton");
55
const newTaskButton = document.getElementById("newTaskButton");
66
const closeModalButtons = document.querySelectorAll(".modal-close-button");
77
const myTasksMenu = document.getElementById("myTasksMenu");
88
const tasksStats = document.getElementById("tasksStats");
99

10-
//if (!sessionStorage.getItem('apiEndpoint')) sessionStorage.setItem('apiEndpoint', apiEndpoint);
10+
//if (!getStoredData('apiEndpoint'))setStoredData('apiEndpoint', apiEndpoint);
1111
// Force rewrite of apiEndpoint
12-
sessionStorage.setItem('apiEndpoint', apiEndpoint);
13-
sessionStorage.setItem('context', 'employee');
12+
setStoredData('apiEndpoint', apiEndpoint);
13+
setStoredData('context', 'employee');
1414
// Refresh rate is set
15-
if (!sessionStorage.getItem('apiRefreshRate')) sessionStorage.setItem('apiRefreshRate', 5000);
16-
if (!sessionStorage.getItem('actionStagesRun')) sessionStorage.setItem('actionStagesRun', []);
15+
if (!getStoredData('apiRefreshRate'))setStoredData('apiRefreshRate', 5000);
16+
if (!getStoredData('actionStagesRun'))setStoredData('actionStagesRun', []);
1717

1818
const getQueryParam = (param) => {
1919
const urlParams = new URLSearchParams(window.location.search);
@@ -30,7 +30,7 @@
3030
const viewIframe = document.getElementById('viewIframe');
3131
if (viewIframe) {
3232
const viewRoute = getQueryParam('v');
33-
const viewContext = sessionStorage.getItem('context');
33+
const viewContext = getStoredData('context');
3434
const noCache = '?nocache=' + new Date().getTime();
3535
switch (viewRoute) {
3636
case 'home':
@@ -112,7 +112,7 @@
112112
}
113113

114114
const fetchTasksIfNeeded = async () => {
115-
const taskStore = JSON.parse(sessionStorage.getItem('task'));
115+
const taskStore = JSON.parse(getStoredData('task'));
116116
window.headers
117117
.then(headers => {
118118
fetch(apiEndpoint + '/plans', {
@@ -164,7 +164,7 @@
164164
setQueryParam('v', 'task');
165165
switchView();
166166

167-
sessionStorage.setItem('task', JSON.stringify({
167+
setStoredData('task', JSON.stringify({
168168
id: sessionId,
169169
name: taskName
170170
}));
@@ -222,7 +222,7 @@
222222
if (!userInfo) {
223223
console.error("Authentication failed. Access to tasks is restricted.");
224224
} else {
225-
sessionStorage.setItem('userInfo', userInfo);
225+
setStoredData('userInfo', userInfo);
226226
await fetchTasksIfNeeded(); // Fetch tasks after initialization if needed
227227
}
228228
};

‎src/frontend/wwwroot/home/home.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ripple: false,
55
duration: 3000,
66
});
7-
const apiEndpoint = sessionStorage.getItem("apiEndpoint");
7+
const apiEndpoint = getStoredData("apiEndpoint");
88
const newTaskPrompt = document.getElementById("newTaskPrompt");
99
const startTaskButton = document.getElementById("startTaskButton");
1010
const startTaskButtonContainer = document.querySelector(".send-button");

‎src/frontend/wwwroot/libs/showdown.min.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/frontend/wwwroot/task/employee.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ <h1 id="taskName" class="title"></h1>
126126
></script>
127127
<script
128128
type="text/javascript"
129-
src="https://unpkg.com/showdown/dist/showdown.min.js"
129+
src="../libs/showdown.min.js"
130130
></script>
131131
<script src="../utils.js"></script>
132132
<script src="../app.js"></script>

‎src/frontend/wwwroot/task/task.js‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(() => {
22
const markdownConverter = new showdown.Converter();
3-
const apiEndpoint = sessionStorage.getItem("apiEndpoint");
4-
const taskStore = JSON.parse(sessionStorage.getItem("task"));
3+
const apiEndpoint = getStoredData("apiEndpoint");
4+
const taskStore = JSON.parse(getStoredData("task"));
55
const taskName = document.getElementById("taskName");
66
const taskStatusTag = document.getElementById("taskStatusTag");
77
const taskStagesMenu = document.getElementById("taskStagesMenu");
@@ -92,12 +92,12 @@
9292
agentIcon = "manager";
9393
break;
9494
case "HumanAgent":
95-
let userNumber = sessionStorage.getItem("userNumber");
95+
let userNumber = getStoredData("userNumber");
9696
if (userNumber == null) {
9797
// Generate a random number between 0 and 6
9898
userNumber = Math.floor(Math.random() * 6);
9999
// Create the icon name by concatenating 'user' with the random number
100-
sessionStorage.setItem("userNumber", userNumber);
100+
setStoredData("userNumber", userNumber);
101101
}
102102
let iconName = "user" + userNumber;
103103
agentIcon = iconName;
@@ -161,7 +161,7 @@
161161

162162
if (taskCancelButton) {
163163
taskCancelButton.addEventListener("click", (event) => {
164-
const apiTaskStore = JSON.parse(sessionStorage.getItem("apiTask"));
164+
const apiTaskStore = JSON.parse(getStoredData("apiTask"));
165165
handleDisableOfActions("completed")
166166

167167
// Explicitly disable chatbox and message button
@@ -232,7 +232,7 @@
232232
updateTaskProgress(data[0]);
233233
fetchTaskStages(data[0]);
234234

235-
sessionStorage.setItem("apiTask", JSON.stringify(data[0]));
235+
setStoredData("apiTask", JSON.stringify(data[0]));
236236
//const isHumanClarificationRequestNull = data?.[0]?.human_clarification_request === null
237237
const isHumanClarificationResponseNotNull = data?.[0]?.human_clarification_response !== null;
238238
const taskMessageTextareaElement =document.getElementById("taskMessageTextarea");
@@ -375,15 +375,15 @@
375375

376376
updateTaskDetailsAgents([...new Set(taskAgents)]);
377377

378-
sessionStorage.setItem("showApproveAll", false);
378+
setStoredData("showApproveAll", false);
379379

380380
// Feature approve all removed for this version
381381
// if (isHumanFeedbackPending()) {
382-
// sessionStorage.setItem('showApproveAll', false);
382+
// setStoredData('showApproveAll', false);
383383
// console.log('showApproveAll status', "showApproveAll is false");
384384

385385
// } else {
386-
// sessionStorage.setItem('showApproveAll', taskStageApprovalStatus === taskStageCount);
386+
// setStoredData('showApproveAll', taskStageApprovalStatus === taskStageCount);
387387
// console.log('showApproveAll status', taskStageApprovalStatus === taskStageCount);
388388

389389
// }
@@ -450,8 +450,8 @@
450450
// console.log(groupByStepId(data));
451451

452452
if (
453-
sessionStorage.getItem("context") &&
454-
sessionStorage.getItem("context") === "customer"
453+
getStoredData("context") &&
454+
getStoredData("context") === "customer"
455455
) {
456456
data = contextFilter(data);
457457
}
@@ -477,7 +477,7 @@
477477
messages.forEach((message) => {
478478
const messageItem = document.createElement("div");
479479
const showApproveAll =
480-
sessionStorage.getItem("showApproveAll") === "true" &&
480+
getStoredData("showApproveAll") === "true" &&
481481
data.length === messageCount;
482482

483483
let approveAllStagesButton = "";
@@ -491,8 +491,8 @@
491491
: "has-status-active";
492492

493493
if (
494-
sessionStorage.getItem("context") &&
495-
sessionStorage.getItem("context") !== "customer"
494+
getStoredData("context") &&
495+
getStoredData("context") !== "customer"
496496
) {
497497
if (showApproveAll) {
498498
console.log("Creating approveAllStagesButton");
@@ -550,8 +550,8 @@
550550
taskMessages.appendChild(messageItem);
551551

552552
if (
553-
sessionStorage.getItem("context") &&
554-
sessionStorage.getItem("context") !== "customer"
553+
getStoredData("context") &&
554+
getStoredData("context") !== "customer"
555555
) {
556556
if (showApproveAll) {
557557
document
@@ -576,20 +576,19 @@
576576
}
577577

578578
if (
579-
sessionStorage.getItem("context") &&
580-
sessionStorage.getItem("context") === "customer" &&
581-
!sessionStorage
582-
.getItem("actionStagesRun")
579+
getStoredData("context") &&
580+
getStoredData("context") === "customer" &&
581+
!getStoredData("actionStagesRun")
583582
.includes(task.session_id)
584583
) {
585584
actionStages(task, true);
586585

587586
let actionStagesRun = JSON.parse(
588-
sessionStorage.getItem("actionStagesRun") || "[]"
587+
getStoredData("actionStagesRun") || "[]"
589588
);
590589

591590
actionStagesRun.push(task.session_id);
592-
sessionStorage.setItem(
591+
setStoredData(
593592
"actionStagesRun",
594593
JSON.stringify(actionStagesRun)
595594
);
@@ -645,7 +644,7 @@
645644
};
646645

647646
const isHumanFeedbackPending = () => {
648-
const storedData = sessionStorage.getItem("apiTask");
647+
const storedData = getStoredData("apiTask");
649648
const planDetails = JSON.parse(storedData);
650649
return (
651650
planDetails.human_clarification_request !== null &&

‎src/frontend/wwwroot/utils.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,22 @@ window.GetAuthDetails = async () => {
6868
return headers;
6969
}
7070
};
71+
72+
window.getStoredData = (key)=> {
73+
let data = localStorage.getItem(key);
74+
75+
// If not found in localStorage, check sessionStorage
76+
if (!data) {
77+
data = sessionStorage.getItem(key);
78+
if (data) {
79+
// Move data from sessionStorage to localStorage
80+
setStoredData(key, data);
81+
sessionStorage.removeItem(key); // Optional cleanup
82+
}
83+
}
84+
return data;
85+
}
86+
87+
window.setStoredData = (key, value)=> {
88+
localStorage.setItem(key, value)
89+
}

0 commit comments

Comments
 (0)