Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix for event_id being added as a URL param. Other fixes.

Browse Source
This commit is contained in:
Scott Idem
2025-07-09 14:05:51 -04:00
parent d97e6e74aa
commit 8bd42d1896
5 changed files with 60 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/routes/idaa/(idaa)/recovery_meetings/+layout.svelte
View File

@@ -1,9 +1,13 @@
<script lang="ts">
let log_lvl: number = 0;
// *** Import Svelte specific
import { page } from '$app/state';
// *** Import Aether specific variables and functions
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
import { idaa_loc, idaa_sess, idaa_slct, idaa_trig, idaa_prom } from '$lib/ae_idaa_stores';
import { events_func } from '$lib/ae_events_functions';
interface Props {
/** @type {import('./$types').LayoutData} */
@@ -29,6 +33,56 @@ $idaa_slct.event_obj_li = ae_acct.slct.event_obj_li;
// $idaa_slct.event_id = ae_acct.slct.event_id; // Not set here yet.
// *** Set initial variables
$effect(() => {
if ($idaa_trig.event_id && $idaa_slct.event_id) {
log_lvl = 1;
$idaa_trig.event_id = false;
if (log_lvl) {
console.log(`Triggered: $idaa_slct.event_id = ${$idaa_slct.event_id}`);
}
$idaa_prom.load__event_obj = events_func.load_ae_obj_id__event({
api_cfg: $ae_api,
event_id: $idaa_slct.event_id,
// enabled: $idaa_loc.recovery_meetings.qry__enabled,
// hidden: $idaa_loc.recovery_meetings.qry__hidden,
// limit: $idaa_loc.recovery_meetings.qry__limit,
try_cache: true,
log_lvl: log_lvl,
})
.then((event_obj) => {
if (log_lvl) {
console.log(`Event object loaded: `, event_obj);
}
$idaa_slct.event_obj = event_obj;
// $idaa_sess.recovery_meetings.show__modal_view = $idaa_slct.event_id;
// $idaa_sess.recovery_meetings.show__modal_edit = false;
});
// $idaa_slct.event_obj = $idaa_prom.load__event_obj;
if (!page.url.searchParams.get('event_id')) {
const url = new URL(location);
// url.searchParams.set('event_id', $idaa_slct.event_id);
url.searchParams.delete('event_id');
history.pushState({}, '', url);
let message = {'event_id': $idaa_slct.event_id};
window.parent.postMessage(message, "*");
}
$idaa_sess.recovery_meetings.show__modal_view = $idaa_slct.event_id;
$idaa_sess.recovery_meetings.show__modal_view__event_id = $idaa_slct.event_id;
$idaa_sess.recovery_meetings.show__modal_edit = false;
$idaa_sess.recovery_meetings.show__modal_edit__event_id = false;
}
});
</script>

54
src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
View File

@@ -30,8 +30,8 @@ import Element_data_store from '$lib/element_data_store_v2.svelte';
import Comp__event_obj_qry from './ae_idaa_comp__event_obj_qry.svelte';
import Comp__event_obj_li from './ae_idaa_comp__event_obj_li.svelte';
import Comp__event_obj_id_edit from './ae_idaa_comp__event_obj_id_edit.svelte';
import Comp__event_obj_id_view from './ae_idaa_comp__event_obj_id_view.svelte';
// import Comp__event_obj_id_edit from './ae_idaa_comp__event_obj_id_edit.svelte';
// import Comp__event_obj_id_view from './ae_idaa_comp__event_obj_id_view.svelte';
// let event_id = page.url.searchParams.get('event_id') ?? null;
@@ -280,61 +280,11 @@ $effect(() => {
});
$effect(() => {
if ($idaa_trig.event_id && $idaa_slct.event_id) {
log_lvl = 1;
$idaa_trig.event_id = false;
if (log_lvl) {
console.log(`Triggered: $idaa_slct.event_id = ${$idaa_slct.event_id}`);
}
$idaa_prom.load__event_obj = events_func.load_ae_obj_id__event({
api_cfg: $ae_api,
event_id: $idaa_slct.event_id,
// enabled: $idaa_loc.recovery_meetings.qry__enabled,
// hidden: $idaa_loc.recovery_meetings.qry__hidden,
// limit: $idaa_loc.recovery_meetings.qry__limit,
try_cache: true,
log_lvl: log_lvl,
})
.then((event_obj) => {
if (log_lvl) {
console.log(`Event object loaded: `, event_obj);
}
$idaa_slct.event_obj = event_obj;
// $idaa_sess.recovery_meetings.show__modal_view = $idaa_slct.event_id;
// $idaa_sess.recovery_meetings.show__modal_edit = false;
});
// $idaa_slct.event_obj = $idaa_prom.load__event_obj;
if (!page.url.searchParams.get('event_id')) {
const url = new URL(location);
url.searchParams.set('event_id', $idaa_slct.event_id);
history.pushState({}, '', url);
let message = {'event_id': $idaa_slct.event_id};
window.parent.postMessage(message, "*");
}
$idaa_sess.recovery_meetings.show__modal_view = $idaa_slct.event_id;
$idaa_sess.recovery_meetings.show__modal_view__event_id = $idaa_slct.event_id;
$idaa_sess.recovery_meetings.show__modal_edit = false;
$idaa_sess.recovery_meetings.show__modal_edit__event_id = false;
}
});
if (browser) {
console.log('Browser environment detected.');
// if (!$idaa_sess.recovery_meetings.show__modal_edit && !$idaa_sess.recovery_meetings.show__modal_view__event_id) {
// $idaa_slct.event_id = null;
// }
let message = {'event_id': $idaa_slct?.event_id ?? null};
window.parent.postMessage(message, "*");

3
src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte
View File

@@ -5,7 +5,7 @@ import { browser } from '$app/environment';
import { ae_util } from '$lib/ae_utils/ae_utils';
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
import { idaa_loc, idaa_sess, idaa_slct, idaa_trig } from '$lib/ae_idaa_stores';
export let lq__event_obj: any;
@@ -15,6 +15,7 @@ if ($idaa_slct.event_id) {
console.log(`Event Object name: ${$lq__event_obj?.name}`);
$slct_trigger = 'load__event_obj';
$idaa_trig.event_id = $idaa_slct.event_id;
}
// $: if (browser && $lq__event_obj?.event_id) {

79
src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
View File

@@ -182,85 +182,6 @@ function add_activity_log(
<!-- <span class="fas fa-info-circle"></span> -->
Meeting Details
</a>
<button
type="button"
disabled={true}
on:click={() => {
$idaa_slct.event_id = idaa_event_obj?.event_id;
$idaa_slct.event_obj = idaa_event_obj;
// $slct_trigger = 'load__event_obj';
// // handle_load_event_id_obj({event_id: $idaa_slct.event_id, try_cache: false});
const url = new URL(location);
url.searchParams.set('event_id', idaa_event_obj?.event_id);
history.pushState({}, '', url);
let message = {'event_id': idaa_event_obj?.event_id};
window.parent.postMessage(message, "*");
if ($ae_loc?.iframe && $ae_loc.browser_type == 'safari') {
console.log('In Safari iframe, sending message to parent window to scroll to top as well');
window.parent.postMessage({'scroll_to': 0}, "*"); // This should be in pixels
}
// $idaa_sess.recovery_meetings.show_main__options = true;
// $idaa_sess.recovery_meetings.show_list__event_obj_li = true;
$idaa_trig.event_id = true;
$idaa_sess.recovery_meetings.show__modal_view = true;
$idaa_sess.recovery_meetings.show__modal_view__event_id = idaa_event_obj?.event_id;
$idaa_sess.recovery_meetings.show__modal_edit = false;
$idaa_sess.recovery_meetings.show__modal_edit__event_id;
var is_safari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
if (is_safari) {
console.log('Safari detected, using forced scroll to top...');
// Safari does not support smooth scroll, so we use a regular scroll
document.getElementById('ae_idaa')?.scrollTo(0, 0);
// document.getElementById('ae_idaa')?.scrollTo({
// top: 0,
// behavior: 'smooth'
// });
}
}}
class="novi_btn btn btn-secondary btn-md preset-tonal-primary border border-primary-500 hover:preset-filled-primary-500 transition hidden"
title={`Open to see details: ${idaa_event_obj?.name}`}
>
<span class="fas fa-envelope-open m-1"></span>
<!-- <span class="fas fa-info-circle"></span> -->
Info
</button>
<!-- This checks if the currently logged in Novi user has a matching UUID or email address. -->
{#if ($ae_loc.trusted_access && $ae_loc.edit_mode) || idaa_event_obj?.external_person_id === $idaa_loc.novi_uuid || idaa_event_obj?.contact_li_json[0].email === $idaa_loc.novi_email}
<button
type="button"
disabled={true}
on:click={() => {
$idaa_slct.event_id = idaa_event_obj?.event_id;
$idaa_slct.event_obj = idaa_event_obj;
// $slct_trigger = 'load__event_obj';
// const url = new URL(location);
// url.searchParams.set('event_id', idaa_event_obj?.event_id);
// history.pushState({}, '', url);
// $idaa_sess.recovery_meetings.show_main__options = true;
// $idaa_sess.recovery_meetings.show_list__event_obj_li = true;
$idaa_sess.recovery_meetings.show__modal_view = false;
$idaa_sess.recovery_meetings.show__modal_view__event_id = false;
$idaa_sess.recovery_meetings.show__modal_edit = true;
$idaa_sess.recovery_meetings.show__modal_edit__event_id = idaa_event_obj?.event_id;
}}
class="novi_btn btn btn-tertiary btn-sm preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 transition hidden"
title={`Edit meeting: ${idaa_event_obj?.name}`}
>
<span class="fas fa-edit m-1"></span>
Edit Meeting
</button>
{/if}
</div>