geoblacklight_admin 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c753d49a11dda454f74746f46edbcbc094ab8ed65e5a6ea4a3addd1850efa9
-  data.tar.gz: db199042de538a4e2d0548db3444a86ef81b78f2d88216dfbcae1d05b53f9923
+  metadata.gz: 7684e47be28824d2066af09187c41a5f443cf3ead2ea32d83c22c7bb1b254c2d
+  data.tar.gz: d444226fbbacfcc2b344e595c8920758e0a75b7981c7202041063fd26d89fec1
 SHA512:
-  metadata.gz: 757f8f91ff005aeaa92a11dfa2d292b68383781cfdbd9cf9db5f54bb39aea4c25be30b81d9b493ee1383bcbb210d1239a68eab436c0d54e41078e69f14a11003
-  data.tar.gz: 107dbebee2ed281bd0284e2fe4e0b60c25344cc38952d6b3363703c3ffe4ae492fdcc6aac1d6da6f8b9f5caa825375e42e7c2d190da9202a5e7f835f27bb8335
+  metadata.gz: 89901b678a8a2e240d63297a8a23ecce61e24c15d2e622b333710dcc4ad4d976ec205b583b1abf4373fb398962812895599650864ddb170137c01ca00f2f756d
+  data.tar.gz: c07f011ff04015800cec00397e7bbf65ef33a8e0511e56e300930dfe1eb9d2c110148666e805f863e7bfc18aa7fe311887f9abc5c5839387a5afb0dbcd0f2d4f

data/README.md

@@ -43,6 +43,11 @@ When the .internal_test_app is built, edit `geoblacklight_admin_helper.rb`, and
 ```bash
 cd .internal_test_app
 bundle exec rake db:seed
+
+# JS was breaking in dev mode, had to add the yarn package below - EWL 6/5/23
+yarn add @babel/plugin-proposal-private-methods --dev
+
+# Run the app server
 bundle exec rake gbl_admin:server
 ```
 
@@ -72,13 +77,32 @@ You're now done generating the test app and populating the Elements / FormElemen
 * ~~Add GBL Admin link to nav~~
 * ~~Routes - Get devise user~~
 * ~~No route matches [GET] "/users/sign_out"~~
-* Bookmarks need to be Admin::Bookmarks
+* ~~Bookmarks need to be Admin::Bookmarks~~
+* GitHub Actions / CI integration
+* Port the GEOMG test suite
 * Remove legacy GEOMG / B1G everywhere...
 * Send GBLADMIN JavaScript pack to NPM like Blacklight
-* Port the GEOMG test suite
-* GitHub Actions / CI integration
 * Project gem dependency injection redundancy...
 * Likely a lot more polish to be uncovered...
 
 
+# To Run Project
+drop and create databases (or engine_cart will fail)
+cd project root
+bundle exec rake engine_cart:regenerate
+
+## Run Solr
+bin/rails geoblacklight:solr
+
+## Run App
+cd .internal_test_app
+bundle exec rails server
+
+## Test App
+bundle exec rails test
+cd .internal_test_app
+rake db:seed
+rake geomg:solr:reindex
 
+# @TODO: Add chosen.js css
+# @TODO: Fix missing select form-control class

data/Rakefile

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
+require "rubygems"
 require "rails"
-begin
-  require "bundler/setup"
-  require "bundler/gem_tasks"
-rescue LoadError
-  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
-end
 
-Bundler::GemHelper.install_tasks
+require "bundler/setup"
+
+# Not using test/dummy app; using engine_cart
+# APP_RAKEFILE = File.expand_path(".internal_test_app/Rakefile", __dir__) if
+# load "rails/tasks/engine.rake"
+
+load "rails/tasks/statistics.rake"
+
+require "bundler/gem_tasks"
 
 require "solr_wrapper"
 
@@ -23,12 +26,25 @@ require "engine_cart/rake_task"
 require "geoblacklight_admin/version"
 
 desc "Run test suite"
-task ci: ["engine_cart:generate"] do
-  ENV["environment"] = "test"
-  # run the tests
-  Rake::Task["test"].invoke
+task "ci" do
+  ENV["RAILS_ENV"] = "test"
+  system("RAILS_ENV=test bundle exec rake test") || false
+  # system("RAILS_ENV=test bundle exec rake geomg:solr:reindex") || false
 end
 
+require "rake/testtask"
+
+# Searches for files ending in _test.rb in the test directory
+Rake::TestTask.new do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = true
+end
+
+# Will use test as defaut task if rake is run by itself
+task default: :test
+
 namespace :geoblacklight do
   namespace :internal do
     task seed: ["engine_cart:generate"] do
@@ -51,7 +67,9 @@ namespace :geoblacklight do
     end
 
     SolrWrapper.wrap(port: "8983") do |solr|
-      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path(".", File.dirname(__FILE__)), "solr", "conf")) do
+      solr.with_collection(name: "blacklight-core",
+        dir: File.join(File.expand_path(".", File.dirname(__FILE__)),
+          "solr", "conf")) do
         Rake::Task["geoblacklight:internal:seed"].invoke
 
         within_test_app do

data/app/assets/javascripts/geoblacklight_admin.js

@@ -12,6 +12,7 @@
 //
 
 //= require jquery3
+//= require rails-ujs
 //= require cocoon
 //= require chosen-jquery/lib/chosen.jquery.js
 

data/app/assets/stylesheets/geoblacklight_admin/_core.scss

@@ -19,6 +19,7 @@
 // Modules
 @import "modules/autocomplete";
 @import "modules/blazer";
+@import "modules/chosen";
 @import "modules/code";
 @import "modules/datepicker";
 @import "modules/elements";
@@ -44,4 +45,8 @@ footer {
 
 div.container-fluid {
   margin-top: 5rem;
+}
+
+.navbar-brand.gbl-admin {
+  background: none;
 }

data/app/assets/stylesheets/geoblacklight_admin/modules/_chosen.scss

@@ -0,0 +1,425 @@
+$chosen-sprite: image-url('chosen-sprite.png') !default;
+$chosen-sprite-retina: image-url('chosen-sprite@2x.png') !default;
+
+/* @group Base */
+.chosen-container {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 13px;
+  user-select: none;
+  * {
+    box-sizing: border-box;
+  }
+  .chosen-drop {
+    position: absolute;
+    top: 100%;
+    z-index: 1010;
+    width: 100%;
+    border: 1px solid #aaa;
+    border-top: 0;
+    background: #fff;
+    box-shadow: 0 4px 5px rgba(#000,.15);
+    clip: rect(0,0,0,0);
+    clip-path: inset(100% 100%);
+  }
+  &.chosen-with-drop .chosen-drop {
+    clip: auto;
+    clip-path: none;
+  }
+  a{
+    cursor: pointer;
+  }
+
+  .search-choice, .chosen-single{
+    .group-name{
+      margin-right: 4px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      font-weight: normal;
+      color: #999999;
+      &:after {
+        content: ":";
+        padding-left: 2px;
+        vertical-align: top;
+      }
+    }
+  }
+}
+/* @end */
+
+/* @group Single Chosen */
+.chosen-container-single{
+  .chosen-single {
+    position: relative;
+    display: block;
+    overflow: hidden;
+    padding: 0 0 0 8px;
+    height: 25px;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    background-color: #fff;
+    background: linear-gradient(#fff 20%, #f6f6f6 50%, #eee 52%, #f4f4f4 100%);
+    background-clip: padding-box;
+    box-shadow: 0 0 3px #fff inset, 0 1px 1px rgba(#000,.1);
+    color: #444;
+    text-decoration: none;
+    white-space: nowrap;
+    line-height: 24px;
+  }
+  .chosen-default {
+    color: #999;
+  }
+  .chosen-single span {
+    display: block;
+    overflow: hidden;
+    margin-right: 26px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .chosen-single-with-deselect span {
+    margin-right: 38px;
+  }
+  .chosen-single abbr {
+    position: absolute;
+    top: 6px;
+    right: 26px;
+    display: block;
+    width: 12px;
+    height: 12px;
+    background: $chosen-sprite -42px 1px no-repeat;
+    font-size: 1px;
+    &:hover {
+      background-position: -42px -10px;
+    }
+  }
+  &.chosen-disabled .chosen-single abbr:hover {
+    background-position: -42px -10px;
+  }
+  .chosen-single div {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: block;
+    width: 18px;
+    height: 100%;
+    b {
+      display: block;
+      width: 100%;
+      height: 100%;
+      background: $chosen-sprite no-repeat 0px 2px;
+    }
+  }
+  .chosen-search {
+    position: relative;
+    z-index: 1010;
+    margin: 0;
+    padding: 3px 4px;
+    white-space: nowrap;
+
+    input[type="text"] {
+      margin: 1px 0;
+      padding: 4px 20px 4px 5px;
+      width: 100%;
+      height: auto;
+      outline: 0;
+      border: 1px solid #aaa;
+      background: $chosen-sprite no-repeat 100% -20px;
+      font-size: 1em;
+      font-family: sans-serif;
+      line-height: normal;
+      border-radius: 0;
+    }
+  }
+  .chosen-drop {
+    margin-top: -1px;
+    border-radius: 0 0 4px 4px;
+    background-clip: padding-box;
+  }
+  &.chosen-container-single-nosearch .chosen-search {
+    position: absolute;
+    clip: rect(0,0,0,0);
+    clip-path: inset(100% 100%);
+  }
+}
+/* @end */
+
+/* @group Results */
+.chosen-container .chosen-results {
+  color: #444;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin: 0 4px 4px 0;
+  padding: 0 0 0 4px;
+  max-height: 240px;
+  -webkit-overflow-scrolling: touch;
+  li {
+    display: none;
+    margin: 0;
+    padding: 5px 6px;
+    list-style: none;
+    line-height: 15px;
+    word-wrap: break-word;
+    -webkit-touch-callout: none;
+    &.active-result {
+      display: list-item;
+      cursor: pointer;
+    }
+    &.disabled-result {
+      display: list-item;
+      color: #ccc;
+      cursor: default;
+    }
+    &.highlighted {
+      background-color: #3875d7;
+      background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+      color: #fff;
+    }
+    &.no-results {
+      color: #777;
+      display: list-item;
+      background: #f4f4f4;
+    }
+    &.group-result {
+      display: list-item;
+      font-weight: bold;
+      cursor: default;
+    }
+    &.group-option {
+      padding-left: 15px;
+    }
+    em {
+      font-style: normal;
+      text-decoration: underline;
+    }
+  }
+}
+/* @end */
+
+/* @group Multi Chosen */
+.chosen-container-multi{
+  .chosen-choices {
+    position: relative;
+    overflow: hidden;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%;
+    height: auto;
+    border: 1px solid #aaa;
+    background-color: #fff;
+    background-image: linear-gradient(#eee 1%, #fff 15%);
+    cursor: text;
+  }
+  .chosen-choices li {
+    float: left;
+    list-style: none;
+    &.search-field {
+      margin: 0;
+      padding: 0;
+      white-space: nowrap;
+      input[type="text"] {
+        margin: 1px 0;
+        padding: 0;
+        height: 25px;
+        outline: 0;
+        border: 0 !important;
+        background: transparent !important;
+        box-shadow: none;
+        color: #999;
+        font-size: 100%;
+        font-family: sans-serif;
+        line-height: normal;
+        border-radius: 0;
+        width: 25px;
+      }
+    }
+    &.search-choice {
+      position: relative;
+      margin: 3px 5px 3px 0;
+      padding: 3px 20px 3px 5px;
+      border: 1px solid #aaa;
+      max-width: 100%;
+      border-radius: 3px;
+      background-color: #eeeeee;
+      background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+      background-size: 100% 19px;
+      background-repeat: repeat-x;
+      background-clip: padding-box;
+      box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(#000,.05);
+      color: #333;
+      line-height: 13px;
+      cursor: default;
+      span {
+        word-wrap: break-word;
+      }
+      .search-choice-close {
+        position: absolute;
+        top: 4px;
+        right: 3px;
+        display: block;
+        width: 12px;
+        height: 12px;
+        background: $chosen-sprite -42px 1px no-repeat;
+        font-size: 1px;
+        &:hover {
+          background-position: -42px -10px;
+        }
+      }
+    }
+    &.search-choice-disabled {
+      padding-right: 5px;
+      border: 1px solid #ccc;
+      background-color: #e4e4e4;
+      background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+      color: #666;
+    }
+    &.search-choice-focus {
+      background: #d4d4d4;
+      .search-choice-close {
+        background-position: -42px -10px;
+      }
+    }
+  }
+  .chosen-results {
+    margin: 0;
+    padding: 0;
+  }
+  .chosen-drop .result-selected {
+    display: list-item;
+    color: #ccc;
+    cursor: default;
+  }
+}
+/* @end */
+
+/* @group Active  */
+.chosen-container-active{
+  .chosen-single {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(#000,.3);
+  }
+  &.chosen-with-drop{
+    .chosen-single {
+      border: 1px solid #aaa;
+      -moz-border-radius-bottomright: 0;
+      border-bottom-right-radius: 0;
+      -moz-border-radius-bottomleft: 0;
+      border-bottom-left-radius: 0;
+      background-image: linear-gradient(#eee 20%, #fff 80%);
+      box-shadow: 0 1px 0 #fff inset;
+    }
+    .chosen-single div {
+      border-left: none;
+      background: transparent;
+      b {
+        background-position: -18px 2px;
+      }
+    }
+  }
+  .chosen-choices {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(#000,.3);
+    li.search-field input[type="text"] {
+      color: #222 !important;
+    }
+  }
+}
+/* @end */
+
+/* @group Disabled Support */
+.chosen-disabled {
+  opacity: 0.5 !important;
+  cursor: default;
+  .chosen-single {
+    cursor: default;
+  }
+  .chosen-choices .search-choice .search-choice-close {
+    cursor: default;
+  }
+}
+/* @end */
+
+/* @group Right to Left */
+.chosen-rtl {
+  text-align: right;
+  .chosen-single {
+    overflow: visible;
+    padding: 0 8px 0 0;
+  }
+  .chosen-single span {
+    margin-right: 0;
+    margin-left: 26px;
+    direction: rtl;
+  }
+  .chosen-single-with-deselect span {
+    margin-left: 38px;
+  }
+  .chosen-single div {
+    right: auto;
+    left: 3px;
+  }
+  .chosen-single abbr {
+    right: auto;
+    left: 26px;
+  }
+  .chosen-choices li {
+    float: right;
+    &.search-field input[type="text"] {
+      direction: rtl;
+    }
+    &.search-choice {
+      margin: 3px 5px 3px 0;
+      padding: 3px 5px 3px 19px;
+      .search-choice-close {
+        right: auto;
+        left: 4px;
+      }
+    }
+  }
+  &.chosen-container-single .chosen-results {
+    margin: 0 0 4px 4px;
+    padding: 0 4px 0 0;
+  }
+  .chosen-results li.group-option {
+    padding-right: 15px;
+    padding-left: 0;
+  }
+  &.chosen-container-active.chosen-with-drop .chosen-single div {
+    border-right: none;
+  }
+  .chosen-search input[type="text"] {
+    padding: 4px 5px 4px 20px;
+    background: $chosen-sprite no-repeat -30px -20px;
+    direction: rtl;
+  }
+  &.chosen-container-single{
+    .chosen-single div b {
+      background-position: 6px 2px;
+    }
+    &.chosen-with-drop{
+      .chosen-single div b {
+        background-position: -12px 2px;
+      }
+    }
+  }
+}
+
+/* @end */
+
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
+  .chosen-rtl .chosen-search input[type="text"],
+  .chosen-container-single .chosen-single abbr,
+  .chosen-container-single .chosen-single div b,
+  .chosen-container-single .chosen-search input[type="text"],
+  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+  .chosen-container .chosen-results-scroll-down span,
+  .chosen-container .chosen-results-scroll-up span {
+    background-image: $chosen-sprite-retina !important;
+    background-size: 52px 37px !important;
+    background-repeat: no-repeat !important;
+  }
+}
+/* @end */

data/app/controllers/admin/admin_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Admin
   class AdminController < ApplicationController
     include Devise::Controllers::Helpers
     include Pagy::Backend
-    layout 'admin/layouts/application'
+    layout "admin/layouts/application"
 
     before_action :authenticate_admin!
 
@@ -13,4 +15,4 @@ module Admin
       redirect_to :somewhere, status: :forbidden unless current_user.admin?
     end
   end
-end
+end