oversee 0.2.0 → 0.3.1

data/app/components/oversee/resources/show.rb

@@ -4,104 +4,156 @@ class Oversee::Resources::Show < Oversee::Base
   include Phlex::Rails::Helpers::ButtonTo
   include Phlex::Rails::Helpers::TurboFrameTag
 
+
+  attr_reader :resource
+  attr_reader :resource_class
+  attr_reader :resource_associations
+
   def initialize(resource:, resource_class:, resource_associations:, params:)
     @resource = resource
     @resource_class = resource_class
     @resource_associations = resource_associations
     @params = params
-    @oversee_resource = Oversee::Resource.new(resource_class: @resource_class, resource: @resource)
+
+    @oversee_resource = Oversee::Resource.new(resource_class: @resource_class, instance: @resource)
   end
 
+  def around_template
+    render Oversee::Layout::Application.new { super }
+  end
 
   def view_template
-    render Oversee::Dashboard::Header.new(title: @resource_class.to_s, subtitle: "##{@resource.id}", return_path: helpers.resources_path(resource_class_name: @params[:resource_class_name])) do
-      button_to(helpers.resource_path(resource_class_name: @params[:resource_class_name]), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "size-8 inline-flex items-center justify-center rounded-full text-rose-500 bg-rose-50 hover:bg-rose-100 text-sm font-medium transition-colors") { render Phlex::Icons::Iconoir::Trash.new(class: "size-4") }
+    render Oversee::Dashboard::Header.new(title: @resource_class.to_s.pluralize) do |h|
+      h.left do
+        h.separator
+        div(class: "inline-flex items-center gap-1 text-sm bg-gray-100 text-gray-600 h-6 px-2") do
+          render Phlex::Icons::Iconoir::Hashtag.new(class: "size-2.5 text-gray-500", stroke_width: 2)
+          span { @resource.to_param }
+        end
+      end
+      h.right do
+        details(class: "relative inline-block") do
+          summary(class: "cursor-pointer list-none") do
+            div(class: "inline-flex items-center justify-center size-8 hover:bg-indigo-50 transition") do
+              render Phlex::Icons::Iconoir::MoreHorizCircle.new(class: "size-4 text-gray-500")
+            end
+          end
+          ul(
+            class:
+              "absolute p-2 mt-2 right-0 top-full min-w-40 overflow-hidden rounded-lg bg-white border border-b-2 border-gray-200/75 divide-y text-xs text-gray-500 font-medium"
+          ) do
+            li(class: "w-full") do
+              button_to(helpers.resource_path(resource_class_name: @params[:resource_class_name]), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "p-1 hover:bg-gray-50 w-full flex items-center gap-2 transition duration-100") do
+                div(class: "inline-flex items-center justify-center size-6 bg-gray-100") do
+                  render Phlex::Icons::Iconoir::Trash.new(class: "size-3 text-gray-500")
+                end
+                plain "Delete"
+              end
+            end
+          end
+        end
+      end
     end
 
-    div(class: "p-8") do
+    hr(class: "my-4")
+
+    # COLUMNS
+    div(class: "flex flex-col gap-4") do
       @resource_class.columns_hash.each do |key, metadata|
-        div(class: "py-4") do
-          div(class: "space-y-2") do
-            render Oversee::Field::Label.new(key: key, datatype: metadata.sql_type_metadata.type)
-            div(id: dom_id(@resource, :"#{key}_row"), class: "flex items-center gap-2 mt-4") do
-              render Oversee::Field::Display.new(resource: @resource, key: key, datatype: metadata.sql_type_metadata.type)
-              # div(id: dom_id(@resource, :"#{key}_actions")) do
-              #   div(class: "bg-white text-gray-400 size-9 aspect-square inline-flex items-center justify-center"){ render Phlex::Icons::Iconoir::Copy.new(class: "size-5", stroke_width: 1.75) }
-              # end
+        next if @oversee_resource.foreign_keys.include?(key.to_s)
+        value = @resource.send(key)
+        datatype = metadata.sql_type_metadata.type
+        render Oversee::Field::Set.new(resource:, key:, value:, datatype:)
+      end
+    end
+
+
+    # RICH TEXT Associations
+    if !!rich_text_associations.length
+    hr(class: "my-4")
+      rich_text_associations.each do |association|
+
+        # Remove the "rich_text_" prefix from the association name
+        key = association[:name].to_s[10..].to_sym
+
+        div do
+          div(class: "space-y-4") do
+            div(class:"flex items-center gap-2") do
+              render Oversee::Field::Label.new(key: key.to_s.titleize, datatype: :rich_text)
+              a(href: helpers.resources_path(resource_class_name: association[:class_name].to_s), class: "hover:text-blue-500") { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
+            end
+
+            div(id: dom_id(@resource, :"#{key.to_s}_row"), class: "flex items-center gap-2 mt-4") do
+              render Oversee::Field::Display.new(resource:, key:, value: @resource.send(key).to_plain_text[..196], datatype: :rich_text)
             end
           end
         end
       end
+    end
 
-      # BELONGS_TO Associations
-      if !!belongs_to_associations.length
-        belongs_to_associations.each do |association|
-          div(class: "py-6") do
-            div(class: "space-y-4") do
-              div(class:"flex items-center gap-2") do
-                render Oversee::Field::Label.new(key: association[:name].to_s.titleize, datatype: :data)
-                a(href: helpers.resources_path(resource_class_name: association[:class_name].to_s), class: "hover:text-blue-500") { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
-              end
+    # BELONGS_TO Associations
+    if !!belongs_to_associations.length
+      belongs_to_associations.each do |association|
+        div(class: "py-6") do
+          div(class: "space-y-4") do
+            div(class:"flex items-center gap-2") do
+              render Oversee::Field::Label.new(key: association[:name].to_s.titleize, datatype: :data)
+              a(href: helpers.resources_path(resource_class_name: association[:class_name].to_s), class: "hover:text-blue-500") { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
+            end
 
-              div(class: "flex items-center gap-2 flex-wrap") do
-                foreign_key_value = @resource[association[:foreign_key]]
-                path = !!foreign_key_value ? helpers.resource_path(id: foreign_key_value, resource_class_name: association[:class_name]) : helpers.resources_path(resource_class_name: association[:class_name])
-
-                a(
-                  href: path,
-                  class:
-                    "inline-flex items-center gap-2 text-xs border border-transparent bg-gray-100 hover:bg-gray-200 px-3 py-1.5"
-                ) do
-                  plain "#{association[:class_name]} | #{foreign_key_value}"
-                  span { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
-                end
+            foreign_key = association[:foreign_key]
+            foreign_key_value = @resource[association[:foreign_key]]
+            path = !!foreign_key_value ? helpers.resource_path(id: foreign_key_value, resource_class_name: association[:class_name]) : helpers.resources_path(resource_class_name: association[:class_name])
+
+            div(id: dom_id(@resource, :"#{foreign_key}_row"), class: "flex items-center gap-2 mt-4") do
+              render Oversee::Field::Display.new(resource:, key: foreign_key, value: foreign_key_value, datatype: :belongs_to, display_key: true)
+              div(id: dom_id(@resource, :"#{foreign_key}_actions")) do
+                a(href: path, class: "bg-gray-100 hover:bg-gray-200 text-gray-400 hover:text-blue-500 size-10 aspect-square inline-flex items-center justify-center transition-colors"){ render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-4") }
               end
             end
           end
         end
       end
+    end
 
-      # HAS_MANY Associations
-      if !!has_many_associations.length
+    hr(class: "my-4")
+
+    # HAS_MANY Associations
+    if !!has_many_associations.length
+      div(class: "flex flex-col gap-8") do
         has_many_associations.each do |association|
           associated_resources = @resource.send(association[:name])
           associated_resource_class = association[:class_name].constantize
 
-          div(class: "py-6") do
-            div(class: "space-y-4") do
-              div(class:"flex items-center gap-2") do
-                render Oversee::Field::Label.new(key: association[:name].to_s.titleize, datatype: :data)
-                a(href: helpers.resources_path(resource_class_name: association[:class_name]), class: "hover:text-blue-500") { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
-              end
+          div(class: "space-y-4") do
+            div(class:"flex items-center gap-2") do
+              render Oversee::Field::Label.new(key: association[:name].to_s.titleize, datatype: :data)
+              a(href: helpers.resources_path(resource_class_name: association[:class_name]), class: "hover:text-blue-500") { render Phlex::Icons::Iconoir::ArrowUpRight.new(class: "size-3") }
+            end
+
+            div(class: "bg-gray-50 p-2") do
+              # turbo_frame_tag(
+              #   dom_id(associated_resource_class, :table),
+              #   src: helpers.resources_table_path(resources_table_params(association)),
+              #   loading: :lazy,
+              #   data: { turbo_stream: true }
+              # ) do
+              #   div(class: "h-20 flex items-center justify-center") { render Phlex::Icons::Iconoir::DatabaseSearch.new(class: "animate-pulse size-6 text-gray-600") }
+              # end
 
-              div(class: "bg-gray-50 p-2") do
-                if associated_resources.present?
-                  div(class: "bg-white") do
-                    # turbo_frame_tag(
-                    #   dom_id(associated_resource_class, :table),
-                    #   src: helpers.resources_table_path(
-                    #     resource_class_name: association[:class_name],
-                    #     filters: { eq: { association[:foreign_key] => [@resource.id] } }
-                    #   ),
-                    #   loading: :lazy,
-                    #   data: { turbo_stream: true }
-                    # ) do
-                    #   div(class: "h-20 flex items-center justify-center") { render Phlex::Icons::Iconoir::DatabaseSearch.new(class: "animate-pulse size-6 text-gray-600") }
-                    # end
-
-                  #
-                    render Oversee::Resources::Table.new(
-                      resources: associated_resources,
-                      resource_class: associated_resource_class,
-                      params: @params
-                    )
-                  end
-                else
-                  p(class: "bg-gray-50 p-2 pr-4 flex gap-2 items-center text-xs") {
-                    render Phlex::Icons::Iconoir::DatabaseSearch.new(class: "size-3")
-                    plain "No #{association[:name].to_s.titleize.downcase} found"
-                  }
+              if associated_resources.present?
+                div(class: "bg-white") do
+                  render Oversee::Resources::Table.new(
+                    resources: associated_resources,
+                    resource_class: associated_resource_class,
+                    params: @params
+                  )
                 end
+              else
+                p(class: "bg-gray-50 p-2 pr-4 flex gap-2 items-center text-xs") {
+                  render Phlex::Icons::Iconoir::DatabaseSearch.new(class: "size-3")
+                  plain "No #{association[:name].to_s.titleize.downcase} found"
+                }
               end
             end
           end
@@ -112,6 +164,10 @@ class Oversee::Resources::Show < Oversee::Base
 
   private
 
+  def rich_text_associations
+    @oversee_resource.rich_text_associations
+  end
+
   def belongs_to_associations
     @oversee_resource.associations[:belongs_to]
   end
@@ -123,4 +179,19 @@ class Oversee::Resources::Show < Oversee::Base
   def has_associations?
     @resource_associations.present?
   end
+
+  def resources_table_params(association)
+    # if association[:through].nil?
+    #   return { association[:foreign_key] => { eq: [@resource.id] } }
+    # else
+    #   keys = @resource.send(association[:through]).pluck(association[:foreign_key])
+    #   return { @resource_class.primary_key => { eq: keys } }
+    # end
+
+    {
+      resource_class_name: association[:class_name],
+      association_name: association[:through],
+      filters: { association[:foreign_key] => { eq: [@resource.id] } }
+    }
+  end
 end

data/app/components/oversee/resources/table.rb

@@ -8,16 +8,19 @@ class Oversee::Resources::Table < Oversee::Base
     @resource_class = resource_class || resources.first.class
     @params = params
     @options = options
+
+    @oversee_resource = Oversee::Resource.new(resource_class: @resource_class)
   end
 
   def view_template
-    turbo_frame_tag dom_id(@resource_class, :table), target: :_top do
+    turbo_frame_tag dom_id(@resource_class, :table), target: "_top" do
       render Oversee::Table.new do |table|
         table.head do |head|
           head.row do
             th(scope: "col", class: "px-4 py-3 text-left text-xs text-gray-900 uppercase")
             # Attributes
             @resource_class.columns_hash.each do |key, metadata|
+              next if @oversee_resource.foreign_keys.include?(key.to_s)
               th(scope: "col", class: "text-left text-xs text-gray-900 uppercase whitespace-nowrap hover:bg-gray-50 transition relative") do
                 a(
                   href:
@@ -29,6 +32,7 @@ class Oversee::Resources::Table < Oversee::Base
                           @params[:sort_direction] == "asc" ? :desc : :asc
                       )
                     ),
+                  target: "_top",
                   class: "px-4 py-3 flex items-center justify-between gap-2 w-full h-full hover:text-gray-900 transition-colors"
                 ) do
                   render Oversee::Field::Label.new(key: key, datatype: metadata.sql_type_metadata.type)
@@ -52,6 +56,7 @@ class Oversee::Resources::Table < Oversee::Base
 
         table.body do |body|
           @resources.each do |resource|
+
             body.row do |row|
               td do
                 div(class: "flex space-x-2 mx-4") do
@@ -70,9 +75,10 @@ class Oversee::Resources::Table < Oversee::Base
               end
 
               @resource_class.columns_hash.each do |key, metadata|
+                next if @oversee_resource.foreign_keys.include?(key.to_s)
                 row.data do
                   div(class: "max-w-96") do
-                    render Oversee::Field::Value.new(datatype: metadata.sql_type_metadata.type, value: resource.send(key), key: key)
+                    render Oversee::Field::Value.new(key:, datatype: metadata.sql_type_metadata.type, value: resource.send(key), for_table: true)
                   end
                 end
               end

data/app/controllers/oversee/dashboard_controller.rb

@@ -1,7 +1,7 @@
 module Oversee
   class DashboardController < BaseController
     def index
-      render Oversee::Dashboard::Index.new
+      render Oversee::Dashboard::Index.new, layout: false
     end
 
     def show

data/app/controllers/oversee/resources/fields_controller.rb

@@ -1,45 +1,33 @@
-module Oversee
-  module Resources
-    class FieldsController < BaseController
-      before_action :set_resource_class
+class Oversee::Resources::FieldsController < Oversee::ResourcesController
+  before_action :set_resource, only: %i[input]
 
-      def update
-        @resource_class = params[:resource_class].constantize
-        @resource = @resource_class.find(params[:id])
-        # @datatype = @resource_class.columns_hash[@key.to_s].type
+  # Renders the display field for a resource
+  def show
+  end
 
-        respond_to do |format|
-          if @resource.update(resource_params)
-            format.html { redirect_to resource_path(@resource, resource: @resource_class) }
-            format.turbo_stream
-          else
-          end
-        end
-      end
-      
-      # Non-standard actions
-      def edit
-        @resource = @resource_class.find(params[:id])
-        @key = params[:key].to_sym
-        @value = @resource.send(@key)
-        @datatype = @resource.class.columns_hash[@key.to_s].type
-        puts "---"
-        puts "key: #{@key}"
-        puts "value: #{@value}"
-        puts "datatype: #{@datatype}"
-        puts "---"
+  # Renders the input field for a resource
+  def input
+    component_dom_id = dom_id(@resource, key)
+    component = Oversee::Field::Set.new(resource: @resource, datatype:, key:, value:, state: :input)
 
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: turbo_stream.replace(component_dom_id, component)
       end
+    end
+  end
 
-      private
+  private
 
-      def set_resource_class
-        @resource_class = params[:resource_class].constantize
-      end
+  def key
+    params[:key].to_sym
+  end
 
-      def resource_params
-        params.require(:resource).permit!
-      end
-    end
+  def value
+    params[:value] || @resource.send(key)
+  end
+
+  def datatype
+    params[:datatype] || @resource.class.columns_hash[key.to_s].type
   end
 end

data/app/controllers/oversee/resources_controller.rb

@@ -3,8 +3,8 @@ module Oversee
     include ActionView::RecordIdentifier
 
     before_action :set_resource_class
-    before_action :set_resource, only: %i[show edit update destroy input_field]
-    before_action :set_resources, only: %i[index table]
+    before_action :set_resource, only: %i[show edit update destroy]
+    before_action :set_resources, only: %i[index]
 
     def index
       @pagy, @resources = pagy(@resources, limit: params[:per_page] || Oversee.configuration.per_page)
@@ -14,7 +14,7 @@ module Oversee
         resource_class: @resource_class,
         pagy: @pagy,
         params: params
-      )
+      ), layout: false
     end
 
     def new
@@ -23,7 +23,7 @@ module Oversee
         resource: @resource,
         resource_class: @resource_class,
         params: params
-      )
+      ), layout: false
     end
 
     def create
@@ -31,6 +31,7 @@ module Oversee
 
       respond_to do |format|
         if @resource.update(resource_params)
+          flash.now[:notice] = "Resource was successfully created."
           format.html { redirect_to resource_path(@resource.id, resource_class_name: @resource_class) }
           format.turbo_stream { redirect_to resource_path(@resource.id, resource_class_name: @resource_class), status: :see_other }
         else
@@ -46,7 +47,7 @@ module Oversee
         resource_class: @resource_class,
         resource_associations: resource_associations,
         params: params
-      )
+      ), layout: false
     end
 
     def edit
@@ -58,10 +59,14 @@ module Oversee
 
       respond_to do |format|
         if @resource.update(resource_params)
+          flash.now[:notice] = "#{@resource.class.to_s.titleize.capitalize.gsub("::"," ")} was successfully updated!"
           format.html { redirect_to resource_path(@resource.id, resource: @resource_class) }
           format.turbo_stream do
-            component = Oversee::Field::Display.new(resource: @resource, datatype:, key:, value: @resource.send(key))
-            render turbo_stream: turbo_stream.replace(dom_id(@resource, key), component)
+            component = Oversee::Field::Set.new(resource: @resource, datatype:, key:, value: @resource.send(key))
+            render turbo_stream: [
+              turbo_stream.replace(dom_id(@resource, key), component),
+              turbo_stream.replace(:flash, Oversee::Flash)
+            ]
           end
         else
         end
@@ -73,25 +78,25 @@ module Oversee
       redirect_to resources_path(resource: @resource_class)
     end
 
-    # Non-standard actions
-    def input_field
-      set_resource
-
-      key = params[:key].to_sym
-      value = @resource.send(key)
-      datatype = @resource.class.columns_hash[key.to_s].type
-
-      field_dom_id = dom_id(@resource, key)
-      field = Oversee::Field::Form.new(resource: @resource, datatype:, key:, value:)
+    def association
+      @resources = @resource_class.find(params[:id]).send(params[:association_name])
+      @pagy, @resources = pagy(@resources, limit: params[:per_page] || Oversee.configuration.per_page)
 
-      respond_to do |format|
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.replace(field_dom_id, field)
-        end
-      end
+      render Oversee::Resources::Index.new(
+        resources: @resources,
+        resource_class: @resource_class,
+        pagy: @pagy,
+        params: params
+      )
     end
 
     def table
+      if params[:association_name].present?
+        @resources = @resource_class.find(params[:id]).send(params[:association_name])
+      else
+        set_resources
+      end
+
       component_id = dom_id(@resource_class, :table)
       component = Oversee::Resources::Table.new(resource_class: @resource_class, resources: @resources, params: params)
 
@@ -119,8 +124,8 @@ module Oversee
       set_sorting_rules
 
       @resources = @resource_class.order(@sort_attribute.to_sym => sort_direction)
-      @resources = Filter.new(collection: @resources, params:).apply
-      @resources = Search.new(collection: @resources, resource_class: @resource_class, query: params[:query]).call
+      @resources = Oversee::Filter.new(collection: @resources, params:).apply
+      @resources = Oversee::Search.new(collection: @resources, resource_class: @resource_class, query: params[:query]).call
     end
 
     def resource_associations

data/app/javascript/oversee/application.js

@@ -0,0 +1,3 @@
+import "trix";
+import "@rails/actiontext";
+import "controllers";

data/app/javascript/oversee/controllers/clipboard_controller.js

@@ -0,0 +1,21 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["copyIcon", "successIcon"];
+  static values = { content: String };
+
+  async copy() {
+    try {
+      await navigator.clipboard.writeText(this.contentValue);
+      this.toggleIcons(true);
+      setTimeout(() => this.toggleIcons(false), 1500);
+    } catch (error) {
+      console.error(error.message);
+    }
+  }
+
+  toggleIcons(isCopied) {
+    this.copyIconTarget.classList.toggle("hidden", isCopied);
+    this.successIconTarget.classList.toggle("hidden", !isCopied);
+  }
+}

data/app/javascript/oversee/controllers/index.js

@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus";
+
+const application = Application.start();
+
+application.debug = false;
+window.Stimulus = application;
+
+import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading";
+eagerLoadControllersFrom("controllers", application);

data/app/javascript/oversee/controllers/notification_controller.js

@@ -0,0 +1,17 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  connect() {
+    setTimeout(() => {
+      this.element.classList.remove("opacity-0");
+    }, 100);
+
+    setTimeout(() => {
+      this.element.classList.remove("opacity-100");
+      this.element.classList.add("opacity-0");
+    }, 2500);
+    setTimeout(() => {
+      this.element.outerHTML = "";
+    }, 3000);
+  }
+}

data/app/javascript/oversee/controllers/reveal_controller.js

@@ -0,0 +1,19 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["revealable"];
+  static values = { revealableId: String };
+
+  connect() {
+    if (this.hasRevealableIdValue)
+      this.target = document.getElementById(this.revealableIdValue);
+
+    if (!this.target && this.hasRevealableTarget)
+      this.target = this.revealableTarget;
+  }
+
+  toggle() {
+    if (!this.target) return;
+    this.target.classList.toggle("hidden");
+  }
+}

data/app/javascript/oversee/controllers/sidebar/state_controller.js

@@ -0,0 +1,21 @@
+import { Controller } from "@hotwired/stimulus";
+
+const KEY_BASE = "oversee-sidebar";
+
+export default class extends Controller {
+  initialize() {
+    this.key = `${KEY_BASE}--${this.element.id}`;
+    this.expanded = localStorage.getItem(this.key) === "true";
+    this.element.open = this.expanded;
+  }
+
+  toggle() {
+    this.expanded = !this.expanded;
+    this.element.open = this.expanded;
+  }
+
+  persist(event) {
+    this.expanded = event.newState === "open";
+    localStorage.setItem(this.key, this.expanded);
+  }
+}