From a3eb6589be159bb36f4f291d582602412677f3d9 Mon Sep 17 00:00:00 2001
From: alexdbondoc17 <alexdbondoc17@gmail.com>
Date: Thu, 24 Feb 2022 11:56:08 +0000
Subject: [PATCH 1/2] Fix `data-action` for `doctrines` offcanvas

---
 .../doctrines_offcanvas_accordion_component.html.erb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb b/app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb
index 89905da..4c3d978 100644
--- a/app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb
+++ b/app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb
@@ -4,7 +4,7 @@
       <% if search_result["has_children?"].present? %>
         <div class="accordion-button collapsed m-0 p-0 sub-label<%= search_result["heirarchy_level"] + 1 %>" data-bs-toggle="collapse" data-bs-target="#<%= children_accordion_id %>" 
             data-controller="subjects" data-subject-parent-id="<%= search_result["id"] %>" data-accordion-target="#<%= accordion_body_id %>" 
-            data-action="click->subjects#loadSubjectsOffcanvasAccordion"> 
+            data-action="click->subjects#loadDoctrinesOffcanvasAccordion"> 
           <%= link_to search_result["name"], index_url, class: "accordion-link text-decoration-none text-dark d-block sub#{search_result["heirarchy_level"] + 1} clickable-link" %>
         </div>
       <% else %>

From 0c54ce628e2f21375b7dec8b2c75eecb2f5c5e49 Mon Sep 17 00:00:00 2001
From: alexdbondoc17 <alexdbondoc17@gmail.com>
Date: Thu, 24 Feb 2022 11:56:45 +0000
Subject: [PATCH 2/2] Fix issue for `subjects#form`

---
 app/components/subject_index_form_component.rb              | 4 +++-
 .../subject_index_form_component.html.erb                   | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/components/subject_index_form_component.rb b/app/components/subject_index_form_component.rb
index e4a2333..121ae1c 100644
--- a/app/components/subject_index_form_component.rb
+++ b/app/components/subject_index_form_component.rb
@@ -4,10 +4,12 @@ class SubjectIndexFormComponent < BaseComponent
 	def initialize(current_user:, subject_index:, opts:)
 		@subject_index = subject_index
 		@opts = opts
-		@parent_id = @opts[:parent_id]
+		@parent_id = opts[:parent_id]
 	end
 
 	def parent
+		return if parent_id.blank?
+
 		Cdao::Subject.find(parent_id)
 	end
 
diff --git a/app/components/subject_index_form_component/subject_index_form_component.html.erb b/app/components/subject_index_form_component/subject_index_form_component.html.erb
index 5ded64e..10ce2a4 100644
--- a/app/components/subject_index_form_component/subject_index_form_component.html.erb
+++ b/app/components/subject_index_form_component/subject_index_form_component.html.erb
@@ -11,8 +11,10 @@
 		<div cass="row">
 			<div class="col-sm-12">
 				<strong> <%= label_tag :subjects %> </strong>
-				<select class="form-control subjects-selectize ps-0 pe-0" name="parent_id" id="parent_id" value="<%= parent_id %>">
-					<option value="<%= parent_id %>" selected="selected"> <%= parent.name %> </option>
+				<select class="form-control subjects-selectize ps-0 pe-0" name="parent_id" id="parent_id">
+					<% if parent_id.present? %>
+						<option value="<%= parent_id %>" selected="selected"> <%= parent.name %> </option>
+					<% end %>
 				</select>
 			</div>
 		</div>