rhino_project_core 0.25.0.beta.17 → 0.26.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 551e19bc7da675500d290d83212f35f4fa8562abeb5500033a7e6c824f3b15f0
-  data.tar.gz: 1735f627d2f29068201cd97169e22dff27c4e49014197e0f66dc5c401dbbec46
+  metadata.gz: 31a329bb3535c369f12cf509dd4f39e713340fa026772640c929a9ffd78ac2be
+  data.tar.gz: cd974b6f21729d0a84a4690865905e9c279ed66e832cfef6935b52f11d0c65cd
 SHA512:
-  metadata.gz: 3a6c78e97b72e1725b77ccc8a8baffff3f13d30f1bdb12dca821c6b9ec4d6df22ed97981196b6bb671b16b443de84a094a5b4deebcbef687602e09a35cb34973
-  data.tar.gz: e59ea0c9a98f710336776783d4273f260cf36f3e1c6dcdbdc97aff2a2097814ebd54cd5e006620fcbf7e754557e7c796e316eca99e01309818db8b9e39e4a155
+  metadata.gz: f1f3bcb8b9b1e03e8915e8cdf158dc707267a24d28c9f002854f2bc1de4ec225126695f13f9a9fe60e335138636d42843fc320444c85f58a5068382794c5b69d
+  data.tar.gz: 3791762be7a5f82b5f29833f8b9e3fc3f0470219fb1241bc4d09e178a70aa39a82ca4b0e1ab0145e6f98c0d3d0f30cad886a065bbbcb81b5bdae6fe5b99eed3d

data/app/controllers/rhino/active_record_discard_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Rhino
+  class ActiveRecordDiscardController < CrudController
+    def index
+      authorize klass
+
+      @models = klass.sieves.resolve(policy_scope(klass), params).kept
+      render json: {
+        results: @models.eager_load_refs.map { |m| permit_model(m) },
+        total: @models.unscope(:limit, :offset).reselect(:id).count
+      }
+    end
+
+    def show
+      @model = authorize find_resource(policy_scope(klass).kept.eager_load_refs)
+
+      permit_and_render
+    end
+
+    def destroy
+      @model = authorize find_resource
+      @model.discard!
+
+      permit_and_render
+    end
+  end
+end

data/app/models/rhino/user.rb

@@ -24,6 +24,10 @@ module Rhino
       name || email
     end
 
+    def token_validation_response
+      to_caching_json
+    end
+
     def self.roles_for_auth(auth_owner, record = nil)
       return {} unless auth_owner
 

data/app/overrides/devise_token_auth/registrations_controller_override.rb

@@ -13,6 +13,14 @@ module DeviseTokenAuth::RegistrationsController::Extensions
       create_organization(resource) if Rhino.resources.include?("Organization")
     end
   end
+
+  # Get all the information just like the token_validation_response and sign_in
+  def render_create_success
+    render json: {
+      success: true,
+      data: resource_data(resource_json: @resource.token_validation_response)
+    }
+  end
 end
 
 class DeviseTokenAuth::RegistrationsController

data/lib/generators/rhino/ui/route/route_generator.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Rhino
+  module Generators
+    module Ui
+      class RouteGenerator < ::Rails::Generators::NamedBase
+        class_option :routes_directory, type: :string, desc: "The directory to copy the routes to",
+          default: "app/frontend/routes", group: :route
+        class_option :route_path, type: :string, desc: "The path to routes relative to the routes directory", default: "_authenticated/$owner", group: :route
+        class_option :model_path, type: :string, desc: "The base path name for the model (defaults to model plural name)", group: :route
+        class_option :copy_index, type: :boolean, desc: "Copy the index route", default: true, group: :route
+        class_option :copy_show, type: :boolean, desc: "Copy the show route", default: true, group: :route
+        class_option :copy_create, type: :boolean, desc: "Copy the create route", default: true, group: :route
+        class_option :copy_edit, type: :boolean, desc: "Copy the edit route", default: true, group: :route
+
+        source_root File.expand_path("templates", __dir__)
+
+        def copy_index_route
+          return unless options.copy_index?
+          template "index.tsx", route_file_path("index.tsx")
+        end
+
+        def copy_show_route
+          return unless options.copy_show?
+          template "$id.index.tsx", route_file_path("$id.index.tsx")
+        end
+
+        def copy_create_route
+          return unless options.copy_create?
+          template "new.tsx", route_file_path("new.tsx")
+        end
+
+        def copy_edit_route
+          return unless options.copy_edit?
+          template "$id.edit.tsx", route_file_path("$id.edit.tsx")
+        end
+
+        private
+          def model_path
+            options[:model_path] || plural_table_name
+          end
+
+          def route_path
+            File.join("/", options[:route_path], model_path, "/")
+          end
+
+
+          def route_file_path(file_name)
+            File.join(options[:routes_directory], options[:route_path], model_path, file_name)
+          end
+      end
+    end
+  end
+end

data/lib/generators/rhino/ui/route/templates/$id.edit.tsx.tt

@@ -0,0 +1,12 @@
+import { ModelEditPage } from '@rhino-project/ui-heroui';
+import { createFileRoute } from '@tanstack/react-router';
+
+export const Route = createFileRoute('<%= route_path %>$id/edit')({
+  component: RouteComponent
+});
+
+function RouteComponent() {
+  const { id: modelId } = Route.useParams();
+
+  return <ModelEditPage model="<%= singular_table_name %>" modelId={modelId} />;
+}

data/lib/generators/rhino/ui/route/templates/$id.index.tsx.tt

@@ -0,0 +1,12 @@
+import { ModelShowPage } from '@rhino-project/ui-heroui';
+import { createFileRoute } from '@tanstack/react-router';
+
+export const Route = createFileRoute('<%= route_path %>$id/')({
+  component: RouteComponent
+});
+
+function RouteComponent() {
+  const { id: modelId } = Route.useParams();
+
+  return <ModelShowPage model="<%= singular_table_name %>" modelId={modelId} />;
+}

data/lib/generators/rhino/ui/route/templates/index.tsx.tt

@@ -0,0 +1,10 @@
+import { ModelIndexPage } from '@rhino-project/ui-heroui';
+import { createFileRoute } from '@tanstack/react-router';
+
+export const Route = createFileRoute('<%= route_path %>')({
+  component: RouteComponent
+});
+
+function RouteComponent() {
+  return <ModelIndexPage model="<%= singular_table_name %>" syncUrl />;
+}

data/lib/generators/rhino/ui/route/templates/new.tsx.tt

@@ -0,0 +1,17 @@
+import { ModelCreatePage } from '@rhino-project/ui-heroui';
+import { createFileRoute } from '@tanstack/react-router';
+
+export const Route = createFileRoute('<%= route_path %>new')({
+  validateSearch: (search: Record<string, unknown>): { parentId: number } => {
+    return {
+      parentId: Number(search?.parentId)
+    };
+  },
+  component: RouteComponent
+});
+
+function RouteComponent() {
+  const { parentId } = Route.useSearch();
+
+  return <ModelCreatePage model="<%= singular_table_name %>" parentId={parentId} />;
+}

data/lib/rhino/engine.rb

@@ -10,6 +10,7 @@ require "arel-helpers"
 require "countries"
 require "devise"
 require "devise_token_auth"
+require "discard"
 require "friendly_id"
 require "geocoder"
 require "omniauth"

data/lib/rhino/resource/active_record_extension/params.rb

@@ -89,7 +89,12 @@ module Rhino
                 # An array of references
                 if desc[:type] == :array && (desc[:items].key?(:$ref) || desc[:items].key?(:anyOf))
                   # FIXME: Hack for has_many_attached
-                  next params << { prop => [] } if desc.dig(:items, :anyOf)[0]&.dig(:$ref) == "#/components/schemas/active_storage_attachment"
+                  if desc.dig(:items, :anyOf)[0]&.dig(:$ref) == "#/components/schemas/active_storage_attachment"
+                    params << { prop => [] }
+                    params << { prop => ["signed_id"] }
+
+                    next
+                  end
 
                   # We only accept if the active record accepts it
                   next unless nested_attributes_options.key?(prop_sym) || desc.dig(:items, :anyOf)[0]&.dig(:$ref)
@@ -138,7 +143,8 @@ module Rhino
 
                     { prop => assoc_params.flatten.uniq }
                   else
-                    { prop => klasses.map(&:identifier_property).uniq }
+                    # For ActiveStorage::Attachment we want to accept the signed_id
+                    { prop => klasses.map { it == ActiveStorage::Attachment ? "signed_id" : it.identifier_property }.uniq }
                   end
                 end
 
@@ -162,12 +168,25 @@ module Rhino
                 # FIXME
                 # Hack to rewrite for attachment/attachments and guard against object resubmission
                 if param_key.end_with?("_attachment")
-                  hash[param_key.remove("_attachment")] = param_value if param_value.is_a?(String) || param_value.nil?
+                  # If its a string, its the signed_id
+                  hash[param_key.remove("_attachment")] = if param_value.is_a?(String) || param_value.nil?
+                    param_value
+
+                  # Otherwise if its a hash, and we want the signed_id from it
+                  elsif param_value.is_a?(ActionController::Parameters)
+                    param_value["signed_id"]
+                  end
 
                   next
                 end
                 if param_key.end_with?("_attachments")
-                  hash[param_key.remove("_attachments")] = param_value if param_value.is_a?(Array) || param_value.nil?
+                  hash[param_key.remove("_attachments")] = if param_value.nil?
+                    param_value
+
+                  # if an element is a string, its the signed_id, if its a hash, we want the signed_id from it
+                  elsif param_value.is_a?(Array)
+                    param_value.map { it.is_a?(ActionController::Parameters) ? it["signed_id"] : it }
+                  end
 
                   next
                 end

data/lib/rhino/resource/active_record_extension/properties_describe.rb

@@ -61,27 +61,35 @@ module Rhino
               }
             end
 
+            DATE_FORMATS = %i[datetime date time].freeze
             def property_type_and_format_attr(name)
-              atype = attribute_types[name.to_s].type
+              type = attribute_types[name.to_s].type
+              format = nil
 
               # The PG array delegates type to "subtype" which is the actual type of the array elements
               if attribute_types[name.to_s].is_a? ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
                 return {
                   type: :array,
-                  items: {
-                    type: atype
-                  }
+                  items: { type: }
                 }
               end
 
-              if %i[datetime date time].include?(atype)
-                return {
-                  type: "string",
-                  format: atype
-                }
+              # Identifier is a special format for identification on the front end
+              format = :identifier if name == identifier_property
+
+              # Float is double precision in postgres by default
+              if type == :float
+                type = :number
+                format = :double
+              end
+
+              # Dates and times are strings
+              if DATE_FORMATS.include?(type)
+                format = type
+                type = :string
               end
 
-              { type: atype }
+              { type:, format: }.compact
             end
 
             def nested_array_options(name)
@@ -126,7 +134,6 @@ module Rhino
 
             def property_type_and_format(name) # rubocop:disable Metrics/AbcSize
               # Special cases
-              return { type: :identifier } if name == identifier_property
               return { type: :string } if defined_enums.key?(name)
 
               # FIXME: Hack for tags for now

data/lib/rhino/version.rb

@@ -8,9 +8,9 @@ module Rhino
 
   module VERSION
     MAJOR = 0
-    MINOR = 25
+    MINOR = 26
     TINY  = 0
-    PRE   = "beta.17"
+    PRE   = "beta.1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.25.0.beta.17
+  version: 0.26.0.beta.1
 platform: ruby
 authors:
 - JP Rosevear
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: discard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +397,7 @@ files:
 - app/controllers/concerns/rhino/set_current_user.rb
 - app/controllers/rhino/account_controller.rb
 - app/controllers/rhino/active_model_extension_controller.rb
+- app/controllers/rhino/active_record_discard_controller.rb
 - app/controllers/rhino/base_controller.rb
 - app/controllers/rhino/crud_controller.rb
 - app/controllers/rhino/simple_controller.rb
@@ -450,6 +465,11 @@ files:
 - lib/generators/rhino/module/templates/test/test_helper.rb
 - lib/generators/rhino/policy/policy_generator.rb
 - lib/generators/rhino/policy/templates/policy.rb.tt
+- lib/generators/rhino/ui/route/route_generator.rb
+- lib/generators/rhino/ui/route/templates/$id.edit.tsx.tt
+- lib/generators/rhino/ui/route/templates/$id.index.tsx.tt
+- lib/generators/rhino/ui/route/templates/index.tsx.tt
+- lib/generators/rhino/ui/route/templates/new.tsx.tt
 - lib/generators/rhino/update/update_generator.rb
 - lib/generators/test_unit/rhino_policy_generator.rb
 - lib/generators/test_unit/templates/policy_test.rb.tt
@@ -525,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: ''
 test_files: []