{
- {#if $idaa_slct.post_obj.linked_li_json && $idaa_slct.post_obj.linked_li_json.length}
+ {#if $idaa_slct.post_obj?.linked_li_json && $idaa_slct.post_obj.linked_li_json.length}
Linked files:
@@ -718,7 +721,8 @@ $effect(() => {
type="text"
id="external_person_id"
name="external_person_id"
- value={($idaa_slct.post_obj.external_person_id ? $idaa_slct.post_obj.external_person_id : '')}
+ value={($idaa_slct.post_obj?.external_person_id ? $idaa_slct.post_obj
+ ?.external_person_id : '')}
readonly={!$ae_loc.administrator_access}
class="input w-96"
>
@@ -738,7 +742,7 @@ $effect(() => {
type="text"
id="full_name"
name="full_name"
- value={($idaa_slct.post_obj.full_name ? $idaa_slct.post_obj.full_name : $idaa_loc.novi_full_name)}
+ value={($idaa_slct.post_obj?.full_name ? $idaa_slct?.post_obj.full_name : $idaa_loc.novi_full_name)}
readonly={!$ae_loc.trusted_access}
class="input w-96"
>
@@ -757,7 +761,7 @@ $effect(() => {
@@ -766,7 +770,7 @@ $effect(() => {
{:else}
-
+
{/if}
diff --git a/src/routes/journals/[journal_id]/+layout.ts b/src/routes/journals/[journal_id]/+layout.ts
index 812297a1..89de1fa2 100644
--- a/src/routes/journals/[journal_id]/+layout.ts
+++ b/src/routes/journals/[journal_id]/+layout.ts
@@ -1,6 +1,7 @@
/** @type {import('./$types').LayoutLoad} */
console.log(`ae_l_journals [journal_id] +layout.ts start`);
+import { error } from '@sveltejs/kit';
import { browser } from '$app/environment';
import { journals_func } from '$lib/ae_journals/ae_journals_functions';
@@ -30,7 +31,7 @@ export async function load({ params, parent }) {
console.log(`ae_journals journals [journal_id] +page.ts: journal_id = `, journal_id);
}
// Load event journal object
- let load_journal_obj = journals_func.load_ae_obj_id__journal({
+ let load_journal_obj = await journals_func.load_ae_obj_id__journal({
api_cfg: ae_acct.api,
journal_id: journal_id,
inc_entry_li: true,
@@ -39,6 +40,21 @@ export async function load({ params, parent }) {
limit: 99,
try_cache: true,
log_lvl: log_lvl
+ })
+ .then((results) => {
+ if (!results) {
+ error(404, {
+ message: 'Journals - Journal not found'
+ });
+ } else {
+ // ae_acct.slct.journal_obj = results;
+ }
+ // })
+ // .catch((err) => {
+ // console.error(`Error loading journal object:`, err);
+ // error(500, {
+ // message: 'Journals - Error loading journal object'
+ // });
});
ae_acct.slct.journal_obj = load_journal_obj;
diff --git a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.ts b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.ts
index 832bde94..8f73858b 100644
--- a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.ts
+++ b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.ts
@@ -34,14 +34,20 @@ export async function load({ params, parent }) { // route
console.log(`ae_journals journals [journal_entry_id] +page.ts: journal_entry_id = `, journal_entry_id);
}
// Load event journal entry object
- let load_journal_obj = journals_func.load_ae_obj_id__journal_entry({
+ let load_journal_entry_obj = journals_func.load_ae_obj_id__journal_entry({
api_cfg: ae_acct.api,
journal_entry_id: journal_entry_id,
try_cache: true,
log_lvl: log_lvl
});
- ae_acct.slct.journal_obj = load_journal_obj;
+ if (!load_journal_entry_obj) {
+ error(404, {
+ message: 'Journals - Journal Entry not found'
+ });
+ } else {
+ ae_acct.slct.journal_obj = load_journal_entry_obj;
+ }
}
// WARNING: Precaution against shared data between sites.