refactor: stabilize event file management and ID synchronization
- Updated 'process_ae_obj__event_file_props' to synchronize generic 'for_id' with specific object IDs (e.g., 'event_presenter_id'). - Standardized 'element_manage_event_file_li_direct.svelte' to use specific ID filtering. - Fixed missing 'prevent_default' in 'ae_comp__hosted_files_clip_video.svelte'. - Resolved miscellaneous type and syntax errors identified by svelte-check.
This commit is contained in:
Scott Idem
@@ -8,7 +8,14 @@
|
||||
import { api } from '$lib/api/api';
|
||||
|
||||
// import { core_func } from '$lib/ae_core_functions';
|
||||
import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
|
||||
import {
|
||||
ae_loc,
|
||||
ae_sess,
|
||||
ae_api,
|
||||
ae_trig,
|
||||
slct,
|
||||
slct_trigger
|
||||
} from '$lib/stores/ae_stores';
|
||||
import { db_events } from '$lib/ae_events/db_events';
|
||||
import {
|
||||
events_loc,
|
||||
@@ -55,7 +62,9 @@
|
||||
console.log(
|
||||
`Element - Manage Event File List: link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`
|
||||
);
|
||||
console.log(`allow_basic: ${allow_basic}; allow_moderator: ${allow_moderator}`);
|
||||
console.log(
|
||||
`allow_basic: ${allow_basic}; allow_moderator: ${allow_moderator}`
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -119,12 +128,17 @@
|
||||
class="svelte_component event_file_uploaded_manage {container_class_li}"
|
||||
class:text-sm={display_mode != 'default'}
|
||||
>
|
||||
<h3 class="h6" class:hidden={!$lq__event_file_obj_li?.length || display_mode != 'default'}>
|
||||
<h3
|
||||
class="h6"
|
||||
class:hidden={!$lq__event_file_obj_li?.length ||
|
||||
display_mode != 'default'}
|
||||
>
|
||||
Manage Files:
|
||||
<span
|
||||
class="font-bold bg-success-100 px-4 border rounded-lg border-success-200"
|
||||
title="Files for {link_to_type ?? '-- not set --'}: {link_to_id ??
|
||||
'-- not set --'} (files: {$lq__event_file_obj_li?.length ?? 'None'})"
|
||||
'-- not set --'} (files: {$lq__event_file_obj_li?.length ??
|
||||
'None'})"
|
||||
>
|
||||
<span class="fas fa-folder-open mx-1"></span>
|
||||
{@html $lq__event_file_obj_li
|
||||
@@ -143,15 +157,15 @@
|
||||
{#if display_mode === 'default'}
|
||||
<th
|
||||
class="text-center"
|
||||
class:hidden={!allow_basic && !$ae_loc.trusted_access}
|
||||
>Options</th
|
||||
class:hidden={!allow_basic &&
|
||||
!$ae_loc.trusted_access}>Options</th
|
||||
>
|
||||
{/if}
|
||||
{#if display_mode === 'default'}
|
||||
<th
|
||||
class="text-center"
|
||||
class:hidden={!allow_basic && !$ae_loc.trusted_access}
|
||||
>Status</th
|
||||
class:hidden={!allow_basic &&
|
||||
!$ae_loc.trusted_access}>Status</th
|
||||
>
|
||||
{/if}
|
||||
<th class="text-center">Meta</th>
|
||||
@@ -181,8 +195,12 @@
|
||||
<div
|
||||
class="px-4 py-2 flex flex-col gap-0.5 bg-surface-100/50 rounded-lg border border-surface-500/10"
|
||||
>
|
||||
<div class="flex flex-row items-center gap-2">
|
||||
<span class="text-[10px] font-bold uppercase opacity-50 w-24">
|
||||
<div
|
||||
class="flex flex-row items-center gap-2"
|
||||
>
|
||||
<span
|
||||
class="text-[10px] font-bold uppercase opacity-50 w-24"
|
||||
>
|
||||
Access Link:
|
||||
</span>
|
||||
<MyClipboard
|
||||
@@ -193,7 +211,7 @@
|
||||
btn_title="Copy the direct download link to the clipboard."
|
||||
btn_class="btn btn-xs preset-tonal-warning hover:preset-filled-warning-500"
|
||||
></MyClipboard>
|
||||
|
||||
|
||||
<MyClipboard
|
||||
value={encodeURI(
|
||||
`${$ae_api.base_url}/v3/action/event_file/${event_file_obj?.event_file_id}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&key=${$ae_api.account_id}`
|
||||
@@ -214,7 +232,8 @@
|
||||
size="12"
|
||||
placeholder="Filename"
|
||||
bind:value={
|
||||
$events_sess.pres_mgmt.tmp_val__filename_no_ext
|
||||
$events_sess.pres_mgmt
|
||||
.tmp_val__filename_no_ext
|
||||
}
|
||||
data-original_value={event_file_obj.filename}
|
||||
class="input min-w-72 lg:min-w-96 text-sm bg-warning-100"
|
||||
@@ -227,10 +246,12 @@
|
||||
let new_filename =
|
||||
$events_sess.pres_mgmt.tmp_val__filename_no_ext.trim();
|
||||
// Remove possible double extension
|
||||
new_filename = new_filename.replace(
|
||||
'.' + event_file_obj.extension,
|
||||
''
|
||||
);
|
||||
new_filename =
|
||||
new_filename.replace(
|
||||
'.' +
|
||||
event_file_obj.extension,
|
||||
''
|
||||
);
|
||||
|
||||
// Add the extension back
|
||||
new_filename =
|
||||
@@ -239,43 +260,57 @@
|
||||
event_file_obj.extension;
|
||||
|
||||
// Remove any double dots
|
||||
new_filename = new_filename.replace(
|
||||
/\.\./g,
|
||||
'.'
|
||||
);
|
||||
new_filename =
|
||||
new_filename.replace(
|
||||
/\.\./g,
|
||||
'.'
|
||||
);
|
||||
|
||||
let event_file_data = {
|
||||
filename: new_filename
|
||||
};
|
||||
|
||||
ae_promises.update__event_file_obj = events_func
|
||||
.update_ae_obj__event_file({
|
||||
api_cfg: $ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
data_kv: event_file_data,
|
||||
log_lvl: 0
|
||||
})
|
||||
.then(function (update_results) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
update_results
|
||||
ae_promises.update__event_file_obj =
|
||||
events_func
|
||||
.update_ae_obj__event_file(
|
||||
{
|
||||
api_cfg:
|
||||
$ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
data_kv:
|
||||
event_file_data,
|
||||
log_lvl: 0
|
||||
}
|
||||
)
|
||||
.then(
|
||||
function (
|
||||
update_results
|
||||
) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
update_results
|
||||
);
|
||||
$events_sess.pres_mgmt.show_field_edit__filename = false;
|
||||
}
|
||||
);
|
||||
$events_sess.pres_mgmt.show_field_edit__filename = false;
|
||||
});
|
||||
}}
|
||||
class="btn btn-sm preset-tonal-tertiary hover:preset-tonal-success"
|
||||
title="Save changes"
|
||||
>
|
||||
{#await ae_promises.update__event_file_obj}
|
||||
<span class="fas fa-spinner fa-spin mx-1"
|
||||
<span
|
||||
class="fas fa-spinner fa-spin mx-1"
|
||||
></span>
|
||||
<span class=""
|
||||
>Saving {event_file_obj.extension}</span
|
||||
>
|
||||
{:then}
|
||||
<span class="fas fa-save mx-1"></span>
|
||||
Save {event_file_obj.extension} filename?
|
||||
<span
|
||||
class="fas fa-save mx-1"
|
||||
></span>
|
||||
Save {event_file_obj.extension}
|
||||
filename?
|
||||
{/await}
|
||||
</button>
|
||||
{/if}
|
||||
@@ -286,12 +321,14 @@
|
||||
{#if display_mode === 'default'}
|
||||
<td
|
||||
class="event_file__options"
|
||||
class:hidden={!allow_basic && !$ae_loc.trusted_access}
|
||||
class:hidden={!allow_basic &&
|
||||
!$ae_loc.trusted_access}
|
||||
>
|
||||
<div class="flex flex-col gap-1 text-sm">
|
||||
<button
|
||||
type="button"
|
||||
disabled={!allow_basic && !$ae_loc.trusted_access}
|
||||
disabled={!allow_basic &&
|
||||
!$ae_loc.trusted_access}
|
||||
onclick={() => {
|
||||
if (
|
||||
$events_sess.pres_mgmt
|
||||
@@ -309,12 +346,14 @@
|
||||
}
|
||||
}}
|
||||
class="btn btn-sm preset-tonal-tertiary hover:preset-tonal-success"
|
||||
class:preset-tonal-warning={$events_sess.pres_mgmt
|
||||
class:preset-tonal-warning={$events_sess
|
||||
.pres_mgmt
|
||||
.show_field_edit__filename ==
|
||||
event_file_obj.event_file_id}
|
||||
title={`Rename this file? "${event_file_obj.filename}"}`}
|
||||
>
|
||||
<span class="fas fa-edit mx-1"></span>
|
||||
<span class="fas fa-edit mx-1"
|
||||
></span>
|
||||
{#if $events_sess.pres_mgmt?.show_field_edit__filename == event_file_obj.event_file_id}
|
||||
Cancel?
|
||||
{:else}
|
||||
@@ -324,40 +363,57 @@
|
||||
|
||||
<button
|
||||
type="button"
|
||||
disabled={!allow_basic && !$ae_loc.trusted_access}
|
||||
disabled={!allow_basic &&
|
||||
!$ae_loc.trusted_access}
|
||||
onclick={async () => {
|
||||
let event_file_data = {
|
||||
hide: !event_file_obj.hide
|
||||
};
|
||||
|
||||
ae_promises.update__event_file_obj = events_func
|
||||
.update_ae_obj__event_file({
|
||||
api_cfg: $ae_api,
|
||||
event_file_id: event_file_obj.event_file_id,
|
||||
data_kv: event_file_data,
|
||||
log_lvl: 0
|
||||
})
|
||||
.then(function (update_results) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
update_results
|
||||
ae_promises.update__event_file_obj =
|
||||
events_func
|
||||
.update_ae_obj__event_file(
|
||||
{
|
||||
api_cfg:
|
||||
$ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
data_kv:
|
||||
event_file_data,
|
||||
log_lvl: 0
|
||||
}
|
||||
)
|
||||
.then(
|
||||
function (
|
||||
update_results
|
||||
) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
update_results
|
||||
);
|
||||
|
||||
// let params = {
|
||||
// qry__enabled: 'all',
|
||||
// qry__hidden: 'all',
|
||||
// }
|
||||
|
||||
events_func.load_ae_obj_li__event_file(
|
||||
{
|
||||
api_cfg:
|
||||
$ae_api,
|
||||
for_obj_type:
|
||||
link_to_type,
|
||||
for_obj_id:
|
||||
link_to_id,
|
||||
enabled:
|
||||
'all',
|
||||
hidden: 'all',
|
||||
// params: params,
|
||||
try_cache: true
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
// let params = {
|
||||
// qry__enabled: 'all',
|
||||
// qry__hidden: 'all',
|
||||
// }
|
||||
|
||||
events_func.load_ae_obj_li__event_file({
|
||||
api_cfg: $ae_api,
|
||||
for_obj_type: link_to_type,
|
||||
for_obj_id: link_to_id,
|
||||
enabled: 'all',
|
||||
hidden: 'all',
|
||||
// params: params,
|
||||
try_cache: true
|
||||
});
|
||||
});
|
||||
}}
|
||||
class="btn btn-sm preset-tonal-tertiary hover:preset-tonal-success"
|
||||
title="Hide this file from the presentation launcher"
|
||||
@@ -367,22 +423,28 @@
|
||||
-->
|
||||
|
||||
{#await ae_promises.update__event_file_obj}
|
||||
<span class="fas fa-spinner fa-spin mx-1"></span>
|
||||
<span
|
||||
class="fas fa-spinner fa-spin mx-1"
|
||||
></span>
|
||||
<span class=""
|
||||
>Saving {event_file_obj.extension}</span
|
||||
>
|
||||
{:then}
|
||||
{#if event_file_obj.hide}
|
||||
<span class="fas fa-eye m-1"></span> Unhide File
|
||||
<span class="fas fa-eye m-1"
|
||||
></span> Unhide File
|
||||
{:else}
|
||||
<span class="fas fa-eye-slash m-1"></span> Hide
|
||||
<span
|
||||
class="fas fa-eye-slash m-1"
|
||||
></span> Hide
|
||||
{/if}
|
||||
{/await}
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
disabled={!allow_basic && !$ae_loc.trusted_access}
|
||||
disabled={!allow_basic &&
|
||||
!$ae_loc.trusted_access}
|
||||
onclick={async () => {
|
||||
if (
|
||||
!confirm(
|
||||
@@ -395,16 +457,20 @@
|
||||
// ae_promises[event_file_obj.event_file_id] = handle_delete__event_file({event_file_id: event_file_obj.event_file_id});
|
||||
|
||||
ae_promises.delete__event_file_obj =
|
||||
await events_func.delete_ae_obj_id__event_file({
|
||||
api_cfg: $ae_api,
|
||||
event_file_id: event_file_obj.event_file_id,
|
||||
log_lvl: 1
|
||||
});
|
||||
await events_func.delete_ae_obj_id__event_file(
|
||||
{
|
||||
api_cfg: $ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
log_lvl: 1
|
||||
}
|
||||
);
|
||||
}}
|
||||
class="btn btn-sm preset-tonal-tertiary hover:preset-tonal-success"
|
||||
title="Delete this file"
|
||||
>
|
||||
<span class="fas fa-trash-alt mx-1"></span>
|
||||
<span class="fas fa-trash-alt mx-1"
|
||||
></span>
|
||||
<!-- <span class="fas fa-minus mx-1"></span> -->
|
||||
Delete
|
||||
</button>
|
||||
@@ -415,22 +481,30 @@
|
||||
{#if display_mode === 'default'}
|
||||
<td
|
||||
class="event_file__status"
|
||||
class:hidden={!allow_basic && !$ae_loc.trusted_access}
|
||||
class:hidden={!allow_basic &&
|
||||
!$ae_loc.trusted_access}
|
||||
>
|
||||
<div
|
||||
class="flex flex-col gap-1 items-center justify-center text-sm"
|
||||
>
|
||||
<div class="">
|
||||
{#if event_file_obj.open_in_os == 'win'}
|
||||
MS Windows <span class="fab fa-windows"></span>
|
||||
MS Windows <span
|
||||
class="fab fa-windows"
|
||||
></span>
|
||||
{:else if event_file_obj.open_in_os == 'mac'}
|
||||
Apple macOS <span class="fab fa-apple"></span>
|
||||
Apple macOS <span
|
||||
class="fab fa-apple"
|
||||
></span>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<!-- Select from options for the purpose of this file -->
|
||||
<div>
|
||||
<label for="file_purpose" class="text-sm mx-1 hidden">
|
||||
<label
|
||||
for="file_purpose"
|
||||
class="text-sm mx-1 hidden"
|
||||
>
|
||||
Purpose:
|
||||
</label>
|
||||
<select
|
||||
@@ -447,26 +521,37 @@
|
||||
);
|
||||
|
||||
let event_file_data = {
|
||||
event_file_id: event_file_obj.event_file_id,
|
||||
file_purpose: (e.target as HTMLInputElement).value
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
file_purpose: (
|
||||
e.target as HTMLInputElement
|
||||
).value
|
||||
};
|
||||
|
||||
events_func
|
||||
.update_ae_obj__event_file({
|
||||
api_cfg: $ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
data_kv: event_file_data,
|
||||
log_lvl: 1
|
||||
})
|
||||
.then(function (update_results) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
.update_ae_obj__event_file(
|
||||
{
|
||||
api_cfg:
|
||||
$ae_api,
|
||||
event_file_id:
|
||||
event_file_obj.event_file_id,
|
||||
data_kv:
|
||||
event_file_data,
|
||||
log_lvl: 1
|
||||
}
|
||||
)
|
||||
.then(
|
||||
function (
|
||||
update_results
|
||||
);
|
||||
$slct_trigger =
|
||||
'load__event_file_obj_li';
|
||||
});
|
||||
) {
|
||||
console.log(
|
||||
`Update results:`,
|
||||
update_results
|
||||
);
|
||||
$slct_trigger =
|
||||
'load__event_file_obj_li';
|
||||
}
|
||||
);
|
||||
|
||||
// ae_triggers.update_event_file_purpose = true;
|
||||
}}
|
||||
@@ -511,8 +596,13 @@
|
||||
<div class="flex flex-col gap-0.5 text-xs">
|
||||
<!-- {event_file_obj.hosted_file_content_type} -->
|
||||
|
||||
<span class="w-full flex flex-col lg:flex-row justify-between">
|
||||
<span class:hidden={display_mode != 'default'}>
|
||||
<span
|
||||
class="w-full flex flex-col lg:flex-row justify-between"
|
||||
>
|
||||
<span
|
||||
class:hidden={display_mode !=
|
||||
'default'}
|
||||
>
|
||||
Type:
|
||||
<strong
|
||||
>{event_file_obj.extension}
|
||||
@@ -533,7 +623,10 @@
|
||||
{/if} -->
|
||||
</span>
|
||||
<span>
|
||||
<span class:hidden={display_mode != 'default'}>
|
||||
<span
|
||||
class:hidden={display_mode !=
|
||||
'default'}
|
||||
>
|
||||
Size:
|
||||
</span>
|
||||
<strong
|
||||
@@ -544,46 +637,73 @@
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span class="w-full flex flex-col lg:flex-row justify-between">
|
||||
<span title="SHA 256: {event_file_obj.hash_sha256}">
|
||||
<span class:hidden={display_mode != 'default'}>
|
||||
<span
|
||||
class="w-full flex flex-col lg:flex-row justify-between"
|
||||
>
|
||||
<span
|
||||
title="SHA 256: {event_file_obj.hash_sha256}"
|
||||
>
|
||||
<span
|
||||
class:hidden={display_mode !=
|
||||
'default'}
|
||||
>
|
||||
Hash:
|
||||
</span>
|
||||
<strong class:font-normal={display_mode != 'default'}
|
||||
>{event_file_obj.hash_sha256.slice(0, 10)}…</strong
|
||||
<strong
|
||||
class:font-normal={display_mode !=
|
||||
'default'}
|
||||
>{event_file_obj.hash_sha256.slice(
|
||||
0,
|
||||
10
|
||||
)}…</strong
|
||||
>
|
||||
</span>
|
||||
<span
|
||||
class:hidden={!$ae_loc.administrator_access ||
|
||||
display_mode != 'default'}
|
||||
>
|
||||
<span class:hidden={display_mode != 'default'}>
|
||||
<span
|
||||
class:hidden={display_mode !=
|
||||
'default'}
|
||||
>
|
||||
ID:
|
||||
</span>
|
||||
<strong>{event_file_obj.hosted_file_id}</strong>
|
||||
<strong
|
||||
>{event_file_obj.hosted_file_id}</strong
|
||||
>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<!-- If this file was uploaded (created) within the last 15 minutes we want to highlight it in blue. -->
|
||||
<span
|
||||
class:bg-yellow-200={ae_util.is_datetime_recent({
|
||||
datetime: event_file_obj?.created_on,
|
||||
minutes: 30
|
||||
})}
|
||||
class:bg-green-200={ae_util.is_datetime_recent({
|
||||
datetime: event_file_obj?.created_on,
|
||||
minutes: 240
|
||||
})}
|
||||
class:bg-blue-200={ae_util.is_datetime_recent({
|
||||
datetime: event_file_obj?.created_on,
|
||||
minutes: 2880
|
||||
})}
|
||||
class:bg-yellow-200={ae_util.is_datetime_recent(
|
||||
{
|
||||
datetime:
|
||||
event_file_obj?.created_on,
|
||||
minutes: 30
|
||||
}
|
||||
)}
|
||||
class:bg-green-200={ae_util.is_datetime_recent(
|
||||
{
|
||||
datetime:
|
||||
event_file_obj?.created_on,
|
||||
minutes: 240
|
||||
}
|
||||
)}
|
||||
class:bg-blue-200={ae_util.is_datetime_recent(
|
||||
{
|
||||
datetime:
|
||||
event_file_obj?.created_on,
|
||||
minutes: 2880
|
||||
}
|
||||
)}
|
||||
>
|
||||
{#if display_mode == 'default'}
|
||||
<!-- <span class="fas fa-cloud-upload-alt mx-1"></span> -->
|
||||
<!-- Uploaded: -->
|
||||
<!-- <span class="fas fa-calendar-day mx-1"></span> -->
|
||||
<span class="fas fa-clock mx-1"></span>
|
||||
<span class="fas fa-clock mx-1"
|
||||
></span>
|
||||
<strong>
|
||||
{ae_util.iso_datetime_formatter(
|
||||
event_file_obj.created_on,
|
||||
@@ -627,11 +747,14 @@
|
||||
</table>
|
||||
</div>
|
||||
{:else}
|
||||
<p class="w-96 text-center text-gray-500" class:hidden={display_mode != 'default'}>
|
||||
<p
|
||||
class="w-96 text-center text-gray-500"
|
||||
class:hidden={display_mode != 'default'}
|
||||
>
|
||||
No files uploaded to display
|
||||
</p>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
ae_tmp.show__direct_download = false;
|
||||
// let ae_triggers: key_val = {};
|
||||
|
||||
let dq__where_val: string = `${link_to_type}_id_random`;
|
||||
let dq__where_val: string = `${link_to_type}_id`;
|
||||
let dq__where_eq_val: string = link_to_id;
|
||||
|
||||
// This should include all files that are associated with an object (event, location, session, presenter, etc.)
|
||||
|
||||
@@ -39,9 +39,8 @@
|
||||
ae_tmp.show__direct_download = false;
|
||||
// let ae_triggers: key_val = {};
|
||||
|
||||
let dq__where_val: string = `for_type`;
|
||||
let dq__where_eq_val: string = link_to_type;
|
||||
let dq__where_for_id_eq_val: string = link_to_id;
|
||||
let dq__where_val: string = `${link_to_type}_id`;
|
||||
let dq__where_eq_val: string = link_to_id;
|
||||
|
||||
// This should only include files that are directly linked to an object (event, location, session, presenter, etc.).
|
||||
// I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order.
|
||||
@@ -50,7 +49,6 @@
|
||||
let results = await db_events.file
|
||||
.where(dq__where_val)
|
||||
.equals(dq__where_eq_val)
|
||||
.and((file) => file.for_id == dq__where_for_id_eq_val)
|
||||
.reverse()
|
||||
.sortBy('created_on');
|
||||
// .toArray()
|
||||
|
||||
Reference in New Issue
Block a user