activeadmin_reorderable 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e42e395b381a8fa33bce9aa9e8fb26e337b3f67519d5a998e720c94dac7f7e
-  data.tar.gz: 90475575d7098a30e8dc43b8a3536dcd6b4a9f42cf2a696face953002d504c9c
+  metadata.gz: b0cdf7b48ce9d9b388c2140c1278d5626386139523b4d5505a1a2b4186c9b401
+  data.tar.gz: 43d51f9f8abcd5519224855536a737cfb2bc6b5e9f6b607babbd36ac264809bd
 SHA512:
-  metadata.gz: 399ec9fb0d7bd3217a40577e4ed3e3c980405cde55de5291db6a1d643c1881adcef7fcf33a9fc86cc47a234a50e7c3a9682ebd9ac805e39f84b431a35d5a832b
-  data.tar.gz: 5a29b1301e0e8477754ad4262aad074d58dd86770e0d9f167b396edf380c92f3e41e17cc33ca62d4e040f77538c55194ecfcd11877170da8e984b4e632e6df53
+  metadata.gz: 6ad7ef181efc4d8cb1b3b636ec14a12adef97efd0c6ed1a33e8c52dea4cb4ce18438979a4f42cd67fe018fbd1afc9a33e20b69eaff8fd21cfe2d13d53a701601
+  data.tar.gz: 52bcb5b1dc53133d2e5cb39b6d7c4c4bbfe562f2061a3cc49f4a76df9aa662613650434dff80368a1c347999318c6a1bd9ef09f65ab906374e08398362df398a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Viget Labs
+Copyright 2022 Derek Kniffin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,14 +9,14 @@ Your resource classes must respond to `insert_at` ala the [`acts_as_list`](https
 
 ## Installation
 ### Sprockets
-- Add `gem 'activeadmin_reorderable'` to `Gemfile`
+- Add `gem 'activeadmin_reorderable'` to `Gemfile` and run `bundle install`
 - Add `#= require activeadmin_reorderable` to `app/assets/javascripts/active_admin.js.coffee`
 - Add `@import "activeadmin_reorderable";` as the last `@import` statement in `app/assets/stylesheets/active_admin.css.scss`
 
 ### Webpacker / npm
 - `npm install --save activeadmin_reorderable` or `yarn add activeadmin_reorderable`
 - Add `import "activeadmin_reorderable"` to your JS pack file
-- Add `@import "activeadmin_reorderable/app/assets/styleseehts/activeadmin_reorderable.scss"";` to your CSS style file
+- Add `@import "activeadmin_reorderable/app/assets/styleseehts/activeadmin_reorderable.scss";` to your CSS style file
 
 ## Use
 `parts.rb`
@@ -70,3 +70,22 @@ end
 ### Issue and PR reviews
 
 Another way you can help is by reviewing issues, trying to reproduce bugs, and providing feedback on PRs.
+
+## Pushing a new version
+
+First, you must be authorized on both rubygems.org and npmjs.com. Then:
+
+Update the ruby gem:
+- Update the version in `lib/activeadmin_reorderable/version.rb`
+- `gem build activeadmin_reorderable.gemspec`
+- `gem push activeadmin_reorderable-X.Y.Z.gem`
+
+Update the npm package:
+- Update the version in `package.json`
+- `npm publish`
+
+Tag the version in git:
+- `git tag X.Y.Z`
+- `git push origin X.Y.Z`
+
+Update the changelog

data/app/assets/javascripts/activeadmin_reorderable.js

@@ -1,73 +1,102 @@
-$.fn.reorderable = function (opts) {
-  // This helper fixes the table row width collapsing when being dragged
-  function reorderableTableHelper(e, ui) {
-    ui.children().each(function () {
-      var $cell = $(this);
+const setupReorderable = ({ table, onUpdate }) => {
+  const rows = table.getElementsByTagName('tbody')[0].rows
 
-      $cell.width($cell.width());
-    });
+  let dragSrc = null
 
-    return ui;
-  }
+  for (var i = 0; i < rows.length; i++) {
+    const row = rows[i]
+    const handle = row.querySelector(".reorder-handle")
 
-  // This helper sets the table row placeholder height to the height of the row being moved
-  function reorderableTableStart(e, ui) {
-    ui.placeholder.height(ui.helper.outerHeight());
+    // Add draggable only when the handle is clicked, to prevent dragging from the rest of the row
+    handle.addEventListener("mousedown", () => row.setAttribute("draggable", "true"))
+    handle.addEventListener("mouseup", () => row.setAttribute("draggable", "false"))
 
-    return ui;
-  }
+    row.addEventListener("dragstart", (e) => {
+      e.dataTransfer.effectAllowed = "move"
 
-  function reorderableTableStop(e, ui) {
-    var $row = ui.item,
-      $rows = $row.parent().children('tr'),
-      $table = $row.closest('table'),
-      $handle = $row.find('.reorder-handle'),
-      url = $handle.data('reorder-url'),
+      dragSrc = row
 
-      index = function (i) { return $rows.index(i) + 1; };
+      // Apply styling a millisecond later, so the dragging image shows up correctly
+      setTimeout(() => { row.classList.add("dragged-row") }, 1)
+    })
 
-    $table.find('tbody tr').each(function (index) {
-      var $row = $(this),
-        newClass = ''
+    row.addEventListener("dragover", (e) => {
+      e.preventDefault()
+      e.dataTransfer.dropEffect = "move"
 
-      $row.removeClass('odd').removeClass('even');
+      // If dragged to a new location, move the dragged row
+      if (dragSrc != row) {
+        const sourceIndex = dragSrc.rowIndex
+        const targetIndex = row.rowIndex
 
-      if ((index + 1) % 2 == 0) {
-        newClass = 'even';
-      } else {
-        newClass = 'odd';
+        if (sourceIndex < targetIndex) {
+          table.tBodies[0].insertBefore(dragSrc, row.nextSibling)
+        } else {
+          table.tBodies[0].insertBefore(dragSrc, row)
+        }
+        onUpdate(dragSrc)
       }
+    })
+
+    row.addEventListener("dragend", () => {
+      // Disable dragging, so only the handle can start the dragging again
+      row.setAttribute("draggable", "false")
+      row.classList.remove("dragged-row")
+      dragSrc = null
+    })
+  }
+}
+
+const updateEvenOddClasses = (row, index) => {
+  row.classList.remove("odd")
+  row.classList.remove("even")
+
+  if ((index + 1) % 2 == 0) {
+    row.classList.add("even")
+  } else {
+    row.classList.add("odd")
+  }
+}
 
-      $row.addClass(newClass);
-    });
+const updatePositionText = (row, index) => {
+  row.querySelector(".position").textContent = index
+}
 
-    $rows.each(function () {
-      $(this).find('.position').text(index($(this)));
-    });
-    var top_id = $row.prev().find('.reorder-handle').data("reorderId")
-    var bottom_id = $row.next().find('.reorder-handle').data("reorderId")
+const updateBackend = (url, rowIndex) => {
+  let headers = { }
 
-    $.post(url, {
-      position: index($row),
-      top_id: top_id,
-      bottom_id: bottom_id 
-    });
+  const csrfElement = document.querySelector("meta[name=csrf-token]")
+  if (csrfElement) {
+    headers["X-CSRF-Token"] = csrfElement.getAttribute("content")
+  } else {
+    console.warn("Rails CSRF element not present. AJAX requests may fail due to CORS issues.")
   }
 
-  return this.each(function () {
-    var opts = $.extend({
-      items: 'tbody tr',
-      handle: '.reorder-handle',
-      axis: 'y',
-      helper: reorderableTableHelper,
-      start: reorderableTableStart,
-      stop: reorderableTableStop,
-    }, opts || {});
-
-    $(this).sortable(opts);
-  });
-};
-
-$(function () {
-  $('.aa-reorderable').reorderable();
-});
+  const formData = new FormData()
+  formData.append("position", rowIndex)
+
+  fetch(url, { method: "POST", headers, body: formData })
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll(".aa-reorderable").forEach((table) => {
+    setupReorderable({
+      table,
+      onUpdate: (row) => {
+        const allRows = table.getElementsByTagName('tbody')[0].rows
+        const handle = row.querySelector(".reorder-handle")
+        const url = handle.dataset["reorderUrl"]
+        const rowIndex = Array.prototype.indexOf.call(allRows, row)
+
+        for (var i = 0; i < allRows.length; i++) {
+          const loopRow = allRows[i]
+          const index = i + 1
+          updateEvenOddClasses(loopRow, index)
+          updatePositionText(loopRow, index)
+        }
+
+        updateBackend(url, rowIndex + 1)
+      }
+    })
+  })
+})

data/app/assets/stylesheets/activeadmin_reorderable.scss

@@ -3,4 +3,8 @@
     @include light-button;
     cursor: move;
   }
+
+  .dragged-row {
+    opacity: 0;
+  }
 }

data/lib/active_admin/reorderable/table_methods.rb

@@ -14,7 +14,7 @@ module ActiveAdmin
         aa_resource = active_admin_namespace.resource_for(resource.class)
         url = aa_resource.route_member_action_path(:reorder, resource)
 
-        span(reorder_handle_content, :class => 'reorder-handle', 'data-reorder-url' => url, 'data-reorder-id' => resource.id)
+        span(reorder_handle_content, :class => 'reorder-handle', 'data-reorder-url' => url)
       end
 
       def reorder_handle_content

data/lib/activeadmin_reorderable/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminReorderable
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/package.json

@@ -1,17 +1,15 @@
 {
   "name": "activeadmin_reorderable",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Drag and drop to reorder your ActiveAdmin tables.",
   "main": "app/assets/javascripts/activeadmin_reorderable.js",
   "files": [
     "app/**/*"
   ],
   "repository": "https://github.com/dkniffin/activeadmin_reorderable",
-  "author": "Viget <hello@viget.com>",
+  "author": "Derek Kniffin <derek.kniffin@gmail.com>",
   "license": "MIT",
   "scripts": { },
   "devDependencies": { },
-  "dependencies": {
-    "jquery": "^3.5.1"
-  }
+  "dependencies": { }
 }

metadata

@@ -1,44 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_reorderable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
+- Derek Kniffin
 - Chris Jones
 - Lawson Kurtz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.10'
+- !ruby/object:Gem::Dependency
+  name: site_prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 description: Add drag and drop reordering to ActiveAdmin tables.
 email:
-- lawson.kurtz@viget.com
+- derek.kniffin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - MIT-LICENSE
 - README.md
-- activeadmin_reorderable.gemspec
 - app/assets/javascripts/activeadmin_reorderable.js
 - app/assets/stylesheets/activeadmin_reorderable.scss
 - lib/active_admin/reorderable/dsl.rb
@@ -49,7 +219,7 @@ files:
 - lib/activeadmin_reorderable/engine.rb
 - lib/activeadmin_reorderable/version.rb
 - package.json
-homepage: http://www.github.com/vigetlabs/activeadmin_reorderable
+homepage: http://www.github.com/dkniffin/activeadmin_reorderable
 licenses:
 - MIT
 metadata: {}
@@ -68,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Drag and drop reordering for ActiveAdmin tables

data/.gitignore

@@ -1,4 +0,0 @@
-builds/*
-Gemfile.lock
-node_modules
-*.gem

data/CHANGELOG.md

@@ -1,9 +0,0 @@
-# Changelog
-
-## 0.1.0
-
-- Replace deprecated `render :nothing` with `head :ok` (thanks @zharikovpro)
-
-## 0.0.3
-
-- Removed a console.log within the reordering JavaScript.

data/CONTRIBUTING.md

@@ -1,27 +0,0 @@
-# Contributing
-
-Thank you for considering a contribution to this project!
-
-## Deployment
-
-`activeadmin_reorderable` is published on http://rubygems.org. The
-following steps are necessary to push a new version:
-
-### Build the gem
-
-`gem build activeadmin_reorderable.gemspec`
-
-This will produce an artifact named roughly
-`activeadmin_reorderable-<version>.gem`.
-
-### Publish the gem
-
-`gem push activeadmin_reorderable-<version>.gem`
-
-You may bump into permissions issues if you have not been added as an
-owner on the gem. Consult the Viget development team for acess.
-
-## Reviews
-
-All changes should be submitted through pull request. Ideally, at
-least two :+1:s should be given before a pull request is merge.

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/activeadmin_reorderable.gemspec

@@ -1,18 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-require "activeadmin_reorderable/version"
-
-Gem::Specification.new do |s|
-  s.name        = "activeadmin_reorderable"
-  s.version     = ActiveadminReorderable::VERSION
-  s.authors     = ["Chris Jones", "Lawson Kurtz"]
-  s.email       = ["lawson.kurtz@viget.com"]
-  s.homepage    = "http://www.github.com/vigetlabs/activeadmin_reorderable"
-  s.summary     = "Drag and drop reordering for ActiveAdmin tables"
-  s.description = "Add drag and drop reordering to ActiveAdmin tables."
-  s.license     = "MIT"
-
-  s.files = `git ls-files`.split($/)
-
-  s.add_development_dependency "activeadmin", ">= 0.6"
-end