From 1cf5ec66a21739d06b16e4f861a13452278f73d6 Mon Sep 17 00:00:00 2001 From: Dattatraya-Londhe Date: Fri, 17 Nov 2023 13:52:00 +0530 Subject: [PATCH 1/9] Fixed side bar shrink & expand on click issue --- src/lib/components/navbar/sidebar.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/components/navbar/sidebar.svelte b/src/lib/components/navbar/sidebar.svelte index 62026cf1..4eb00dc0 100644 --- a/src/lib/components/navbar/sidebar.svelte +++ b/src/lib/components/navbar/sidebar.svelte @@ -5,7 +5,6 @@ export let userId = undefined; export let showSidebar = false; - const navData = [ { title: 'Dashboard', @@ -216,7 +215,7 @@ > {#each navData as navParent, idx} From 8f0797e475d534263b67268a2e218d0630ad8eb0 Mon Sep 17 00:00:00 2001 From: Dattatraya-Londhe Date: Fri, 17 Nov 2023 18:31:50 +0530 Subject: [PATCH 2/9] fixed all routes delete issue- toast message & double delete --- src/routes/api/server/api-client/+server.ts | 22 +++++++++++----- .../server/assessment-templates/+server.ts | 26 +++++++++++++------ .../api/server/careplan/assets/+server.ts | 22 +++++++++++----- .../api/server/careplan/careplans/+server.ts | 24 +++++++++++------ src/routes/api/server/cohorts/+server.ts | 23 ++++++++++------ src/routes/api/server/courses/+server.ts | 23 ++++++++++------ .../api/server/custom-query/delete/+server.ts | 23 ++++++++++------ src/routes/api/server/drugs/+server.ts | 23 ++++++++++------ .../gamification/badge-categories/+server.ts | 22 +++++++++++----- .../api/server/gamification/badges/+server.ts | 22 +++++++++++----- .../gamification/event-types/+server.ts | 22 +++++++++++----- .../server/gamification/schemas/+server.ts | 22 +++++++++++----- src/routes/api/server/goals/+server.ts | 23 ++++++++++------ .../api/server/health-systems/+server.ts | 22 +++++++++++----- src/routes/api/server/hospitals/+server.ts | 22 +++++++++++----- .../api/server/knowledge-nuggets/+server.ts | 23 ++++++++++------ .../api/server/lab-record-types/+server.ts | 23 ++++++++++------ .../api/server/learning-journeys/+server.ts | 23 ++++++++++------ src/routes/api/server/newsfeeds/+server.ts | 23 ++++++++++------ src/routes/api/server/notices/+server.ts | 23 ++++++++++------ .../api/server/notifications/+server.ts | 23 ++++++++++------ .../server/organizations/delete/+server.ts | 22 +++++++++++----- .../api/server/person-role-types/+server.ts | 23 ++++++++++------ src/routes/api/server/priorities/+server.ts | 23 ++++++++++------ src/routes/api/server/symptoms/+server.ts | 23 ++++++++++------ src/routes/api/server/tenants/+server.ts | 23 ++++++++++------ .../users/[userId]/api-clients/+page.svelte | 3 +-- .../assessment-templates/+page.svelte | 3 +-- .../[userId]/careplan/assets/+page.svelte | 5 +--- .../[userId]/careplan/careplans/+page.svelte | 5 +--- .../users/[userId]/cohorts/+page.svelte | 5 +--- .../[userId]/custom-queries/+page.svelte | 3 +-- src/routes/users/[userId]/drugs/+page.svelte | 3 +-- .../badge-categories/+page.svelte | 5 +--- .../[userId]/gamification/badges/+page.svelte | 5 +--- .../gamification/event-types/+page.svelte | 5 +--- .../gamification/schemas/+page.svelte | 5 +--- src/routes/users/[userId]/goals/+page.svelte | 5 +--- .../[userId]/health-systems/+page.svelte | 3 +-- .../users/[userId]/hospitals/+page.svelte | 3 +-- .../[userId]/knowledge-nuggets/+page.svelte | 3 +-- .../[userId]/lab-record-types/+page.svelte | 5 +--- .../[userId]/learning-journeys/+page.svelte | 3 +-- .../users/[userId]/newsfeeds/+page.svelte | 5 +--- .../users/[userId]/notices/+page.svelte | 5 +--- .../users/[userId]/notifications/+page.svelte | 5 +--- .../users/[userId]/organizations/+page.svelte | 5 +--- .../[userId]/person-role-types/+page.svelte | 5 +--- .../users/[userId]/priorities/+page.svelte | 5 +--- .../users/[userId]/symptoms/+page.svelte | 3 +-- .../users/[userId]/tenants/+page.svelte | 5 +--- 51 files changed, 419 insertions(+), 281 deletions(-) diff --git a/src/routes/api/server/api-client/+server.ts b/src/routes/api/server/api-client/+server.ts index f5262545..b6129554 100644 --- a/src/routes/api/server/api-client/+server.ts +++ b/src/routes/api/server/api-client/+server.ts @@ -1,17 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteApiClient } from '../../services/api-clients'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside api client server endpoints'); - const response = await deleteApiClient(data.sessionId, data.apiClientId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting api-client: ${err.message}`); - return new Response(err.message); + console.log('Inside api client server endpoints'); + let response; + try{ + response = await deleteApiClient(data.sessionId, data.apiClientId); + }catch(error){ + throw redirect( + errorMessage('Error deleting api-client.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/assessment-templates/+server.ts b/src/routes/api/server/assessment-templates/+server.ts index 8b877bb1..44bf2efb 100644 --- a/src/routes/api/server/assessment-templates/+server.ts +++ b/src/routes/api/server/assessment-templates/+server.ts @@ -1,18 +1,28 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteAssessmentTemplate } from '../../services/assessment-templates'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside assessment template server endpoints'); - const response = await deleteAssessmentTemplate(data.sessionId, data.assessmentTemplateId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting assessment template: ${err.message}`); - return new Response(err.message); + console.log('Inside assessment template server endpoints'); + let response; + try{ + response = await deleteAssessmentTemplate( + data.sessionId, + data.assessmentTemplateId + ); + }catch(error){ + throw redirect( + errorMessage('Error deleting assessment template.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/careplan/assets/+server.ts b/src/routes/api/server/careplan/assets/+server.ts index 19e4a948..b1e48665 100644 --- a/src/routes/api/server/careplan/assets/+server.ts +++ b/src/routes/api/server/careplan/assets/+server.ts @@ -1,6 +1,8 @@ +import { errorMessage, successMessage } from "$lib/utils/message.utils"; import { deleteAsset } from "$routes/api/services/careplan/assets/action-plan"; import type { RequestEvent } from "@sveltejs/kit"; +import { redirect } from "sveltekit-flash-message/server"; ////////////////////////////////////////////////////////////// @@ -9,16 +11,22 @@ export const DELETE = async (event: RequestEvent) => { console.log("request----------",request); const data = await request.json(); console.log("data----------",data); - try { - console.log('Inside assets server endpoints'); - const response = await deleteAsset( + console.log('Inside assets server endpoints'); + let response; + try{ + response = await deleteAsset( data.sessionId, data.selectAsset, data.assetId, ); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting asset: ${err.message}`); - return new Response(err.message); + }catch(error){ + throw redirect( + errorMessage('Error deleting asset.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; \ No newline at end of file diff --git a/src/routes/api/server/careplan/careplans/+server.ts b/src/routes/api/server/careplan/careplans/+server.ts index 78c64fc4..c3d95522 100644 --- a/src/routes/api/server/careplan/careplans/+server.ts +++ b/src/routes/api/server/careplan/careplans/+server.ts @@ -1,5 +1,7 @@ +import { errorMessage, successMessage } from "$lib/utils/message.utils"; import { deleteCareplan } from "$routes/api/services/careplan/careplans"; import type { RequestEvent } from "@sveltejs/kit"; +import { redirect } from "sveltekit-flash-message/server"; ////////////////////////////////////////////////////////////// @@ -8,15 +10,21 @@ export const DELETE = async (event: RequestEvent) => { console.log("request----------",request); const data = await request.json(); console.log("data",data ); - try { - console.log('Inside careplan server endpoints'); - const response = await deleteCareplan( + console.log('Inside careplan server endpoints'); + let response; + try{ + response = await deleteCareplan( data.sessionId, data.careplanId ); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting careplan: ${err.message}`); - return new Response(err.message); - } + }catch(error){ + throw redirect( + errorMessage('Error deleting careplan.'), + event + ); + } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/cohorts/+server.ts b/src/routes/api/server/cohorts/+server.ts index 1d3dbc37..ea3a2c68 100644 --- a/src/routes/api/server/cohorts/+server.ts +++ b/src/routes/api/server/cohorts/+server.ts @@ -1,18 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteCohort } from '$routes/api/services/cohorts'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside cohort server endpoints'); - const response = await deleteCohort(data.sessionId, data.cohortId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting cohort: ${err.message}`); - return new Response(err.message); + console.log('Inside cohort server endpoints'); + let response; + try{ + response = await deleteCohort(data.sessionId, data.cohortId); + }catch(error){ + throw redirect( + errorMessage('Error deleting cohort.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/courses/+server.ts b/src/routes/api/server/courses/+server.ts index 4a7e502c..e8d17792 100644 --- a/src/routes/api/server/courses/+server.ts +++ b/src/routes/api/server/courses/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteCourse } from '../../services/courses'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside course server endpoints'); - const response = await deleteCourse(data.sessionId, data.courseId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting course: ${err.message}`); - return new Response(err.message); + console.log('Inside course server endpoints'); + let response; + try{ + response = await deleteCourse(data.sessionId, data.courseId); + }catch(error){ + throw redirect( + errorMessage('Error deleting course.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/custom-query/delete/+server.ts b/src/routes/api/server/custom-query/delete/+server.ts index d76c2219..59c27aa8 100644 --- a/src/routes/api/server/custom-query/delete/+server.ts +++ b/src/routes/api/server/custom-query/delete/+server.ts @@ -1,18 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteQuery } from '$routes/api/services/custom.query'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside query server endpoints'); - const response = await deleteQuery(data.sessionId, data.queryId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting query: ${err.message}`); - return new Response(err.message); + console.log('Inside query server endpoints'); + let response; + try{ + response = await deleteQuery(data.sessionId, data.queryId); + }catch(error){ + throw redirect( + errorMessage('Error deleting query.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/drugs/+server.ts b/src/routes/api/server/drugs/+server.ts index b7d29c71..035c7a8c 100644 --- a/src/routes/api/server/drugs/+server.ts +++ b/src/routes/api/server/drugs/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteDrug } from '../../services/drugs'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside drug server endpoints'); - const response = await deleteDrug(data.sessionId, data.drugId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting drug: ${err.message}`); - return new Response(err.message); + console.log('Inside drug server endpoints'); + let response; + try{ + response = await deleteDrug(data.sessionId, data.drugId); + }catch(error){ + throw redirect( + errorMessage('Error deleting drug.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/gamification/badge-categories/+server.ts b/src/routes/api/server/gamification/badge-categories/+server.ts index 54c2e4c9..ae430070 100644 --- a/src/routes/api/server/gamification/badge-categories/+server.ts +++ b/src/routes/api/server/gamification/badge-categories/+server.ts @@ -1,17 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteBadgeCategory } from '$routes/api/services/gamification/badge.category'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside badge category server endpoints'); - const response = await deleteBadgeCategory(data.sessionId, data.badgeCategoryId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting badge category: ${err.message}`); - return new Response(err.message); + console.log('Inside badge category server endpoints'); + let response; + try{ + response = await deleteBadgeCategory(data.sessionId, data.badgeCategoryId); + }catch(error){ + throw redirect( + errorMessage('Error deleting badge category.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; \ No newline at end of file diff --git a/src/routes/api/server/gamification/badges/+server.ts b/src/routes/api/server/gamification/badges/+server.ts index 273a4a29..67b5c5ae 100644 --- a/src/routes/api/server/gamification/badges/+server.ts +++ b/src/routes/api/server/gamification/badges/+server.ts @@ -1,17 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteBadge } from '$routes/api/services/gamification/badge'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside badge server endpoints'); - const response = await deleteBadge(data.sessionId, data.badgeId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting badge: ${err.message}`); - return new Response(err.message); + console.log('Inside badge server endpoints'); + let response; + try{ + response = await deleteBadge(data.sessionId, data.badgeId); + }catch(error){ + throw redirect( + errorMessage('Error deleting badge.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/gamification/event-types/+server.ts b/src/routes/api/server/gamification/event-types/+server.ts index b5316fdf..673eb0e6 100644 --- a/src/routes/api/server/gamification/event-types/+server.ts +++ b/src/routes/api/server/gamification/event-types/+server.ts @@ -1,17 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteEventType } from '$routes/api/services/gamification/event.types'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside event type server endpoints'); - const response = await deleteEventType(data.sessionId, data.eventTypeId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting event type: ${err.message}`); - return new Response(err.message); + console.log('Inside event type server endpoints'); + let response; + try{ + response = await deleteEventType(data.sessionId, data.eventTypeId); + }catch(error){ + throw redirect( + errorMessage('Error deleting event type.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; \ No newline at end of file diff --git a/src/routes/api/server/gamification/schemas/+server.ts b/src/routes/api/server/gamification/schemas/+server.ts index b96fdd67..e6dc47ed 100644 --- a/src/routes/api/server/gamification/schemas/+server.ts +++ b/src/routes/api/server/gamification/schemas/+server.ts @@ -1,17 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteSchema } from '$routes/api/services/gamification/schema'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside schema server endpoints'); - const response = await deleteSchema(data.sessionId, data.schemaId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting schema: ${err.message}`); - return new Response(err.message); + console.log('Inside schema server endpoints'); + let response; + try{ + response = await deleteSchema(data.sessionId, data.schemaId); + }catch(error){ + throw redirect( + errorMessage('Error deleting schema.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; \ No newline at end of file diff --git a/src/routes/api/server/goals/+server.ts b/src/routes/api/server/goals/+server.ts index 510d96c8..d0205e48 100644 --- a/src/routes/api/server/goals/+server.ts +++ b/src/routes/api/server/goals/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteGoal } from '../../services/goals'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside goal server endpoints'); - const response = await deleteGoal(data.sessionId, data.goalId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting goal: ${err.message}`); - return new Response(err.message); + console.log('Inside goal server endpoints'); + let response; + try{ + response =await deleteGoal(data.sessionId, data.goalId); + }catch(error){ + throw redirect( + errorMessage('Error deleting goal.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/health-systems/+server.ts b/src/routes/api/server/health-systems/+server.ts index 5aa74cdd..5e186eb8 100644 --- a/src/routes/api/server/health-systems/+server.ts +++ b/src/routes/api/server/health-systems/+server.ts @@ -1,5 +1,7 @@ +import { errorMessage, successMessage } from "$lib/utils/message.utils"; import { deleteHealthSystem } from "$routes/api/services/health.systems"; import type { RequestEvent } from "@sveltejs/kit"; +import { redirect } from "sveltekit-flash-message/server"; ////////////////////////////////////////////////////////////// @@ -7,15 +9,21 @@ export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); console.log("data",data ); - try { - console.log('Inside health system server endpoints'); - const response = await deleteHealthSystem( + console.log('Inside health system server endpoints'); + let response; + try{ + response = await deleteHealthSystem( data.sessionId, data.healthSystemId ); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting health system: ${err.message}`); - return new Response(err.message); + }catch(error){ + throw redirect( + errorMessage('Error deleting health system.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/hospitals/+server.ts b/src/routes/api/server/hospitals/+server.ts index ae4bc359..89e6142c 100644 --- a/src/routes/api/server/hospitals/+server.ts +++ b/src/routes/api/server/hospitals/+server.ts @@ -1,5 +1,7 @@ +import { errorMessage, successMessage } from "$lib/utils/message.utils"; import { deleteHospital } from "$routes/api/services/hospitals"; import type { RequestEvent } from "@sveltejs/kit"; +import { redirect } from "sveltekit-flash-message/server"; ////////////////////////////////////////////////////////////// @@ -8,15 +10,21 @@ export const DELETE = async (event: RequestEvent) => { // console.log("request----------",request); const data = await request.json(); console.log("data",data ); - try { - console.log('Inside hospital server endpoints'); - const response = await deleteHospital( + console.log('Inside hospital server endpoints'); + let response; + try{ + response = await deleteHospital( data.sessionId, data.hospitalId ); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting hospital: ${err.message}`); - return new Response(err.message); + }catch(error){ + throw redirect( + errorMessage('Error deleting hospital.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/knowledge-nuggets/+server.ts b/src/routes/api/server/knowledge-nuggets/+server.ts index b7c6909f..31b4de00 100644 --- a/src/routes/api/server/knowledge-nuggets/+server.ts +++ b/src/routes/api/server/knowledge-nuggets/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteKnowledgeNugget } from '../../services/knowledge-nuggets'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside knowledge nugget server endpoints'); - const response = await deleteKnowledgeNugget(data.sessionId, data.knowledgeNuggetId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting knowledge nugget: ${err.message}`); - return new Response(err.message); + console.log('Inside knowledge nugget server endpoints'); + let response; + try{ + response = await deleteKnowledgeNugget(data.sessionId, data.knowledgeNuggetId); + }catch(error){ + throw redirect( + errorMessage('Error deleting knowledge nugget.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/lab-record-types/+server.ts b/src/routes/api/server/lab-record-types/+server.ts index 6f69a71e..57567770 100644 --- a/src/routes/api/server/lab-record-types/+server.ts +++ b/src/routes/api/server/lab-record-types/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteLabRecordType } from '../../services/lab-record-types'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside lab record type server endpoints'); - const response = await deleteLabRecordType(data.sessionId, data.labRecordTypeId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting lab record type: ${err.message}`); - return new Response(err.message); + console.log('Inside lab record type server endpoints'); + let response; + try{ + response = await deleteLabRecordType(data.sessionId, data.labRecordTypeId); + }catch(error){ + throw redirect( + errorMessage('Error deleting lab record type.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/learning-journeys/+server.ts b/src/routes/api/server/learning-journeys/+server.ts index 8c7867c6..a310d9dd 100644 --- a/src/routes/api/server/learning-journeys/+server.ts +++ b/src/routes/api/server/learning-journeys/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteLearningJourney } from '../../services/learning-journeys'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside learning journey server endpoints'); - const response = await deleteLearningJourney(data.sessionId, data.symptomId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting learning journey: ${err.message}`); - return new Response(err.message); + console.log('Inside learning journey server endpoints'); + let response; + try{ + response = await deleteLearningJourney(data.sessionId, data.symptomId); + }catch(error){ + throw redirect( + errorMessage('Error deleting learning journey.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/newsfeeds/+server.ts b/src/routes/api/server/newsfeeds/+server.ts index 51237ab3..0250ba95 100644 --- a/src/routes/api/server/newsfeeds/+server.ts +++ b/src/routes/api/server/newsfeeds/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteNewsfeed } from '../../services/newsfeeds'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside newsfeed server endpoints'); - const response = await deleteNewsfeed(data.sessionId, data.newsfeedId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting newsfeed: ${err.message}`); - return new Response(err.message); + console.log('Inside newsfeed server endpoints'); + let response; + try{ + response = await deleteNewsfeed(data.sessionId, data.newsfeedId); + }catch(error){ + throw redirect( + errorMessage('Error deleting newsfeed.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/notices/+server.ts b/src/routes/api/server/notices/+server.ts index b90cbbd5..b23b46c8 100644 --- a/src/routes/api/server/notices/+server.ts +++ b/src/routes/api/server/notices/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteNotice } from '../../services/notices'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside notice server endpoints'); - const response = await deleteNotice(data.sessionId, data.noticeId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting notice: ${err.message}`); - return new Response(err.message); + console.log('Inside notice server endpoints'); + let response; + try{ + response = await deleteNotice(data.sessionId, data.noticeId); + }catch(error){ + throw redirect( + errorMessage('Error deleting notice.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/notifications/+server.ts b/src/routes/api/server/notifications/+server.ts index 153a3882..076addff 100644 --- a/src/routes/api/server/notifications/+server.ts +++ b/src/routes/api/server/notifications/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteNotification } from '../../services/notifications'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside notification server endpoints'); - const response = await deleteNotification(data.sessionId, data.notificationId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting notification: ${err.message}`); - return new Response(err.message); + console.log('Inside notification server endpoints'); + let response; + try{ + response = await deleteNotification(data.sessionId, data.notificationId); + }catch(error){ + throw redirect( + errorMessage('Error deleting notification.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/organizations/delete/+server.ts b/src/routes/api/server/organizations/delete/+server.ts index 939c0cdc..8fc7a68b 100644 --- a/src/routes/api/server/organizations/delete/+server.ts +++ b/src/routes/api/server/organizations/delete/+server.ts @@ -1,17 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteOrganization } from '../../../services/organizations'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - try { - console.log('Inside Organizations server endpoints'); - const response = await deleteOrganization(data.sessionId, data.organizationId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting api-client: ${err.message}`); - return new Response(err.message); + console.log('Inside Organizations server endpoints'); + let response; + try{ + response = await deleteOrganization(data.sessionId, data.organizationId); + }catch(error){ + throw redirect( + errorMessage('Error deleting api-client.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/person-role-types/+server.ts b/src/routes/api/server/person-role-types/+server.ts index 4c0e33d5..54b131e5 100644 --- a/src/routes/api/server/person-role-types/+server.ts +++ b/src/routes/api/server/person-role-types/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deletePersonRoleType } from '../../services/person-role-types'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside person role type server endpoints'); - const response = await deletePersonRoleType(data.sessionId, data.personRoleTypeId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting person role type: ${err.message}`); - return new Response(err.message); + console.log('Inside person role type server endpoints'); + let response; + try{ + response = await deletePersonRoleType(data.sessionId, data.personRoleTypeId); + }catch(error){ + throw redirect( + errorMessage('Error deleting person role type.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/priorities/+server.ts b/src/routes/api/server/priorities/+server.ts index 2dde49ce..41f28cb3 100644 --- a/src/routes/api/server/priorities/+server.ts +++ b/src/routes/api/server/priorities/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deletePriority } from '../../services/priorities'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside priority server endpoints'); - const response = await deletePriority(data.sessionId, data.priorityId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting priority: ${err.message}`); - return new Response(err.message); + console.log('Inside priority server endpoints'); + let response; + try{ + response = await deletePriority(data.sessionId, data.priorityId); + }catch(error){ + throw redirect( + errorMessage('Error deleting priority.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/symptoms/+server.ts b/src/routes/api/server/symptoms/+server.ts index dd40da4d..8000d7a7 100644 --- a/src/routes/api/server/symptoms/+server.ts +++ b/src/routes/api/server/symptoms/+server.ts @@ -1,18 +1,25 @@ import type { RequestEvent } from '@sveltejs/kit'; import { deleteSymptom } from '../../services/symptoms'; +import { errorMessage, successMessage } from '$lib/utils/message.utils'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside symptom server endpoints'); - const response = await deleteSymptom(data.sessionId, data.symptomId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting symptom: ${err.message}`); - return new Response(err.message); + console.log('Inside symptom server endpoints'); + let response; + try{ + response = await deleteSymptom(data.sessionId, data.symptomId); + }catch(error){ + throw redirect( + errorMessage('Error deleting symptom.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/api/server/tenants/+server.ts b/src/routes/api/server/tenants/+server.ts index ceb5e8d3..9007660a 100644 --- a/src/routes/api/server/tenants/+server.ts +++ b/src/routes/api/server/tenants/+server.ts @@ -1,18 +1,25 @@ +import { errorMessage, successMessage } from '$lib/utils/message.utils'; import { deleteTenant } from '$routes/api/services/tenants'; import type { RequestEvent } from '@sveltejs/kit'; +import { redirect } from 'sveltekit-flash-message/server'; ////////////////////////////////////////////////////////////// export const DELETE = async (event: RequestEvent) => { const request = event.request; const data = await request.json(); - - try { - console.log('Inside tenant server endpoints'); - const response = await deleteTenant(data.sessionId, data.tenantId); - return new Response(response.message); - } catch (err) { - console.error(`Error deleting tenant: ${err.message}`); - return new Response(err.message); + console.log('Inside tenant server endpoints'); + let response; + try{ + response = await deleteTenant(data.sessionId, data.tenantId); + }catch(error){ + throw redirect( + errorMessage('Error deleting tenant.'), + event + ); } + throw redirect( + successMessage(response.Message), + event + ); }; diff --git a/src/routes/users/[userId]/api-clients/+page.svelte b/src/routes/users/[userId]/api-clients/+page.svelte index eab4eac5..a05a5e30 100644 --- a/src/routes/users/[userId]/api-clients/+page.svelte +++ b/src/routes/users/[userId]/api-clients/+page.svelte @@ -96,7 +96,7 @@ sortBy = columnName; } - const handleApiClientDelete = async (e, id) => { + const handleApiClientDelete = async (id) => { const clientId = id; await Delete({ @@ -183,7 +183,6 @@ confirmTitle="Delete" cancelTitle="Cancel" let:confirm={confirmThis} - on:delete={(e) => handleApiClientDelete(e, row.id)} >