Skip to content

Commit b776f71

Browse files
authored
Merge pull request #433 from iceljc/main
refine time range picker styles and user store
2 parents cf113c8 + 725bf29 commit b776f71

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

src/lib/common/shared/TimeRangePicker.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
>
331331
<button
332332
type="button"
333-
class="form-control text-start d-flex align-items-center justify-content-between"
333+
class="form-control text-start d-flex align-items-center justify-content-between clickable"
334334
on:click={() => {
335335
showDatePicker = !showDatePicker;
336336
if (showDatePicker) {
@@ -344,9 +344,10 @@
344344
}
345345
}
346346
}}
347-
style="cursor: pointer;"
348347
>
349-
<span>{timeRangeDisplayText || 'Select time range'}</span>
348+
<span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
349+
{timeRangeDisplayText || 'Select time range'}
350+
</span>
350351
<i class="bx bx-chevron-down"></i>
351352
</button>
352353
{#if showDatePicker}

src/lib/helpers/http.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const retryQueue = {
1212
isRefreshingToken: false,
1313

1414
/** @type {number} */
15-
timeout: 20,
15+
timeout: 200,
1616

1717
/** @type {number} */
1818
maxRenewTokenCount: 30,

src/lib/helpers/store.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-nocheck
2-
import { writable } from 'svelte/store';
2+
import { writable, get } from 'svelte/store';
33
import { browser } from '$app/environment';
44

55
const userKey = "user";
@@ -42,17 +42,18 @@ export const userStore = writable({ id: "", full_name: "", expires: 0, token: nu
4242
*/
4343
export function getUserStore() {
4444
if (browser) {
45-
// Access localStorage only if in the browser context
45+
const storeValue = get(userStore);
46+
if (storeValue?.token) {
47+
return storeValue;
48+
}
49+
4650
let json = sessionStorage.getItem(userKey);
4751
if (json) {
4852
return JSON.parse(json);
49-
} else {
50-
return userStore;
5153
}
52-
} else {
53-
// Return a default value for SSR
54-
return userStore;
5554
}
55+
56+
return get(userStore);
5657
};
5758

5859

0 commit comments

Comments
 (0)