administrate 0.20.1 → 1.0.0.beta2

data/app/assets/builds/administrate-internal/docs.css

@@ -0,0 +1,89 @@
+html,
+body {
+  font-family: "Lato", serif;
+  font-size: 18px;
+  line-height: 1.62em;
+  margin: 0;
+}
+
+img {
+  max-width: 100%;
+}
+
+h1,
+h2,
+h3 {
+  font-family: "Fjalla One", sans-serif;
+  margin-top: 2em;
+}
+
+a {
+  color: #53adc6;
+  text-decoration: none;
+}
+
+.content {
+  margin-bottom: 2em;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 2em;
+  width: 60em;
+}
+.content .sidebar {
+  float: left;
+  width: 20em;
+}
+.content .sidebar-links {
+  list-style: none;
+  padding-left: 0;
+}
+.content .main {
+  float: right;
+  width: 40em;
+}
+
+.flash-wrapper {
+  background-color: #cf726e;
+  color: #f0f0f0;
+  padding: 1em;
+}
+.flash-wrapper .flash {
+  margin-left: auto;
+  margin-right: auto;
+  width: 40em;
+}
+
+code {
+  font-family: "Source Code Pro";
+  font-size: 0.8rem;
+  padding: 0.4em 0.2em 0;
+}
+code.hljs {
+  background-color: #202020;
+  color: #e0e0dc;
+  padding-left: 1rem;
+}
+code.hljs .hljs-string {
+  color: #b0bf82;
+}
+code.hljs .hljs-subst {
+  color: #e0e0dc;
+}
+code.hljs .hljs-constant {
+  color: #8fbdcc;
+}
+code.hljs .hljs-symbol {
+  color: #b95c56;
+}
+code.hljs .hljs-keyword {
+  color: #f8d29d;
+}
+code.hljs .hljs-title,
+code.hljs .hljs-parent {
+  color: #8fbdcc;
+}
+code.hljs .hljs-tag {
+  color: #f8d29d;
+}
+
+/*# sourceMappingURL=docs.css.map */

data/app/assets/builds/administrate-internal/docs.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../stylesheets/administrate-internal/docs.scss"],"names":[],"mappings":"AAYA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA;;;AAGF;EACE,OAhCK;EAiCL;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE,kBA3DI;EA4DJ,OA1DM;EA2DN;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE,kBAxES;EAyET,OAxES;EAyET;;AAEA;EAAe,OA1EN;;AA2ET;EAAc,OA5EL;;AA6ET;EAAiB,OA3ET;;AA4ER;EAAe,OA1ER;;AA2EP;EAAgB,OA5EN;;AA8EV;AAAA;EACe,OAhFP;;AAkFR;EAAY,OAjFF","file":"docs.css","sourcesContent":["$blue: #53adc6;\n$red: #cf726e;\n$green: #5bc89e;\n$white: #f0f0f0;\n\n$code-black: #202020;\n$code-white: #e0e0dc;\n$code-green: #b0bf82;\n$code-blue: #8fbdcc;\n$code-yellow: #f8d29d;\n$code-red: #b95c56;\n\nhtml,\nbody {\n  font-family: 'Lato', serif;\n  font-size: 18px;\n  line-height: 1.62em;\n  margin: 0;\n}\n\nimg {\n  max-width: 100%;\n}\n\nh1,\nh2,\nh3 {\n  font-family: 'Fjalla One', sans-serif;\n  margin-top: 2em;\n}\n\na {\n  color: $blue;\n  text-decoration: none;\n}\n\n.content {\n  margin-bottom: 2em;\n  margin-left: auto;\n  margin-right: auto;\n  margin-top: 2em;\n  width: 60em;\n\n  .sidebar {\n    float: left;\n    width: 20em;\n\n    &-links {\n      list-style: none;\n      padding-left: 0;\n    }\n  }\n\n  .main {\n    float: right;\n    width: 40em;\n  }\n}\n\n.flash-wrapper {\n  background-color: $red;\n  color: $white;\n  padding: 1em;\n\n  .flash {\n    margin-left: auto;\n    margin-right: auto;\n    width: 40em;\n  }\n}\n\ncode {\n  font-family: \"Source Code Pro\";\n  font-size: 0.8rem;\n  padding: 0.4em 0.2em 0;\n\n  &.hljs {\n    background-color: $code-black;\n    color: $code-white;\n    padding-left: 1rem;\n\n    .hljs-string { color: $code-green; }\n    .hljs-subst { color: $code-white; }\n    .hljs-constant { color: $code-blue; }\n    .hljs-symbol { color: $code-red; }\n    .hljs-keyword { color: $code-yellow; }\n\n    .hljs-title,\n    .hljs-parent { color: $code-blue; }\n\n    .hljs-tag { color: $code-yellow; }\n  }\n}\n"]}

data/app/assets/config/administrate_manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../images
+//= link_tree ../builds

data/app/assets/javascripts/administrate/add_jquery.js

@@ -0,0 +1,4 @@
+import jquery from "jquery";
+
+window.jQuery = jquery;
+window.$ = jquery;

data/app/assets/javascripts/administrate/application.js

@@ -1,4 +1,8 @@
-//= require jquery
-//= require jquery_ujs
-//= require selectize
-//= require_tree .
+import "./add_jquery";
+import "trix";
+import "@rails/actiontext";
+
+import "@hotwired/turbo-rails";
+import "selectize/dist/js/selectize.min.js";
+
+import "./controllers";

data/app/assets/javascripts/administrate/controllers/application.js

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

data/app/assets/javascripts/administrate/controllers/index.js

@@ -0,0 +1,7 @@
+import { application } from "./application";
+
+import SelectController from "./select_controller";
+import TableController from "./table_controller";
+
+application.register("select", SelectController);
+application.register("table", TableController);

data/app/assets/javascripts/administrate/controllers/select_controller.js

@@ -0,0 +1,8 @@
+import { Controller } from "@hotwired/stimulus";
+import $ from "jquery";
+
+export default class extends Controller {
+  connect() {
+    $(this.element).selectize({});
+  }
+};

data/app/assets/javascripts/administrate/{components/table.js → controllers/table_controller.js}

@@ -1,7 +1,10 @@
-$(function() {
-  var keycodes = { space: 32, enter: 13 };
+import { Controller } from "@hotwired/stimulus";
+import $ from "jquery";
 
-  var visitDataUrl = function(event) {
+var keycodes = { space: 32, enter: 13 };
+
+export default class extends Controller {
+  visitDataUrl(event) {
     if (event.type == "click" ||
         event.keyCode == keycodes.space ||
         event.keyCode == keycodes.enter) {
@@ -13,11 +16,8 @@ $(function() {
       var dataUrl = $(event.target).closest("tr").data("url");
       var selection = window.getSelection().toString();
       if (selection.length === 0 && dataUrl) {
-        window.location = window.location.protocol + '//' + window.location.host + dataUrl;
+        Turbo.visit(dataUrl);
       }
     }
-  };
-
-  $("table").on("click", ".js-table-row", visitDataUrl);
-  $("table").on("keydown", ".js-table-row", visitDataUrl);
-});
+  }
+};

data/app/assets/stylesheets/administrate/application.scss

@@ -2,7 +2,9 @@
 
 @import "reset/normalize";
 
-@import "selectize";
+@import "trix/dist/trix";
+@import "selectize/dist/css/selectize";
+@import "selectize/dist/css/selectize.default";
 
 @import "library/clearfix";
 @import "library/data-label";
@@ -25,5 +27,3 @@
 @import "components/navigation";
 @import "components/pagination";
 @import "components/search";
-
-@import "utilities/text-color";

data/app/assets/stylesheets/administrate/base/_forms.scss

@@ -32,6 +32,10 @@ textarea {
   font-size: 16px;
 }
 
+textarea {
+  resize: vertical;
+}
+
 [type="color"],
 [type="date"],
 [type="datetime-local"],
@@ -78,10 +82,6 @@ textarea {
   }
 }
 
-textarea {
-  resize: vertical;
-}
-
 [type="checkbox"],
 [type="radio"] {
   display: inline;

data/app/assets/stylesheets/administrate/base/_layout.scss

@@ -13,6 +13,11 @@ figure {
   margin: 0;
 }
 
+/* stylelint-disable selector-no-qualifying-type, selector-class-pattern */
+form.button_to { // we don't control this class name
+  display: contents;
+}
+
 img,
 picture {
   margin: 0;

data/app/assets/stylesheets/administrate/base/_tables.scss

@@ -23,7 +23,7 @@ tbody tr {
     background-color: $base-background-color;
   }
 
-  [role=link] {
+  [role="link"] {
     cursor: pointer;
   }
 

data/app/assets/stylesheets/administrate/base/_typography.scss

@@ -21,11 +21,22 @@ p {
   margin: 0 0 $small-spacing;
 }
 
-a {
+a,
+.link:is(
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"]
+) {
   color: $action-color;
   text-decoration-skip-ink: auto;
   transition: color $base-duration $base-timing;
 
+  /* stylelint-disable selector-no-qualifying-type */
+  &.link--danger {
+    color: $red;
+  }
+
   &:hover {
     color: mix($black, $action-color, 25%);
   }

data/app/assets/stylesheets/administrate/components/_attributes.scss

@@ -1,5 +1,6 @@
 .attribute-label {
   @include data-label;
+
   clear: left;
   float: left;
   margin-bottom: $base-spacing;

data/app/assets/stylesheets/administrate/components/_buttons.scss

@@ -1,7 +1,7 @@
 button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
+[type="button"],
+[type="reset"],
+[type="submit"],
 .button {
   appearance: none;
   background-color: $action-color;
@@ -22,23 +22,23 @@ input[type="submit"],
   vertical-align: middle;
   white-space: nowrap;
 
-  &:hover {
+  &:disabled {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+
+  &:not(.link):hover {
     background-color: mix($black, $action-color, 20%);
     color: $white;
   }
 
-  &:focus {
+  &:not(.link):focus {
     outline: $focus-outline;
     outline-offset: $focus-outline-offset;
   }
 
-  &:disabled {
-    cursor: not-allowed;
-    opacity: 0.5;
-
-    &:hover {
-      background-color: $action-color;
-    }
+  &:not(.link):disabled:hover {
+    background-color: $action-color;
   }
 }
 

data/app/assets/stylesheets/administrate/components/_cells.scss

@@ -1,6 +1,25 @@
+.cell-label__sort-indicator {
+  float: right;
+  margin-left: 5px;
+
+  svg {
+    fill: $hint-grey;
+    height: 13px;
+    transition: transform $base-duration $base-timing;
+    width: 13px;
+  }
+}
+
 .cell-label {
   padding-top: 0.15em;
 
+  a {
+    color: inherit;
+    display: inline-block;
+    transition: color $base-duration $base-timing;
+    width: 100%;
+  }
+
   &:hover {
     a {
       color: $action-color;
@@ -11,13 +30,6 @@
       transform: rotate(180deg);
     }
   }
-
-  a {
-    color: inherit;
-    display: inline-block;
-    transition: color $base-duration $base-timing;
-    width: 100%;
-  }
 }
 
 .cell-label--asc,
@@ -25,18 +37,6 @@
   font-weight: $bold-font-weight;
 }
 
-.cell-label__sort-indicator {
-  float: right;
-  margin-left: 5px;
-
-  svg {
-    fill: $hint-grey;
-    height: 13px;
-    transition: transform $base-duration $base-timing;
-    width: 13px;
-  }
-}
-
 .cell-label__sort-indicator--desc {
   transform: rotate(180deg);
 }

data/app/assets/stylesheets/administrate/components/_field-unit.scss

@@ -1,5 +1,6 @@
 .field-unit {
   @include administrate-clearfix;
+
   align-items: center;
   display: flex;
   flex-wrap: wrap;
@@ -16,10 +17,9 @@
 }
 
 .field-unit__field {
+  flex-grow: 1;
   float: left;
   margin-left: 2rem;
-  max-width: 50rem;
-  width: 100%;
 
   .optgroup-header {
     font-weight: $bold-font-weight;
@@ -40,7 +40,7 @@
   width: 100%;
 
   .field-unit__field {
-    width: 100%;
+    flex-grow: 1;
   }
 
   .field-unit__label {

data/app/assets/stylesheets/administrate/components/_main-content.scss

@@ -4,8 +4,8 @@
   box-shadow: 0 0 6px 0 rgba($black, 0.12),
               0 2px 2px rgba($black, 0.2);
   flex: 1 1 100%;
-  padding-bottom: 10vh;
   min-width: 800px;
+  padding-bottom: 10vh;
 }
 
 .main-content__header,

data/app/assets/stylesheets/administrate/components/_navigation.scss

@@ -1,4 +1,4 @@
-$_navigation-link-padding: 0.6em;
+$navigation-link-padding: 0.6em;
 
 .navigation {
   flex: 1 0 10rem;
@@ -11,8 +11,8 @@ $_navigation-link-padding: 0.6em;
   color: $base-font-color;
   display: block;
   line-height: 1;
-  margin-left: -($_navigation-link-padding);
-  padding: $_navigation-link-padding;
+  margin-left: -($navigation-link-padding);
+  padding: $navigation-link-padding;
   transition: background-color $base-duration $base-timing,
               color $base-duration $base-timing;
 

data/app/assets/stylesheets/administrate/components/_search.scss

@@ -1,4 +1,4 @@
-$_search-icon-size: 1rem;
+$search-icon-size: 1rem;
 
 .search {
   margin-left: auto;
@@ -10,35 +10,35 @@ $_search-icon-size: 1rem;
 
 .search__input {
   border-radius: 100rem;
-  padding-left: $_search-icon-size * 2.5;
-  padding-right: $_search-icon-size * 2.5;
+  padding-left: $search-icon-size * 2.5;
+  padding-right: $search-icon-size * 2.5;
 }
 
 .search__eyeglass-icon {
   fill: $grey-7;
-  height: $_search-icon-size;
-  left: $_search-icon-size;
+  height: $search-icon-size;
+  left: $search-icon-size;
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  width: $_search-icon-size;
+  width: $search-icon-size;
 }
 
 .search__clear-link {
-  height: $_search-icon-size;
+  height: $search-icon-size;
   position: absolute;
-  right: $_search-icon-size * 0.75;
+  right: $search-icon-size * 0.75;
   top: 50%;
   transform: translateY(-50%);
-  width: $_search-icon-size;
+  width: $search-icon-size;
 }
 
 .search__clear-icon {
   fill: $grey-5;
-  height: $_search-icon-size;
+  height: $search-icon-size;
   position: absolute;
   transition: fill $base-duration $base-timing;
-  width: $_search-icon-size;
+  width: $search-icon-size;
 
   &:hover {
     fill: $action-color;

data/app/assets/stylesheets/administrate/library/_variables.scss

@@ -1,5 +1,7 @@
+/* stylelint-disable scss/dollar-variable-empty-line-before */
+
 // Typography
-$base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+$base-font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto",
   "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
   sans-serif !default;
 $heading-font-family: $base-font-family !default;
@@ -17,8 +19,8 @@ $base-spacing: $base-line-height * 1em !default;
 $small-spacing: $base-spacing * 0.5 !default;
 
 // Colors
-$white: #fff !default;
-$black: #000 !default;
+$white: #ffffff !default;
+$black: #000000 !default;
 
 $blue: #1976d2 !default;
 $red: #d32f2f !default;
@@ -63,3 +65,5 @@ $base-border: 1px solid $base-border-color !default;
 // Transitions
 $base-duration: 250ms !default;
 $base-timing: ease-in-out !default;
+
+/* stylelint-enable scss/dollar-variable-empty-line-before */

data/app/assets/stylesheets/administrate/reset/_normalize.scss

@@ -100,7 +100,13 @@ pre {
  * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
  */
 
-a {
+a,
+.link:is(
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"]
+) {
   background-color: transparent; /* 1 */
   -webkit-text-decoration-skip: objects; /* 2 */
 }

data/app/controllers/administrate/application_controller.rb

@@ -15,13 +15,13 @@ module Administrate
         resources: resources,
         search_term: search_term,
         page: page,
-        show_search_bar: show_search_bar?,
+        show_search_bar: show_search_bar?
       }
     end
 
     def show
       render locals: {
-        page: Administrate::Page::Show.new(dashboard, requested_resource),
+        page: Administrate::Page::Show.new(dashboard, requested_resource)
       }
     end
 
@@ -29,13 +29,13 @@ module Administrate
       resource = new_resource
       authorize_resource(resource)
       render locals: {
-        page: Administrate::Page::Form.new(dashboard, resource),
+        page: Administrate::Page::Form.new(dashboard, resource)
       }
     end
 
     def edit
       render locals: {
-        page: Administrate::Page::Form.new(dashboard, requested_resource),
+        page: Administrate::Page::Form.new(dashboard, requested_resource)
       }
     end
 
@@ -47,11 +47,11 @@ module Administrate
         yield(resource) if block_given?
         redirect_to(
           after_resource_created_path(resource),
-          notice: translate_with_resource("create.success"),
+          notice: translate_with_resource("create.success")
         )
       else
         render :new, locals: {
-          page: Administrate::Page::Form.new(dashboard, resource),
+          page: Administrate::Page::Form.new(dashboard, resource)
         }, status: :unprocessable_entity
       end
     end
@@ -61,10 +61,11 @@ module Administrate
         redirect_to(
           after_resource_updated_path(requested_resource),
           notice: translate_with_resource("update.success"),
+          status: :see_other
         )
       else
         render :edit, locals: {
-          page: Administrate::Page::Form.new(dashboard, requested_resource),
+          page: Administrate::Page::Form.new(dashboard, requested_resource)
         }, status: :unprocessable_entity
       end
     end
@@ -75,7 +76,7 @@ module Administrate
       else
         flash[:error] = requested_resource.errors.full_messages.join("<br/>")
       end
-      redirect_to after_resource_destroyed_path(requested_resource)
+      redirect_to after_resource_destroyed_path(requested_resource), status: :see_other
     end
 
     private
@@ -84,12 +85,12 @@ module Administrate
       Administrate::Search.new(
         resources,
         dashboard,
-        search_term,
+        search_term
       ).run
     end
 
     def after_resource_destroyed_path(_requested_resource)
-      { action: :index }
+      {action: :index}
     end
 
     def after_resource_created_path(requested_resource)
@@ -103,7 +104,7 @@ module Administrate
     helper_method :nav_link_state
     def nav_link_state(resource)
       underscore_resource = resource.to_s.split("/").join("__")
-      resource_name.to_s.pluralize == underscore_resource ? :active : :inactive
+      (resource_name.to_s.pluralize == underscore_resource) ? :active : :inactive
     end
 
     # Whether the named action route exists for the resource class.
@@ -141,8 +142,8 @@ module Administrate
         sorting_attribute,
         sorting_direction,
         association_attribute: order_by_field(
-          dashboard_attribute(sorting_attribute),
-        ),
+          dashboard_attribute(sorting_attribute)
+        )
       )
     end
 
@@ -201,9 +202,9 @@ module Administrate
     end
 
     def resource_params
-      params.require(resource_class.model_name.param_key).
-        permit(dashboard.permitted_attributes(action_name)).
-        transform_values { |v| read_param_value(v) }
+      params.require(resource_class.model_name.param_key)
+        .permit(dashboard.permitted_attributes(action_name))
+        .transform_values { |v| read_param_value(v) }
     end
 
     def read_param_value(data)
@@ -236,13 +237,13 @@ module Administrate
     def translate_with_resource(key)
       t(
         "administrate.controller.#{key}",
-        resource: resource_resolver.resource_title,
+        resource: resource_resolver.resource_title
       )
     end
 
     def show_search_bar?
       dashboard.attribute_types_for(
-        dashboard.all_attributes,
+        dashboard.all_attributes
       ).any? { |_name, attribute| attribute.searchable? }
     end
 
@@ -279,7 +280,7 @@ module Administrate
       else
         raise Administrate::NotAuthorizedError.new(
           action: action_name,
-          resource: resource,
+          resource: resource
         )
       end
     end