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

Mostly working before major fix for data shared.

Browse Source
This commit is contained in:
Scott Idem
2024-03-26 18:25:43 -04:00
parent f20c6ef706
commit a30690ea2a
3 changed files with 66 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/routes/+layout.ts
View File

@@ -58,7 +58,6 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
};
let loading_results = null;
// let access_code_li_json = null;
// First do a site_domain look up to check if it is valid and get the account_id.
if (!url.host) {
@@ -86,9 +85,6 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
ae_api_tmp['headers']['x-account-id'] = site_domain_results.account_id_random;
ae_api_tmp['headers']['x-no-account-id'] = null;
// ae_api.set(ae_api_tmp);
// console.log(`ae_api = `, get(ae_api));
ae_loc_tmp['account_id'] = site_domain_results.account_id_random;
ae_loc_tmp['site_id'] = site_domain_results.site_id_random;
ae_loc_tmp['site_domain_id'] = site_domain_results.site_domain_id_random;
@@ -98,33 +94,14 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
ae_loc_tmp['site_cfg_json'] = site_domain_results.cfg_json;
}
return true;
})
.then(async function (results) {
return true;
})
.finally(function () {
// console.log(`ae_ ds_code_li = `, ds_code_li);
// ae_loc_tmp = {
// ...ae_loc_tmp,
// 'ds': ds_code_li,
// }
// console.log(`ae_loc_tmp = `, ae_loc_tmp);
// data_struct['ae_loc'] = ae_loc_tmp;
// ae_loc.set(ae_loc_tmp);
// console.log(`ae_loc = `, get(ae_loc));
// data_struct['ae_ds'] = ds_code_li;
// console.log(`ae_root +layout.ts loading initial DS still...`);
return true;
});
// .then(async function (results) {
// return true;
// })
// .finally(function () {
// return true;
// });
let ds_type: null|string = 'json';
ds_code = 'hub__page__access_code_li_json';
@@ -133,35 +110,26 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
if (ds_results) {
console.log(`ae_ ds_results = `, ds_results);
return ds_results;
// // ae_loc_tmp = get(ae_loc);
// ae_loc_tmp['access_code_li'] = ds_results;
// // ae_loc_tmp = {
// // ...ae_loc_tmp,
// // 'access_code_li': ds_results,
// // }
// // ae_loc_tmp = get(ae_loc);
// // let code = 'hub__page__access_code_li_json';
// ds_code_li[ds_code] = ds_results;
// // ae_loc.set(ae_loc_tmp);
// // console.log(`ae_loc = `, get(ae_loc));
}
}
);
// ds_type = 'text';
// ds_code = 'hub__site__appshell_header';
// ds_code_li[ds_code] = await core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_api_tmp, code: ds_code, data_type: ds_type})
// .then(function (ds_results) {
// if (ds_results) {
// console.log(`ae_ ds_results = `, ds_results);
// return ds_results;
// }
// }
// );
data_struct['ae_ds'] = ds_code_li;
ae_loc_tmp['access_code_li'] = ds_code_li;
ae_loc_tmp['page_access_code_li'] = ds_code_li['hub__page__access_code_li_json'];
data_struct['ae_loc'] = ae_loc_tmp;
// data_struct['ae_loc'] = loading_results;
// console.log(`ae_root +layout.ts load after initial data stores loaded`);
return data_struct;
// }
// Currently we should never make it to this point! 2024-03-06
// console.log(`ae_root +layout.ts load function end`);
// return data_struct;
}