From 7948c9036faa0276768275529ec3b588334e6c52 Mon Sep 17 00:00:00 2001 From: alexdbondoc17 Date: Wed, 2 Feb 2022 03:04:09 +0000 Subject: [PATCH] Implement `stimulus_reflex` --- app/channels/application_cable/connection.rb | 14 ++++ ...tation_marks_modal_form_component.html.erb | 6 +- app/components/desicions_index_component.rb | 9 +++ .../doctrine_modal_form_component.rb | 5 +- .../doctrine_modal_form_component.html.erb | 4 +- .../document_doctrine_show_component.rb | 7 +- .../document_doctrine_show_component.html.erb | 69 ++++++++++-------- .../document_index_table_body_component.rb | 31 ++++++++ ...cument_index_table_body_component.html.erb | 5 ++ .../document_index_table_component.rb | 4 + .../document_index_table_component.html.erb | 57 +-------------- .../sidenav_component.html.erb | 20 ++++- ...bjects_sidenav_sub_menu_component.html.erb | 18 ++--- .../concerns/jurisprudence_search.rb | 4 +- app/controllers/documents_controller.rb | 1 + app/controllers/subject_indexes_controller.rb | 11 ++- .../controllers/application_controller.js | 66 +++++++++++++++++ .../controllers/document_controller.js | 17 +++++ .../controllers/example_controller.js | 73 +++++++++++++++++++ .../controllers/hello_controller.js | 18 +++++ app/javascript/controllers/index.js | 14 ++++ .../controllers/select2_controller.js | 11 +++ .../controllers/subjects_controller.js | 10 +++ app/javascript/packs/application.js | 4 + app/models/cdao/subject.rb | 1 + app/reflexes/application_reflex.rb | 12 +++ app/reflexes/document_reflex.rb | 12 +++ app/reflexes/example_reflex.rb | 35 +++++++++ app/reflexes/subjects_reflex.rb | 7 ++ app/views/document/doctrines/show.html.erb | 2 +- app/views/documents/show.html.erb | 2 +- app/views/layouts/application.html.erb | 1 + config/routes.rb | 5 +- package.json | 2 + yarn.lock | 12 +++ 35 files changed, 457 insertions(+), 112 deletions(-) create mode 100644 app/components/desicions_index_component.rb create mode 100644 app/components/document_index_table_body_component.rb create mode 100644 app/components/document_index_table_body_component/document_index_table_body_component.html.erb create mode 100644 app/javascript/controllers/application_controller.js create mode 100644 app/javascript/controllers/document_controller.js create mode 100644 app/javascript/controllers/example_controller.js create mode 100644 app/javascript/controllers/hello_controller.js create mode 100644 app/javascript/controllers/index.js create mode 100644 app/javascript/controllers/select2_controller.js create mode 100644 app/javascript/controllers/subjects_controller.js create mode 100644 app/reflexes/application_reflex.rb create mode 100644 app/reflexes/document_reflex.rb create mode 100644 app/reflexes/example_reflex.rb create mode 100644 app/reflexes/subjects_reflex.rb diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb index 0ff5442..f188f55 100644 --- a/app/channels/application_cable/connection.rb +++ b/app/channels/application_cable/connection.rb @@ -1,4 +1,18 @@ module ApplicationCable class Connection < ActionCable::Connection::Base + identified_by :current_user + + def connect + self.current_user = find_verified_user + end + + private + def find_verified_user + if verified_user = User.find_by(id: cookies.encrypted[:user_id]) + verified_user + else + reject_unauthorized_connection + end + end end end diff --git a/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb b/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb index 32f9337..f045b98 100644 --- a/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb +++ b/app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb @@ -8,10 +8,10 @@
-
+
<%= label_tag :annotation_marks %> <%= hidden_field_tag :document_id, opts[:document_id] %> - <%= select_tag "annomark_ids[]", options_from_collection_for_select(Annomark.all, :id, :name, annotation.annomark_ids), class: "form-select i-chosen", multiple: true, prompt: "Please select" %> + <%= select_tag "annomark_ids[]", options_from_collection_for_select(Annomark.all, :id, :name, annotation.annomark_ids), class: "form-select annomark-ids-select2", multiple: true, prompt: "Please select" %>
@@ -31,7 +31,7 @@
<%= label_tag :editor_notes %> - <%= editor_notes %> + <%= annotation.editor_notes %>
diff --git a/app/components/desicions_index_component.rb b/app/components/desicions_index_component.rb new file mode 100644 index 0000000..d775b5e --- /dev/null +++ b/app/components/desicions_index_component.rb @@ -0,0 +1,9 @@ +class DesicionsIndexComponent < BaseComponent + with_collection_parameter :search_result + attr_reader :search_result, :opts + + def initialize(search_result:, current_user:, opts: {}) + @search_result = search_result + @opts = opts + end +end \ No newline at end of file diff --git a/app/components/doctrine_modal_form_component.rb b/app/components/doctrine_modal_form_component.rb index 86ca73c..bc70adc 100644 --- a/app/components/doctrine_modal_form_component.rb +++ b/app/components/doctrine_modal_form_component.rb @@ -1,8 +1,9 @@ class DoctrineModalFormComponent < BaseComponent - attr_reader :doctrine, :opts + attr_reader :doctrine, :subjects, :opts - def initialize(current_user:, doctrine:, opts:) + def initialize(current_user:, doctrine:, subjects:, opts:) @doctrine = doctrine + @subjects = subjects @opts = opts end diff --git a/app/components/doctrine_modal_form_component/doctrine_modal_form_component.html.erb b/app/components/doctrine_modal_form_component/doctrine_modal_form_component.html.erb index 7dd7477..daee096 100644 --- a/app/components/doctrine_modal_form_component/doctrine_modal_form_component.html.erb +++ b/app/components/doctrine_modal_form_component/doctrine_modal_form_component.html.erb @@ -9,9 +9,9 @@
-
+
<%= label_tag :subjects %> - <%= select_tag "subject_ids[]", options_from_collection_for_select(Cdao::Subject.all, :id, :lineage_name, doctrine.subject_ids), class: "form-select i-chosen", multiple: true, prompt: "Please select" %> + <%= select_tag "subject_ids[]", options_from_collection_for_select(subjects, :id, :lineage_name, doctrine.subject_ids), class: "form-select subject-ids-modal-select2", multiple: true, prompt: "Please select" %>
diff --git a/app/components/document_doctrine_show_component.rb b/app/components/document_doctrine_show_component.rb index 0d4de2b..8a45818 100644 --- a/app/components/document_doctrine_show_component.rb +++ b/app/components/document_doctrine_show_component.rb @@ -1,9 +1,10 @@ class DocumentDoctrineShowComponent < BaseComponent - attr_reader :current_user, :doctrine + attr_reader :current_user, :doctrine, :subjects - def initialize(current_user:, doctrine:, opts: {}) + def initialize(current_user:, doctrine:, subjects:, opts: {}) @doctrine = doctrine @current_user = current_user + @subjects = subjects end delegate :id, to: :doctrine @@ -23,6 +24,6 @@ class DocumentDoctrineShowComponent < BaseComponent end def annotation_form_url - doctrine_annotations_path(doctrine_id: id) + doctrine_annotations_path(doctrine_id: id,) end end \ No newline at end of file diff --git a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb index 22933d2..7a338df 100644 --- a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb +++ b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb @@ -1,22 +1,26 @@ -
-
- Doctrine Details - - - -
- -
+
+
-
- <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: doctrine, opts: { form_url: jurisprudence_doctrine_path(jurisprudence_id: document_id, id: doctrine.id), form_method: "PUT" })) %> +
+
Doctrine Details
+
+ +
+ Edit + Delete
- - <%= form_tag(doctrine_form_url, method: :patch) do %> -
+ +
+ <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: doctrine, subjects: subjects, opts: { form_url: jurisprudence_doctrine_path(jurisprudence_id: document_id, id: doctrine.id), form_method: "PUT" })) %> +
+
+ +
+ <%= form_tag(doctrine_form_url, method: :patch, local: true) do %> +
<%= label_tag :subjects %> - <%= select_tag "subject_ids[]", options_from_collection_for_select(Cdao::Subject.all, :id, :lineage_name, subject_ids), class: "form-select i-chosen", multiple: true, prompt: "Please select" %> + <%= select_tag "subjects_ids[]", options_from_collection_for_select(Cdao::Subject.all, :id, :lineage_name, subject_ids), class: "form-select subjects-select2", multiple: true, prompt: "Please select" %>
@@ -35,13 +39,12 @@
-
+
- <%= text_field_tag :q, nil, class: "form-control", placeholder: "Search GR Number" %> + <%= text_field_tag :q, nil, class: "form-control", placeholder: "Search GR Number", data: { target: "document.input" } %>
-
- <%= button_tag "search", class: "btn btn-primary" %> + <%= button_tag "Search", class: "btn btn-primary", data: { action: "click->document#search" } %>
@@ -54,9 +57,7 @@ - - <%= render(DocumentIndexTableComponent.with_collection(Cdao::Jurisprudence.first(5), current_user: current_user, opts: { is_case_lists: true, form_url: annotation_form_url, form_method: :post, document_id: document_id })) %> - +
@@ -66,19 +67,27 @@
<% doctrine.annotations.order(rank: :asc).each do |annotation| %>
-

- <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> - <%= raw [annotation.document.title, annotation.document.reference_number, annotation.document.docdate.strftime("%B %d, %Y"), annotation.phil_rep].join(', ').html_safe %> - - - -

+
+
+

+ <%= "#{annotation.annomarks.map { |annomark| "(#{annomark.code})" }.join(" ")}" %> + <%= raw [annotation.document.title, annotation.document.reference_number, annotation.document.docdate.strftime("%B %d, %Y"), annotation.phil_rep].join(', ').html_safe %> +

+
+ +
+ Edit + Delete +
+ +
+ <% if annotation.editor_notes.present? %> Editors Note: <%= annotation.editor_notes %> <% end %>
-
+
diff --git a/app/components/document_index_table_body_component.rb b/app/components/document_index_table_body_component.rb new file mode 100644 index 0000000..2215c0c --- /dev/null +++ b/app/components/document_index_table_body_component.rb @@ -0,0 +1,31 @@ +class DocumentIndexTableBodyComponent < BaseComponent + with_collection_parameter :search_result + attr_reader :search_result, :opts + + def initialize(search_result:, current_user:, opts: {}) + @search_result = search_result + @opts = opts + end + + def reference_number + search_result["reference_number"] + end + + def title + search_result["title"] + end + + def date_or_year + return search_result["docdate"].to_date.strftime("%m/%d/%Y") if search_result["docdate"].present? + + search_result["year"] + end + + def form_url + doctrine_annotations_path(doctrine_id: opts[:doctrine_id]) + end + + def render? + search_result.present? + end +end diff --git a/app/components/document_index_table_body_component/document_index_table_body_component.html.erb b/app/components/document_index_table_body_component/document_index_table_body_component.html.erb new file mode 100644 index 0000000..9b53ef9 --- /dev/null +++ b/app/components/document_index_table_body_component/document_index_table_body_component.html.erb @@ -0,0 +1,5 @@ + + <%= reference_number %> + <%= title %> + <%= date_or_year %> + diff --git a/app/components/document_index_table_component.rb b/app/components/document_index_table_component.rb index efaf596..8a50cd2 100644 --- a/app/components/document_index_table_component.rb +++ b/app/components/document_index_table_component.rb @@ -15,4 +15,8 @@ class DocumentIndexTableComponent < BaseComponent search_result.year end + + def doctrine_annotations_path(doctrine_id) + doctrine_annotations_path(doctrine_id: doctrine_id) + end end diff --git a/app/components/document_index_table_component/document_index_table_component.html.erb b/app/components/document_index_table_component/document_index_table_component.html.erb index d759463..15fa650 100644 --- a/app/components/document_index_table_component/document_index_table_component.html.erb +++ b/app/components/document_index_table_component/document_index_table_component.html.erb @@ -1,60 +1,5 @@ - + <%= reference_number %> <%= title %> <%= date_or_year %> - <% if opts[:is_case_lists].present? && opts[:form_url].present? && opts[:document_id].present? %> - - - - - - - - <% end %> diff --git a/app/components/sidenav_component/sidenav_component.html.erb b/app/components/sidenav_component/sidenav_component.html.erb index f70c7e2..0bab8f9 100644 --- a/app/components/sidenav_component/sidenav_component.html.erb +++ b/app/components/sidenav_component/sidenav_component.html.erb @@ -10,7 +10,25 @@
- <%= render(SubjectsSidenavSubMenuComponent.new(current_user: current_user, opts: { main_sub_menu: "mainSubjectIndexSubMenu", second_sub_menu: "secondSubjectIndexSubMenu", third_sub_menu: "thirdSubjectIndexSubMenu", fourth_sub_menu: "fourthSubjectIndexSubMenu", fifth_sub_menu: "fifthSubjectIndexSubMenu" })) %> +
+
+ <% Cdao::Subject.roots.each do |root| %> +
+
+
+ <% if root.children.present? %> + + <% else %> +
<%= link_to root.name, search_documensearch_subject_indexes_pathts_path(subject_ids: root.id), class: "accordion-link text-decoration-none text-dark" %>
+ <% end %> +
+
+
+ <% end %> +
+
diff --git a/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb b/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb index e9fc748..a5c862d 100644 --- a/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb +++ b/app/components/subjects_sidenav_sub_menu_component/subjects_sidenav_sub_menu_component.html.erb @@ -6,10 +6,10 @@
<% if root.children.present? %> <% else %> -
<%= link_to root.name, search_documents_path(subject_ids: root.id), class: "accordion-link text-decoration-none text-dark" %>
+
<%= link_to root.name, search_documents_path(subject_ids: root.id), class: "accordion-link text-decoration-none text-dark clickable-link" %>
<% end %>
@@ -22,10 +22,10 @@
<% if sub1.children.present? %> <% else %> -
<%= link_to sub1.name, search_documents_path(subject_ids: sub1.id), class: "accordion-link text-decoration-none text-dark" %>
+
<%= link_to sub1.name, search_documents_path(subject_ids: sub1.id), class: "accordion-link text-decoration-none text-dark clickable-link" %>
<% end %>
@@ -37,10 +37,10 @@
<% if sub2.children.present? %> <% else %> -
<%= link_to sub2.name, search_documents_path(subject_ids: sub2.id), class: "accordion-link text-decoration-none text-dark" %>
+
<%= link_to sub2.name, search_documents_path(subject_ids: sub2.id), class: "accordion-link text-decoration-none text-dark clickable-link" %>
<% end %> @@ -52,10 +52,10 @@
<% if sub3.children.present? %> <% else%> -
<%= link_to sub3.name, search_documents_path(subject_ids: sub3.id), class: "accordion-link text-decoration-none text-dark" %>
+
<%= link_to sub3.name, search_documents_path(subject_ids: sub3.id), class: "accordion-link text-decoration-none text-dark clickable-link" %>
<% end %> @@ -64,7 +64,7 @@ <% sub3.children.each do |sub4| %>
- <%= link_to sub4.name, doctrines_path(subject_ids: [sub4.id]), class: "accordion-link text-decoration-none text-dark" %> + <%= link_to sub4.name, doctrines_path(subject_ids: [sub4.id]), class: "accordion-link text-decoration-none text-dark clickable-link" %>
<% end if sub3.children.present? %> diff --git a/app/controllers/concerns/jurisprudence_search.rb b/app/controllers/concerns/jurisprudence_search.rb index 7f57ad6..8619cb9 100644 --- a/app/controllers/concerns/jurisprudence_search.rb +++ b/app/controllers/concerns/jurisprudence_search.rb @@ -1,7 +1,5 @@ module JurisprudenceSearch def jurisprudence_search(search_params) - attrs = %i[id reference_number title docdate ponente edited short_title year].freeze - fulltext_fields = %i[reference_number title short_title].freeze search = Cdao::Jurisprudence.search do @@ -11,6 +9,8 @@ module JurisprudenceSearch fulltext search_params[field], fields: [field] if search_params[field].present? end + with(:year, search_params[:year].to_i) if search_params[:year].present? + with(:subject_ids).any_of(search_params[:subject_ids].split(",").map(&:strip).map(&:to_i)) if search_params[:subject_ids].present? order_by :doc_date, :desc diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index eb61399..4c9978b 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -14,6 +14,7 @@ class DocumentsController < ApplicationController end def show + @subjects = Cdao::Subject.all @doctrines = @document.doctrines where = { enabled: true, state: "published" } diff --git a/app/controllers/subject_indexes_controller.rb b/app/controllers/subject_indexes_controller.rb index 4ef65c8..b30581c 100644 --- a/app/controllers/subject_indexes_controller.rb +++ b/app/controllers/subject_indexes_controller.rb @@ -11,6 +11,15 @@ class SubjectIndexesController < ApplicationController def show; end + def search + @search = search_subject(search_params) + @subjects = @search.results + + respond_to do |format| + format.html + end + end + def create respond_to do |format| if @subject_index.save @@ -73,6 +82,6 @@ class SubjectIndexesController < ApplicationController end def search_params - params.permit(:name, :parent_id, :state) + params.permit(:name, :parent_id, :state, doctrine_ids: []) end end diff --git a/app/javascript/controllers/application_controller.js b/app/javascript/controllers/application_controller.js new file mode 100644 index 0000000..2e6ce4c --- /dev/null +++ b/app/javascript/controllers/application_controller.js @@ -0,0 +1,66 @@ +import { Controller } from 'stimulus' +import StimulusReflex from 'stimulus_reflex' +import $ from 'jquery'; + +require("select2/dist/css/select2") +require("select2-bootstrap-theme/dist/select2-bootstrap") + +import Select2 from "select2" + +/* This is your ApplicationController. + * All StimulusReflex controllers should inherit from this class. + * + * Example: + * + * import ApplicationController from './application_controller' + * + * export default class extends ApplicationController { ... } + * + * Learn more at: https://docs.stimulusreflex.com + */ +export default class extends Controller { + connect () { + StimulusReflex.register(this) + } + + /* Application-wide lifecycle methods + * + * Use these methods to handle lifecycle concerns for the entire application. + * Using the lifecycle is optional, so feel free to delete these stubs if you don't need them. + * + * Arguments: + * + * element - the element that triggered the reflex + * may be different than the Stimulus controller's this.element + * + * reflex - the name of the reflex e.g. "Example#demo" + * + * error/noop - the error message (for reflexError), otherwise null + * + * reflexId - a UUID4 or developer-provided unique identifier for each Reflex + */ + + beforeReflex (element, reflex, noop, reflexId) { + // document.body.classList.add('wait') + } + + reflexSuccess (element, reflex, noop, reflexId) { + // show success message + } + + reflexError (element, reflex, error, reflexId) { + // show error message + } + + reflexHalted (element, reflex, error, reflexId) { + // handle aborted Reflex action + } + + afterReflex (element, reflex, noop, reflexId) { + // document.body.classList.remove('wait') + } + + finalizeReflex (element, reflex, noop, reflexId) { + // all operations have completed, animation etc is now safe + } +} diff --git a/app/javascript/controllers/document_controller.js b/app/javascript/controllers/document_controller.js new file mode 100644 index 0000000..b8b0fde --- /dev/null +++ b/app/javascript/controllers/document_controller.js @@ -0,0 +1,17 @@ +import { end } from '@popperjs/core' +import ApplicationController from './application_controller' +export default class extends ApplicationController { + static targets = ["input"] + connect () { + super.connect() + } + + search () { + const $this = this + $.get("/api/jurisprudences/", { q: this.inputTarget.value }, function (data, status) { + if (status === "success") { + $this.stimulate("DocumentReflex#render_index_table", data) + } + }); + } +} diff --git a/app/javascript/controllers/example_controller.js b/app/javascript/controllers/example_controller.js new file mode 100644 index 0000000..f5e826f --- /dev/null +++ b/app/javascript/controllers/example_controller.js @@ -0,0 +1,73 @@ +import ApplicationController from './application_controller' + +/* This is the custom StimulusReflex controller for the Example Reflex. + * Learn more at: https://docs.stimulusreflex.com + */ +export default class extends ApplicationController { + /* + * Regular Stimulus lifecycle methods + * Learn more at: https://stimulusjs.org/reference/lifecycle-callbacks + * + * If you intend to use this controller as a regular stimulus controller as well, + * make sure any Stimulus lifecycle methods overridden in ApplicationController call super. + * + * Important: + * By default, StimulusReflex overrides the -connect- method so make sure you + * call super if you intend to do anything else when this controller connects. + */ + + connect () { + super.connect() + // add your code here, if applicable + } + + /* Reflex specific lifecycle methods. + * + * For every method defined in your Reflex class, a matching set of lifecycle methods become available + * in this javascript controller. These are optional, so feel free to delete these stubs if you don't + * need them. + * + * Important: + * Make sure to add data-controller="example" to your markup alongside + * data-reflex="Example#dance" for the lifecycle methods to fire properly. + * + * Example: + * + * Dance! + * + * Arguments: + * + * element - the element that triggered the reflex + * may be different than the Stimulus controller's this.element + * + * reflex - the name of the reflex e.g. "Example#dance" + * + * error/noop - the error message (for reflexError), otherwise null + * + * reflexId - a UUID4 or developer-provided unique identifier for each Reflex + */ + + // Assuming you create a "Example#dance" action in your Reflex class + // you'll be able to use the following lifecycle methods: + + // beforeDance(element, reflex, noop, reflexId) { + // element.innerText = 'Putting dance shoes on...' + // } + + // danceSuccess(element, reflex, noop, reflexId) { + // element.innerText = '\nDanced like no one was watching! Was someone watching?' + // } + + // danceError(element, reflex, error, reflexId) { + // console.error('danceError', error); + // element.innerText = "\nCouldn\'t dance!" + // } + + // afterDance(element, reflex, noop, reflexId) { + // element.innerText = '\nWhatever that was, it\'s over now.' + // } + + // finalizeDance(element, reflex, noop, reflexId) { + // element.innerText = '\nNow, the cleanup can begin!' + // } +} diff --git a/app/javascript/controllers/hello_controller.js b/app/javascript/controllers/hello_controller.js new file mode 100644 index 0000000..28fdb13 --- /dev/null +++ b/app/javascript/controllers/hello_controller.js @@ -0,0 +1,18 @@ +// Visit The Stimulus Handbook for more details +// https://stimulusjs.org/handbook/introduction +// +// This example controller works with specially annotated HTML like: +// +//
+//

+//
+ +import { Controller } from "stimulus" + +export default class extends Controller { + static targets = [ "output" ] + + connect() { + this.outputTarget.textContent = 'Hello, Stimulus!' + } +} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js new file mode 100644 index 0000000..beb3a83 --- /dev/null +++ b/app/javascript/controllers/index.js @@ -0,0 +1,14 @@ +// Load all the controllers within this directory and all subdirectories. +// Controller files must be named *_controller.js. + +import { Application } from "stimulus" +import { definitionsFromContext } from "stimulus/webpack-helpers" +import StimulusReflex from 'stimulus_reflex' +import consumer from '../channels/consumer' +import controller from '../controllers/application_controller' + +const application = Application.start() +const context = require.context("controllers", true, /_controller\.js$/) +application.load(definitionsFromContext(context)) +StimulusReflex.initialize(application, { consumer, controller }) +StimulusReflex.debug = process.env.RAILS_ENV === 'development' diff --git a/app/javascript/controllers/select2_controller.js b/app/javascript/controllers/select2_controller.js new file mode 100644 index 0000000..21cf4c8 --- /dev/null +++ b/app/javascript/controllers/select2_controller.js @@ -0,0 +1,11 @@ +import ApplicationController from './application_controller' + +export default class extends ApplicationController { + connect() { + super.connect() + + $(".subjects-select2").select2({ tags: true, width: "100%" }) + $(".annomark-ids-select2").select2({ width: "100%", dropdownParent: $("#editAnnotation11") }) + $(".subject-ids-modal-select2").select2({ width: "100%", dropdownParent: $("#doctrineModal") }) + } +} diff --git a/app/javascript/controllers/subjects_controller.js b/app/javascript/controllers/subjects_controller.js new file mode 100644 index 0000000..a1de657 --- /dev/null +++ b/app/javascript/controllers/subjects_controller.js @@ -0,0 +1,10 @@ +import ApplicationController from './application_controller' +export default class extends ApplicationController { + connect () { + super.connect() + } + + load_roots() { + this.stimulate("SubjectsReflex#load_roots") + } +} diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 72edfd3..832affe 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -19,6 +19,7 @@ import "select2"; import "chosen-js"; import 'trix/dist/trix.css'; import 'trix/dist/trix.js'; +import "cable_ready"; window.jQuery = $; window.$ = $; @@ -49,3 +50,6 @@ $(document).ready(function () { } }) }); + +import "channels" +import "controllers" diff --git a/app/models/cdao/subject.rb b/app/models/cdao/subject.rb index d4d8354..da263b7 100644 --- a/app/models/cdao/subject.rb +++ b/app/models/cdao/subject.rb @@ -50,6 +50,7 @@ class Cdao::Subject < Cdao::Base searchable do integer :parent_id + integer :doctrine_ids, multiple: true text :name diff --git a/app/reflexes/application_reflex.rb b/app/reflexes/application_reflex.rb new file mode 100644 index 0000000..554cca0 --- /dev/null +++ b/app/reflexes/application_reflex.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class ApplicationReflex < StimulusReflex::Reflex + # Put application-wide Reflex behavior and callbacks in this file. + # + # Example: + # + # # If your ActionCable connection is: `identified_by :current_user` + # delegate :current_user, to: :connection + # + # Learn more at: https://docs.stimulusreflex.com/reflexes#reflex-classes +end diff --git a/app/reflexes/document_reflex.rb b/app/reflexes/document_reflex.rb new file mode 100644 index 0000000..2bcb288 --- /dev/null +++ b/app/reflexes/document_reflex.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class DocumentReflex < ApplicationReflex + include JurisprudenceSearch + + def render_index_table(results) + @results = results + morph "tbody#documentIndexTable", render(DocumentIndexTableBodyComponent.with_collection(@results, current_user: User.first, opts: { is_case_lists: true })) + # render(DocumentIndexTableBodyComponent.with_collection(@results, current_user: current_user, opts: { is_case_lists: true })) + # " 1 2 3 " + end +end diff --git a/app/reflexes/example_reflex.rb b/app/reflexes/example_reflex.rb new file mode 100644 index 0000000..76c0e1e --- /dev/null +++ b/app/reflexes/example_reflex.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +class ExampleReflex < ApplicationReflex + # Add Reflex methods in this file. + # + # All Reflex instances include CableReady::Broadcaster and expose the following properties: + # + # - connection - the ActionCable connection + # - channel - the ActionCable channel + # - request - an ActionDispatch::Request proxy for the socket connection + # - session - the ActionDispatch::Session store for the current visitor + # - flash - the ActionDispatch::Flash::FlashHash for the current request + # - url - the URL of the page that triggered the reflex + # - params - parameters from the element's closest form (if any) + # - element - a Hash like object that represents the HTML element that triggered the reflex + # - signed - use a signed Global ID to map dataset attribute to a model eg. element.signed[:foo] + # - unsigned - use an unsigned Global ID to map dataset attribute to a model eg. element.unsigned[:foo] + # - cable_ready - a special cable_ready that can broadcast to the current visitor (no brackets needed) + # - reflex_id - a UUIDv4 that uniquely identies each Reflex + # + # Example: + # + # before_reflex do + # # throw :abort # this will prevent the Reflex from continuing + # # learn more about callbacks at https://docs.stimulusreflex.com/lifecycle + # end + # + # def example(argument=true) + # # Your logic here... + # # Any declared instance variables will be made available to the Rails controller and view. + # end + # + # Learn more at: https://docs.stimulusreflex.com/reflexes#reflex-classes + +end diff --git a/app/reflexes/subjects_reflex.rb b/app/reflexes/subjects_reflex.rb new file mode 100644 index 0000000..58b54d0 --- /dev/null +++ b/app/reflexes/subjects_reflex.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class SubjectsReflex < ApplicationReflex + def load_roots + @roots = "Hello!!!" + end +end diff --git a/app/views/document/doctrines/show.html.erb b/app/views/document/doctrines/show.html.erb index 925ea13..5bc64fa 100644 --- a/app/views/document/doctrines/show.html.erb +++ b/app/views/document/doctrines/show.html.erb @@ -18,6 +18,6 @@
- <%= render(DocumentDoctrineShowComponent.new(current_user: current_user, doctrine: @doctrine)) %> + <%= render(DocumentDoctrineShowComponent.new(current_user: current_user, doctrine: @doctrine, subjects: @subjects)) %>
diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index dbb3fc3..7058286 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -44,7 +44,7 @@
- <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: @document.doctrines.new, opts: { form_url: jurisprudence_doctrines_path(jurisprudence_id: @document.id), form_method: :post })) %> + <%= render(DoctrineModalFormComponent.new(current_user: current_user, doctrine: @document.doctrines.new, subjects: @subjects, opts: { form_url: jurisprudence_doctrines_path(jurisprudence_id: @document.id), form_method: :post })) %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 70d66d3..d99eb13 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,6 +5,7 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> + <%= action_cable_meta_tag %> <%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/config/routes.rb b/config/routes.rb index 9e4e5c4..04f0a1d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,10 @@ Rails.application.routes.draw do end end resources :decisions, only: %i[index] - resources :subject_indexes + + resources :subject_indexes do + get :search, on: :collection + end namespace :api, defaults: { format: :json } do resources :jurisprudences, only: %i[index show] do diff --git a/package.json b/package.json index a681ebf..1505879 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@rails/ujs": "^6.0.0", "@rails/webpacker": "5.4.3", "bootstrap": "^5.1.3", + "cable_ready": "^5.0.0-pre8", "chosen-js": "^1.8.7", "flatpickr": "^4.6.9", "font-awesome": "^4.7.0", @@ -16,6 +17,7 @@ "moment": "^2.29.1", "popper.js": "^1.16.1", "select2": "^4.1.0-rc.0", + "select2-bootstrap-theme": "^0.1.0-beta.10", "stimulus": "^3.0.1", "stimulus_reflex": "3.4.1", "trix": "^2.0.0-alpha.0", diff --git a/yarn.lock b/yarn.lock index d08fdbb..519396e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1696,6 +1696,13 @@ bytes@3.1.0: dependencies: morphdom "^2.6.1" +cable_ready@^5.0.0-pre8: + version "5.0.0-pre8" + resolved "https://registry.yarnpkg.com/cable_ready/-/cable_ready-5.0.0-pre8.tgz#fa1b4d6f980f631ff3c895f3007a6789b2e47de7" + integrity sha512-5TyAp0DcYiv15YGlAI4WqEBw8Mz/lARSz/pIwEEVWWUnqWQhbsMqCIYIsQoV3IXudKOowaSbukbPRYFN0PYzKg== + dependencies: + morphdom "^2.6.1" + cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -5952,6 +5959,11 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= +select2-bootstrap-theme@^0.1.0-beta.10: + version "0.1.0-beta.10" + resolved "https://registry.yarnpkg.com/select2-bootstrap-theme/-/select2-bootstrap-theme-0.1.0-beta.10.tgz#b9426ecfc03bf4a235e76a132377574310469ac0" + integrity sha1-uUJuz8A79KI152oTI3dXQxBGmsA= + select2@^4.1.0-rc.0: version "4.1.0-rc.0" resolved "https://registry.yarnpkg.com/select2/-/select2-4.1.0-rc.0.tgz#ba3cd3901dda0155e1c0219ab41b74ba51ea22d8"