diff --git a/src/routes/core/accounts/+page.svelte b/src/routes/core/accounts/+page.svelte index 8a70e485..854c3ea8 100644 --- a/src/routes/core/accounts/+page.svelte +++ b/src/routes/core/accounts/+page.svelte @@ -183,7 +183,7 @@ async function handle_add_account() {
- {#each filtered_li as acct (acct.account_id_random)} + {#each filtered_li as acct (acct.account_id)}
@@ -233,13 +233,13 @@ async function handle_add_account() { size={14} class="text-secondary-500 shrink-0" /> {acct.account_id_random} + >{acct.account_id}
+ href="/core/accounts/{acct.account_id}"> Manage Account
diff --git a/src/routes/core/addresses/+page.svelte b/src/routes/core/addresses/+page.svelte index efa31286..0ab66c88 100644 --- a/src/routes/core/addresses/+page.svelte +++ b/src/routes/core/addresses/+page.svelte @@ -87,8 +87,8 @@ onMount(() => { onSave={(new_addr) => { show_add_form = false; load_addresses(); - if (new_addr.address_id_random) { - goto(`/core/addresses/${new_addr.address_id_random}`); + if (new_addr.address_id) { + goto(`/core/addresses/${new_addr.address_id}`); } }} onCancel={() => (show_add_form = false)} /> @@ -153,7 +153,7 @@ onMount(() => {
- {#each filtered_li as addr (addr.address_id_random)} + {#each filtered_li as addr (addr.address_id)}
@@ -206,7 +206,7 @@ onMount(() => { + href="/core/addresses/{addr.address_id}"> View Details
diff --git a/src/routes/core/addresses/[address_id]/+page.svelte b/src/routes/core/addresses/[address_id]/+page.svelte index 87e8ada0..d6cb733f 100644 --- a/src/routes/core/addresses/[address_id]/+page.svelte +++ b/src/routes/core/addresses/[address_id]/+page.svelte @@ -297,7 +297,7 @@ async function handle_delete() {

ID: {address.address_id_random} + >{address.address_id}

Created: diff --git a/src/routes/core/addresses/ae_comp__address_form.svelte b/src/routes/core/addresses/ae_comp__address_form.svelte index 29001555..b8dd77d3 100644 --- a/src/routes/core/addresses/ae_comp__address_form.svelte +++ b/src/routes/core/addresses/ae_comp__address_form.svelte @@ -82,11 +82,11 @@ async function handleSubmit(event: Event) { try { let result; - if (address?.address_id_random) { + if (address?.address_id) { // Update existing result = await update_ae_obj__address({ api_cfg: $ae_api, - address_id: address.address_id_random, + address_id: address.address_id, data_kv: payload, log_lvl: 1 }); diff --git a/src/routes/core/ae_comp__person_obj_tbl.svelte b/src/routes/core/ae_comp__person_obj_tbl.svelte index b2366d26..302a08b3 100644 --- a/src/routes/core/ae_comp__person_obj_tbl.svelte +++ b/src/routes/core/ae_comp__person_obj_tbl.svelte @@ -29,7 +29,7 @@ import { interface Props { // Exports container_class_li?: string | Array; - person_id_random_li?: Array; + person_id_li?: Array; allow_basic?: boolean; allow_moderator?: boolean; show_user_fields?: boolean; @@ -38,7 +38,7 @@ interface Props { let { container_class_li = [], - person_id_random_li = $bindable(['']), + person_id_li = $bindable([]), allow_basic = false, allow_moderator = false, show_user_fields = false, @@ -49,12 +49,12 @@ let { // *** Functions and Logic let lq_kv__person_obj_li = $derived( - liveQuery(() => db_core.person.bulkGet(person_id_random_li)) + liveQuery(() => db_core.person.where('person_id').anyOf(person_id_li).toArray()) );

- {#if person_id_random_li && $lq_kv__person_obj_li && $lq_kv__person_obj_li?.length > 0} + {#if person_id_li && $lq_kv__person_obj_li && $lq_kv__person_obj_li?.length > 0}

Results: @@ -85,15 +85,15 @@ let lq_kv__person_obj_li = $derived( - {#each $lq_kv__person_obj_li as person_obj (person_obj?.person_id_random)} + {#each $lq_kv__person_obj_li as person_obj (person_obj?.person_id)} + 'no name'} (ID={person_obj?.person_id})"> {@html person_obj?.full_name ? person_obj?.full_name @@ -121,7 +121,7 @@ let lq_kv__person_obj_li = $derived( {#if show_user_fields} - {#if person_obj?.user_id_random} + {#if person_obj?.user_id}
@@ -129,7 +129,7 @@ let lq_kv__person_obj_li = $derived( size="1em" class="text-success-500" /> {@html person_obj?.username ?? '-- no username --'} @@ -137,7 +137,7 @@ let lq_kv__person_obj_li = $derived( {person_obj.user_id_random} + >{person_obj.user_id}
{:else} Admin{/if} - {#if !person_obj?.user_id_random}--{/if}

diff --git a/src/routes/core/contacts/+page.svelte b/src/routes/core/contacts/+page.svelte index 116e4aa9..3106be23 100644 --- a/src/routes/core/contacts/+page.svelte +++ b/src/routes/core/contacts/+page.svelte @@ -85,8 +85,8 @@ onMount(() => { onSave={(new_con) => { show_add_form = false; load_contacts(); - if (new_con.contact_id_random) { - goto(`/core/contacts/${new_con.contact_id_random}`); + if (new_con.contact_id) { + goto(`/core/contacts/${new_con.contact_id}`); } }} onCancel={() => (show_add_form = false)} /> @@ -151,7 +151,7 @@ onMount(() => {
- {#each filtered_li as con (con.contact_id_random)} + {#each filtered_li as con (con.contact_id)}
@@ -202,7 +202,7 @@ onMount(() => { + href="/core/contacts/{con.contact_id}"> Manage Contact
diff --git a/src/routes/core/contacts/[contact_id]/+page.svelte b/src/routes/core/contacts/[contact_id]/+page.svelte index 62fc8f3c..38587d5b 100644 --- a/src/routes/core/contacts/[contact_id]/+page.svelte +++ b/src/routes/core/contacts/[contact_id]/+page.svelte @@ -292,7 +292,7 @@ async function handle_delete() {

ID: {contact.contact_id_random} + >{contact.contact_id}

Created: diff --git a/src/routes/core/contacts/ae_comp__contact_form.svelte b/src/routes/core/contacts/ae_comp__contact_form.svelte index a2c194f5..666cae2c 100644 --- a/src/routes/core/contacts/ae_comp__contact_form.svelte +++ b/src/routes/core/contacts/ae_comp__contact_form.svelte @@ -86,11 +86,11 @@ async function handleSubmit(event: Event) { try { let result; - if (contact?.contact_id_random) { + if (contact?.contact_id) { // Update existing result = await update_ae_obj__contact({ api_cfg: $ae_api, - contact_id: contact.contact_id_random, + contact_id: contact.contact_id, data_kv: payload, log_lvl: 1 }); diff --git a/src/routes/core/people/+page.svelte b/src/routes/core/people/+page.svelte index 5896b2a5..927c22ea 100644 --- a/src/routes/core/people/+page.svelte +++ b/src/routes/core/people/+page.svelte @@ -8,7 +8,7 @@ import Comp_person_search from './ae_comp__person_search.svelte'; import Comp_person_obj_tbl from '../ae_comp__person_obj_tbl.svelte'; import Person_form from './ae_comp__person_form.svelte'; -let person_id_random_li: string[] = $state([]); +let person_id_li: string[] = $state([]); let show_add_form = $state(false); onMount(() => { @@ -46,7 +46,7 @@ onMount(() => { { show_add_form = false; - goto(`/core/people/${new_person.person_id_random}`); + goto(`/core/people/${new_person.person_id}`); }} onCancel={() => (show_add_form = false)} />

@@ -54,7 +54,7 @@ onMount(() => { { - person_id_random_li = results.map((p) => p.person_id_random); + person_id_li = results.map((p) => p.person_id); $ae_sess.person.show_report__person_li = true; }} /> @@ -66,11 +66,11 @@ onMount(() => { Search Results {person_id_random_li.length} found + >{person_id_li.length} found
diff --git a/src/routes/core/people/ae_comp__person_form.svelte b/src/routes/core/people/ae_comp__person_form.svelte index 27945cd3..e6d7c36a 100644 --- a/src/routes/core/people/ae_comp__person_form.svelte +++ b/src/routes/core/people/ae_comp__person_form.svelte @@ -108,11 +108,11 @@ async function handleSubmit(event: Event) { try { let result; - if (person?.person_id_random) { + if (person?.person_id) { // Update existing result = await core_func.update_ae_obj__person({ api_cfg: $ae_api, - person_id: person.person_id_random, + person_id: person.person_id, data_kv: payload, log_lvl: 1 }); diff --git a/src/routes/core/people/ae_comp__person_search.svelte b/src/routes/core/people/ae_comp__person_search.svelte index 12eeb215..e5e29bf7 100644 --- a/src/routes/core/people/ae_comp__person_search.svelte +++ b/src/routes/core/people/ae_comp__person_search.svelte @@ -36,7 +36,7 @@ async function handle_search() { p.primary_email ?.toLowerCase() .includes(qry_str.toLowerCase()) || - p.person_id_random + p.person_id ?.toLowerCase() .includes(qry_str.toLowerCase()) ) diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte index 72ec787a..51fd5994 100644 --- a/src/routes/core/person_view.svelte +++ b/src/routes/core/person_view.svelte @@ -121,7 +121,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -142,7 +142,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -167,14 +167,14 @@ $effect(() => { core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -183,14 +183,14 @@ $effect(() => { core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -201,7 +201,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -231,7 +231,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -252,7 +252,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -275,7 +275,7 @@ $effect(() => {
  • { on_success={() => core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 })}> @@ -307,12 +307,12 @@ $effect(() => { await api.update_ae_obj({ api_cfg: $ae_api, obj_type: 'person', - obj_id: $lq__person_obj?.person_id_random, + obj_id: $lq__person_obj?.person_id, fields: { hide: !$lq__person_obj?.hide } }); core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 }); }} @@ -340,12 +340,12 @@ $effect(() => { await api.update_ae_obj({ api_cfg: $ae_api, obj_type: 'person', - obj_id: $lq__person_obj?.person_id_random, + obj_id: $lq__person_obj?.person_id, fields: { enable: !$lq__person_obj?.enable } }); core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 }); }} @@ -376,12 +376,12 @@ $effect(() => { await api.update_ae_obj({ api_cfg: $ae_api, obj_type: 'person', - obj_id: $lq__person_obj?.person_id_random, + obj_id: $lq__person_obj?.person_id, fields: { priority: !$lq__person_obj?.priority } }); core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 }); }} @@ -407,14 +407,14 @@ $effect(() => { await api.update_ae_obj({ api_cfg: $ae_api, obj_type: 'person', - obj_id: $lq__person_obj?.person_id_random, + obj_id: $lq__person_obj?.person_id, fields: { allow_auth_key: !$lq__person_obj?.allow_auth_key } }); core_func.load_ae_obj_id__person({ api_cfg: $ae_api, - person_id: $lq__person_obj?.person_id_random, + person_id: $lq__person_obj?.person_id, log_lvl: 1 }); }} @@ -491,7 +491,7 @@ $effect(() => { ae_promises.update__person_obj = core_func .update_ae_obj__person({ api_cfg: $ae_api, - person_id: $lq__person_obj.person_id_random, + person_id: $lq__person_obj.person_id, data_kv: person_data, log_lvl: 0 }) diff --git a/src/routes/core/sites/+page.svelte b/src/routes/core/sites/+page.svelte index 36924cbb..5002a87a 100644 --- a/src/routes/core/sites/+page.svelte +++ b/src/routes/core/sites/+page.svelte @@ -186,7 +186,7 @@ async function handle_add_site() {
    - {#each filtered_li as site (site.site_id_random)} + {#each filtered_li as site (site.site_id)}
    @@ -236,13 +236,13 @@ async function handle_add_site() { size={14} class="text-secondary-500 shrink-0" /> {site.site_id_random} + >{site.site_id}
    + href="/core/sites/{site.site_id}"> Manage Site
    diff --git a/src/routes/core/sites/[site_id]/+page.svelte b/src/routes/core/sites/[site_id]/+page.svelte index 207d8a22..0622c441 100644 --- a/src/routes/core/sites/[site_id]/+page.svelte +++ b/src/routes/core/sites/[site_id]/+page.svelte @@ -98,7 +98,7 @@ async function handle_toggle_domain(dom: any) { await update_ae_obj__site_domain({ api_cfg: $ae_api, site_id, - site_domain_id: dom.site_domain_id_random, + site_domain_id: dom.site_domain_id, data_kv: { enable: !dom.enable }, log_lvl: 1 }); @@ -110,7 +110,7 @@ async function handle_delete_domain(dom: any) { await delete_ae_obj_id__site_domain({ api_cfg: $ae_api, site_id, - site_domain_id: dom.site_domain_id_random, + site_domain_id: dom.site_domain_id, method: 'delete', log_lvl: 1 }); @@ -273,7 +273,7 @@ async function handle_delete_domain(dom: any) {

    {:else}
    - {#each domain_li as dom (dom.site_domain_id_random)} + {#each domain_li as dom (dom.site_domain_id)}
    diff --git a/src/routes/core/users/+page.svelte b/src/routes/core/users/+page.svelte index 7256cb9b..3de8be17 100644 --- a/src/routes/core/users/+page.svelte +++ b/src/routes/core/users/+page.svelte @@ -188,7 +188,7 @@ async function handle_add_user() {
    - {#each user_li as user (user.user_id_random)} + {#each user_li as user (user.user_id)}
    @@ -244,13 +244,13 @@ async function handle_add_user() { size={14} class="text-secondary-500" /> {user.user_id_random} + >{user.user_id}
    + href="/core/users/{user.user_id}"> Manage User
    diff --git a/src/routes/core/users/[user_id]/+page.svelte b/src/routes/core/users/[user_id]/+page.svelte index 869c2ff9..1c4925cb 100644 --- a/src/routes/core/users/[user_id]/+page.svelte +++ b/src/routes/core/users/[user_id]/+page.svelte @@ -52,7 +52,7 @@ async function handle_save() { const result = await update_ae_obj__user({ api_cfg: $ae_api, - user_id: user.user_id_random, + user_id: user.user_id, data_kv, log_lvl: 1 }); @@ -68,7 +68,7 @@ async function handle_delete() { const result = await delete_ae_obj_id__user({ api_cfg: $ae_api, - user_id: user.user_id_random, + user_id: user.user_id, method: 'disable', log_lvl: 1 }); @@ -99,7 +99,7 @@ async function handle_delete() {

    - UID: {user.user_id_random} + UID: {user.user_id}

    @@ -306,11 +306,11 @@ async function handle_delete() { class="font-bold tracking-tighter uppercase opacity-50" >Linked Person - {#if user.person_id_random} + {#if user.person_id} - {user.person_id_random} + {user.person_id} {:else}