Skip to content

Commit f29fadb

Browse files
cugarteblaircugarteblair
authored
Merge pull request #879 from SlideRuleEarth/carlos-dev4
Carlos dev4
2 parents eff4714 + 27e9178 commit f29fadb

File tree

10 files changed

+765
-205
lines changed

10 files changed

+765
-205
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ witch.zip
2828
**/e2e/*.map
2929

3030
# misc
31+
*.parquet
3132
**/npm-debug.log
3233
**/testem.log
3334
**/.env*

‎web-client/src/App.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,10 @@ async function handleGlobalLogin(): Promise<void> {
184184
185185
async function resetToPublicCluster() {
186186
legacyJwtStore.clearAllJwts()
187-
sysConfigStore.$reset()
187+
await sysConfigStore.resetToPublicCluster()
188188
loginUsername.value = ''
189189
loginPassword.value = ''
190190
authDialogStore.hide()
191-
// Fetch public cluster server version
192-
await sysConfigStore.fetchServerVersionInfo()
193-
await sysConfigStore.fetchCurrentNodes()
194191
toast.add({
195192
severity: 'info',
196193
summary: 'Reset Complete',

‎web-client/src/components/SrAppBar.vue‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,6 @@ function handleGitHubLogin() {
4949
githubAuthStore.initiateLogin()
5050
}
5151
52-
async function handleGitHubLogout() {
53-
githubAuthStore.logout()
54-
legacyJwtStore.clearAllJwts()
55-
sysConfigStore.$reset()
56-
sysConfigStore.domain = 'slideruleearth.io'
57-
sysConfigStore.cluster = 'sliderule'
58-
await sysConfigStore.fetchServerVersionInfo()
59-
await sysConfigStore.fetchCurrentNodes()
60-
toast.add({
61-
severity: 'info',
62-
summary: 'Logged Out',
63-
detail: 'You have been logged out successfully',
64-
life: srToastStore.getLife()
65-
})
66-
}
67-
6852
const displayTour = computed(() => {
6953
return route.name === 'home' || route.name === 'request'
7054
})
@@ -214,7 +198,7 @@ const userMenuItems = computed(() => {
214198
label: 'Log Out',
215199
icon: 'pi pi-sign-out',
216200
command: () => {
217-
void handleGitHubLogout()
201+
void handleLogout()
218202
}
219203
})
220204
@@ -436,13 +420,9 @@ const toggleOrgMenu = (event: Event) => {
436420
async function handleLogout() {
437421
// Log out from GitHub if authenticated
438422
githubAuthStore.logout()
439-
// Reset to public cluster
423+
// Clear legacy JWT and reset to public cluster
440424
legacyJwtStore.clearAllJwts()
441-
sysConfigStore.$reset()
442-
sysConfigStore.domain = 'slideruleearth.io'
443-
sysConfigStore.cluster = 'sliderule'
444-
await sysConfigStore.fetchServerVersionInfo()
445-
await sysConfigStore.fetchCurrentNodes()
425+
await sysConfigStore.resetToPublicCluster()
446426
toast.add({
447427
severity: 'info',
448428
summary: 'Logged Out',
@@ -452,10 +432,9 @@ async function handleLogout() {
452432
}
453433
454434
async function resetToPublicCluster() {
435+
// Reset to public cluster without logging out of GitHub
455436
legacyJwtStore.clearAllJwts()
456-
sysConfigStore.$reset()
457-
await sysConfigStore.fetchServerVersionInfo()
458-
await sysConfigStore.fetchCurrentNodes()
437+
await sysConfigStore.resetToPublicCluster()
459438
toast.add({
460439
severity: 'info',
461440
summary: 'Reset Complete',

‎web-client/src/components/SrGitHubOrgAuth.vue‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,8 @@ function handleLogin() {
6060
6161
async function handleLogout() {
6262
githubAuthStore.logout()
63-
// Reset to public cluster
6463
legacyJwtStore.clearAllJwts()
65-
sysConfigStore.$reset()
66-
sysConfigStore.domain = 'slideruleearth.io'
67-
sysConfigStore.cluster = 'sliderule'
68-
await sysConfigStore.fetchServerVersionInfo()
69-
await sysConfigStore.fetchCurrentNodes()
64+
await sysConfigStore.resetToPublicCluster()
7065
}
7166
</script>
7267

‎web-client/src/components/SrLegacyProvSys.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,7 @@ function updateDesiredNodes() {
223223
224224
async function resetToDefaults() {
225225
legacyJwtStore.clearAllJwts()
226-
sysConfigStore.$reset()
227-
// Fetch public cluster server version
228-
await sysConfigStore.fetchServerVersionInfo()
229-
await sysConfigStore.fetchCurrentNodes()
226+
await sysConfigStore.resetToPublicCluster()
230227
toast.add({
231228
severity: 'info',
232229
summary: 'Reset Complete',

‎web-client/src/components/SrRecIdReqDisplay.vue‎

Lines changed: 87 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,98 @@
11
<template>
2-
<div class="sr-rec-req-display-panel">
3-
<Button
4-
icon="pi pi-eye"
5-
:label="props.label"
6-
class="sr-glow-button"
7-
@click="openParmsDialog(reqParms)"
8-
@mouseover="tooltipRef?.showTooltip($event, props.tooltipText)"
9-
@mouseleave="tooltipRef?.hideTooltip"
10-
variant="text"
11-
rounded
12-
:disabled="props.insensitive"
13-
></Button>
14-
<SrCustomTooltip ref="tooltipRef" id="recIdDisplayTooltip"/>
15-
<SrJsonDisplayDialog
16-
v-model:visible="showParmsDialog"
17-
:json-data="reqParms"
18-
:title="`endpoint = ${curAPI}`"
19-
width="50vw"
20-
/>
21-
</div>
22-
</template>
23-
24-
<script setup lang="ts">
25-
import { ref,onMounted } from "vue";
26-
import Button from "primevue/button";
27-
import { db } from "@/db/SlideRuleDb";
28-
import SrJsonDisplayDialog from "./SrJsonDisplayDialog.vue";
29-
import SrCustomTooltip from "./SrCustomTooltip.vue";
30-
import { createLogger } from '@/utils/logger';
2+
<div class="sr-rec-req-display-panel">
3+
<Button
4+
icon="pi pi-eye"
5+
:label="props.label"
6+
class="sr-glow-button"
7+
@click="openParmsDialog(reqParms)"
8+
@mouseover="tooltipRef?.showTooltip($event, props.tooltipText)"
9+
@mouseleave="tooltipRef?.hideTooltip"
10+
variant="text"
11+
rounded
12+
:disabled="props.insensitive"
13+
></Button>
14+
<SrCustomTooltip ref="tooltipRef" id="recIdDisplayTooltip" />
15+
<SrReqParmsDisplayDlg
16+
v-model:visible="showParmsDialog"
17+
:json-data="reqParms"
18+
:title="`endpoint = ${curAPI}`"
19+
:endpoint="curAPI"
20+
width="80vw"
21+
/>
22+
</div>
23+
</template>
3124

32-
const logger = createLogger('SrRecIdReqDisplay');
25+
<script setup lang="ts">
26+
import { ref, onMounted } from 'vue'
27+
import Button from 'primevue/button'
28+
import { db } from '@/db/SlideRuleDb'
29+
import SrReqParmsDisplayDlg from './SrReqParmsDisplayDlg.vue'
30+
import SrCustomTooltip from './SrCustomTooltip.vue'
31+
import { createLogger } from '@/utils/logger'
3332
34-
const props = withDefaults(
35-
defineProps<{
36-
reqId: number;
37-
label: string;
38-
insensitive?: boolean;
39-
tooltipText?: string;
40-
}>(),
41-
{
42-
reqId: 0,
43-
label: 'Show Req Parameters',
44-
insensitive: false,
45-
tooltipText: 'click to show request parameters for current record',
46-
tooltipUrl: '',
47-
labelFontSize: 'small',
48-
labelOnRight: false
49-
}
50-
);
33+
const logger = createLogger('SrRecIdReqDisplay')
5134
52-
const showParmsDialog = ref(false);
53-
const reqParms = ref<string>('');
54-
const curAPI = ref<string>('');
55-
const tooltipRef = ref();
35+
const props = withDefaults(
36+
defineProps<{
37+
reqId: number
38+
label: string
39+
insensitive?: boolean
40+
tooltipText?: string
41+
}>(),
42+
{
43+
reqId: 0,
44+
label: 'Show Req Parameters',
45+
insensitive: false,
46+
tooltipText: 'click to show request parameters for current record',
47+
tooltipUrl: '',
48+
labelFontSize: 'small',
49+
labelOnRight: false
50+
}
51+
)
5652
57-
onMounted(async () => {
58-
if(props.reqId) {
59-
curAPI.value = await db.getFunc(props.reqId);
60-
const p = await db.getReqParams(props.reqId);
61-
reqParms.value = JSON.stringify(p, null, 2);
62-
} else {
63-
logger.debug('onMounted: no reqId');
64-
}
65-
});
66-
// Open the Parms dialog
67-
function openParmsDialog(params: string | object) {
68-
if (typeof params === 'object') {
69-
reqParms.value = JSON.stringify(params, null, 2);
70-
} else {
71-
reqParms.value = params;
72-
}
73-
showParmsDialog.value = true;
74-
}
53+
const showParmsDialog = ref(false)
54+
const reqParms = ref<string>('')
55+
const curAPI = ref<string>('')
56+
const tooltipRef = ref()
7557
76-
</script>
77-
78-
<style scoped>
79-
/* Style your button and component here */
80-
.sr-rec-req-display-panel {
58+
onMounted(async () => {
59+
if (props.reqId) {
60+
curAPI.value = await db.getFunc(props.reqId)
61+
const p = await db.getReqParams(props.reqId)
62+
reqParms.value = JSON.stringify(p, null, 2)
63+
} else {
64+
logger.debug('onMounted: no reqId')
8165
}
82-
83-
.sr-rec-req-display-parms {
84-
position: relative;
85-
margin-top: 0rem;
86-
display: flex;
87-
justify-content: column;
88-
max-height: 15rem;
89-
max-width: 15rem;
90-
min-height: 10rem;
91-
overflow-y: auto;
92-
overflow-x: auto;
93-
width: 100%;
94-
text-overflow: clip;
95-
scrollbar-width: none; /* Firefox */
96-
-ms-overflow-style: none; /* Internet Explorer 10+ */
66+
})
67+
// Open the Parms dialog
68+
function openParmsDialog(params: string | object) {
69+
if (typeof params === 'object') {
70+
reqParms.value = JSON.stringify(params, null, 2)
71+
} else {
72+
reqParms.value = params
73+
}
74+
showParmsDialog.value = true
9775
}
76+
</script>
9877

78+
<style scoped>
79+
/* Style your button and component here */
80+
.sr-rec-req-display-panel {
81+
}
9982
100-
83+
.sr-rec-req-display-parms {
84+
position: relative;
85+
margin-top: 0rem;
86+
display: flex;
87+
justify-content: column;
88+
max-height: 15rem;
89+
max-width: 15rem;
90+
min-height: 10rem;
91+
overflow-y: auto;
92+
overflow-x: auto;
93+
width: 100%;
94+
text-overflow: clip;
95+
scrollbar-width: none; /* Firefox */
96+
-ms-overflow-style: none; /* Internet Explorer 10+ */
97+
}
10198
</style>
102-

0 commit comments

Comments
 (0)