From d6a6c2872aaaf9114989329785154df6859850a0 Mon Sep 17 00:00:00 2001 From: TR Tajim Date: Tue, 27 Oct 2026 19:08:51 +0600 Subject: [PATCH 1/3] fix: resolve chapter dropdown in notes & ask modal, update resource request validation --- app/Http/Requests/Resource/UpdateResourceRequest.php | 3 ++- resources/js/components/forum/AskQuestionModal.vue | 3 ++- resources/js/pages/Notes/Index.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/Resource/UpdateResourceRequest.php b/app/Http/Requests/Resource/UpdateResourceRequest.php index bb3486af..02b80cd1 100644 --- a/app/Http/Requests/Resource/UpdateResourceRequest.php +++ b/app/Http/Requests/Resource/UpdateResourceRequest.php @@ -15,7 +15,8 @@ public function rules(): array { return [ 'subject_id' => ['sometimes', 'nullable', 'integer', 'exists:subjects,id'], - 'node_id' => ['sometimes', 'nullable', 'integer', 'exists:nodes,id'], + 'chapter_id' => ['sometimes', 'nullable', 'integer', 'exists:chapters,id'], + 'node_id' => ['sometimes', 'nullable', 'integer', 'exists:chapters,id'], 'title' => ['required', 'string', 'max:255'], 'description' => ['nullable', 'string'], 'resource_type' => ['required', 'string', 'in:note,lecture_sheet,practical,marked_book,other,video'], diff --git a/resources/js/components/forum/AskQuestionModal.vue b/resources/js/components/forum/AskQuestionModal.vue index e928704d..7eeb8a03 100644 --- a/resources/js/components/forum/AskQuestionModal.vue +++ b/resources/js/components/forum/AskQuestionModal.vue @@ -18,6 +18,7 @@ interface Subject { course: 'hsc' | 'ssc'; slug: string; nodes?: NodeItem[]; + chapters?: NodeItem[]; } const props = withDefaults( @@ -76,7 +77,7 @@ const filteredNodes = computed(() => { (s) => s.id === Number(form.subject_id), ); - return subj?.nodes || []; + return subj?.chapters || subj?.nodes || []; }); watch( diff --git a/resources/js/pages/Notes/Index.vue b/resources/js/pages/Notes/Index.vue index 8a0b0c49..e2b58caf 100644 --- a/resources/js/pages/Notes/Index.vue +++ b/resources/js/pages/Notes/Index.vue @@ -37,6 +37,7 @@ interface SubjectItem { slug: string; group?: string; nodes?: NodeItem[]; + chapters?: NodeItem[]; } interface ResourceItem { @@ -206,7 +207,7 @@ const availableChapters = computed(() => { const subj = props.subjects.find((s) => s.id === selectedSubjectId.value); - return subj?.nodes || []; + return subj?.chapters || subj?.nodes || []; }); const activeFiltersCount = computed(() => { From 7648cd2ac250525ba2ae695e4226d1833a411861 Mon Sep 17 00:00:00 2001 From: TR Tajim Date: Tue, 27 Oct 2026 19:12:39 +0600 Subject: [PATCH 2/3] refactor(resources): unify node_id to chapter_id across form modal and requests --- app/Http/Controllers/ResourceController.php | 9 +++------ app/Http/Requests/Resource/StoreResourceRequest.php | 1 - app/Http/Requests/Resource/UpdateResourceRequest.php | 1 - resources/js/components/resources/ResourceFormModal.vue | 5 +++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php index d5d6d09e..b799bf46 100644 --- a/app/Http/Controllers/ResourceController.php +++ b/app/Http/Controllers/ResourceController.php @@ -332,9 +332,7 @@ public function store(StoreResourceRequest $request) $isModerator = $request->user()->can('moderate resources'); $status = $isModerator ? 'approved' : 'pending'; - $chapterId = ! empty($validated['chapter_id']) - ? (int) $validated['chapter_id'] - : (! empty($validated['node_id']) ? (int) $validated['node_id'] : null); + $chapterId = ! empty($validated['chapter_id']) ? (int) $validated['chapter_id'] : null; $subjectId = $chapterId ? (int) (Chapter::where('id', $chapterId)->value('subject_id') ?? $validated['subject_id']) : (int) $validated['subject_id']; @@ -381,9 +379,8 @@ public function update(UpdateResourceRequest $request, Resource $resource) 'items' => $validated['items'], ]; - $inputChapterId = $validated['chapter_id'] ?? $validated['node_id'] ?? null; - if (array_key_exists('chapter_id', $validated) || array_key_exists('node_id', $validated)) { - $chapterId = ! empty($inputChapterId) ? (int) $inputChapterId : null; + if (array_key_exists('chapter_id', $validated)) { + $chapterId = ! empty($validated['chapter_id']) ? (int) $validated['chapter_id'] : null; $updateData['chapter_id'] = $chapterId; if ($chapterId) { diff --git a/app/Http/Requests/Resource/StoreResourceRequest.php b/app/Http/Requests/Resource/StoreResourceRequest.php index 698e8cad..ee83f376 100644 --- a/app/Http/Requests/Resource/StoreResourceRequest.php +++ b/app/Http/Requests/Resource/StoreResourceRequest.php @@ -16,7 +16,6 @@ public function rules(): array return [ 'subject_id' => ['required', 'integer', 'exists:subjects,id'], 'chapter_id' => ['nullable', 'integer', 'exists:chapters,id'], - 'node_id' => ['nullable', 'integer', 'exists:chapters,id'], 'resource_type' => ['required', 'string', 'in:note,lecture_sheet,practical,marked_book,other,video'], 'title' => ['required', 'string', 'max:255'], 'description' => ['nullable', 'string'], diff --git a/app/Http/Requests/Resource/UpdateResourceRequest.php b/app/Http/Requests/Resource/UpdateResourceRequest.php index 02b80cd1..83de7e5d 100644 --- a/app/Http/Requests/Resource/UpdateResourceRequest.php +++ b/app/Http/Requests/Resource/UpdateResourceRequest.php @@ -16,7 +16,6 @@ public function rules(): array return [ 'subject_id' => ['sometimes', 'nullable', 'integer', 'exists:subjects,id'], 'chapter_id' => ['sometimes', 'nullable', 'integer', 'exists:chapters,id'], - 'node_id' => ['sometimes', 'nullable', 'integer', 'exists:chapters,id'], 'title' => ['required', 'string', 'max:255'], 'description' => ['nullable', 'string'], 'resource_type' => ['required', 'string', 'in:note,lecture_sheet,practical,marked_book,other,video'], diff --git a/resources/js/components/resources/ResourceFormModal.vue b/resources/js/components/resources/ResourceFormModal.vue index 843d1b92..8af2718f 100644 --- a/resources/js/components/resources/ResourceFormModal.vue +++ b/resources/js/components/resources/ResourceFormModal.vue @@ -47,6 +47,7 @@ interface SubjectItem { interface ResourceData { id: number; + chapter_id?: number | null; node_id?: number | null; subject_id?: number | null; user_id?: number | null; @@ -350,7 +351,7 @@ const initForm = () => { props.subject?.id || props.node?.subject_id || null; - selectedNodeId.value = props.resource.node_id || props.node?.id || null; + selectedNodeId.value = props.resource.chapter_id || props.resource.node_id || props.node?.id || null; } else { form.value = { title: '', @@ -832,7 +833,7 @@ const handleSubmit = async () => { description: form.value.description.trim() || null, items: itemsPayload, subject_id: selectedSubjectId.value, - node_id: selectedNodeId.value || null, + chapter_id: selectedNodeId.value || null, }; const errorFallback = isEditing.value From b5b2760be4913ddb16872530b1d0ec39aa9176ec Mon Sep 17 00:00:00 2001 From: TR Tajim Date: Tue, 27 Oct 2026 19:18:28 +0600 Subject: [PATCH 3/3] style: format ResourceFormModal with prettier --- resources/js/components/resources/ResourceFormModal.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/js/components/resources/ResourceFormModal.vue b/resources/js/components/resources/ResourceFormModal.vue index 8af2718f..500bc15a 100644 --- a/resources/js/components/resources/ResourceFormModal.vue +++ b/resources/js/components/resources/ResourceFormModal.vue @@ -351,7 +351,11 @@ const initForm = () => { props.subject?.id || props.node?.subject_id || null; - selectedNodeId.value = props.resource.chapter_id || props.resource.node_id || props.node?.id || null; + selectedNodeId.value = + props.resource.chapter_id || + props.resource.node_id || + props.node?.id || + null; } else { form.value = { title: '',