spree_backend 4.7.2 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64f6be6f1dc47fc136c7f99adf19acefe212624a332355954592d9b8ee86eee
-  data.tar.gz: af8d92cf1b6666f2f2c0488f4fce06f5bf26c2218a769ff8c3fdea0312ac8d86
+  metadata.gz: 3300d2767c8c33fab939d5c7c30dd41db56d9c422469820f8eaeef2bcf71ba6e
+  data.tar.gz: 745fb617eed98c7268c185eddc32eab136e6067624b712fbd85f9c777b520bbe
 SHA512:
-  metadata.gz: 5644b93458d102a9941ded9f1bb10f851cc538a69e3b3d5cba77e8f4a2062545a633d59b9ea6fc73db90a56e457e4b17886990fd86ea8775893627cd10fec553
-  data.tar.gz: 52f91826040b92c0ccc3e93e2c62b065b29de04ba9d1e9b31b18d03699d2388839fe46f411ea656c0a26cfd316c63513998e6fcfac391efc8e8ff4489ad07383
+  metadata.gz: e291674023a82d06681356deeffcfe747da3450e835f6fbbd7ca81be1782bc54be59471a9bf1040ea2ee0b685a30f7a2a2e20cda76d1c6a7b5c8b1016f797f0c
+  data.tar.gz: 27ca5a00563290b6523fa8ff3bcc73f00c8e4a250c319942e15f556c129021603f0555003603ac68f93e196b04cbb45b8dfb11f1ed619d5f3b814cc3c0edaaf7

data/.circleci/config.yml

@@ -10,24 +10,17 @@ defaults: &defaults
     RAILS_VERSION: '~> 7.1.0'
   working_directory: ~/spree
   docker:
-    - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
-    - image: &redis_image circleci/redis:6.2-alpine
+    - image: &ruby_image cimg/ruby:3.3.0-browsers
 
-defaults_3_2: &defaults_3_2
-  <<: *defaults
-  docker:
-    - image: &ruby_3_2_image cimg/ruby:3.2.0-browsers
-    - image: *redis_image
-
-run_tests_3_0: &run_tests_3_0
+run_tests: &run_tests
   <<: *defaults
   parallelism: 8
   steps:
     - checkout
     - restore_cache:
         keys:
-          - spree-dashboard-bundle-v10-ruby-3-0-{{ .Branch }}
-          - spree-dashboard-bundle-v10-ruby-3-0
+          - spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
+          - spree-storefront-bundle-{{ checksum ".ruby-version" }}
     - run:
         name: Add keyserver
         command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
@@ -35,20 +28,16 @@ run_tests_3_0: &run_tests_3_0
         name: Install libvips
         command: sudo apt-get update && sudo apt-get install libvips
     - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
+        name: Set bundle path
+        command: bundle config --local path vendor/bundle
     - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
+        name: Ensure Bundle Install
+        command: |
+          bundle check || bundle install
     - run:
         name: Create test app
         command: |
           bundle exec rake test_app
-    - run:
-        name: Unlink NPM package
-        command: |
-          cd spec/dummy && yarn unlink @spree/dashboard
     - run:
           name: Run Rspec
           command: |
@@ -60,57 +49,17 @@ run_tests_3_0: &run_tests_3_0
     - store_test_results:
           path: ~/rspec
     - store_artifacts:
-          path: /tmp/test-artifacts
-
-run_tests_3_2: &run_tests_3_2
-  <<: *defaults_3_2
-  parallelism: 8
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-dashboard-bundle-v10-ruby-3-2-{{ .Branch }}
-          - spree-dashboard-bundle-v10-ruby-3-2
-    - run:
-        name: Install libvips
-        command: sudo apt-get update && sudo apt-get install libvips42
-    - run:
-        name: Set bundle path
-        command: bundle config --local path vendor/bundle
-    - run:
-        name: Ensure bundle Install
-        command: |
-          bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-        name: Unlink NPM package
-        command: |
-          cd spec/dummy && yarn unlink @spree/dashboard
-    - run:
-        name: Run Rspec
-        command: |
-          TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-          bundle exec rspec --format documentation \
-                            --format RspecJunitFormatter \
-                            -o ~/rspec/rspec.xml \
-                            -- ${TESTFILES}
-    - store_test_results:
-        path: ~/rspec
-    - store_artifacts:
-        path: /tmp/test-artifacts
+          path: tmp/capybara
 
 jobs:
-  bundle_ruby_3_0:
+  bundle:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-dashboard-bundle-v10-ruby-3-0-{{ .Branch }}
-            - spree-dashboard-bundle-v10-ruby-3-0
+            - spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
+            - spree-storefront-bundle-{{ checksum ".ruby-version" }}
       - run:
           name: Add keyserver
           command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
@@ -127,84 +76,42 @@ jobs:
       - save_cache:
           paths:
             - vendor/bundle
-          key: spree-dashboard-bundle-v10-ruby-3-0-{{ checksum "Gemfile.lock" }}
+          key: spree-storefront-bundle-{{ checksum ".ruby-version" }}-{{ .Branch }}
 
-  bundle_ruby_3_2:
-    <<: *defaults_3_2
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-dashboard-bundle-v10-ruby-3-2-{{ .Branch }}
-            - spree-dashboard-bundle-v10-ruby-3-2
-      - run:
-          name: Install libvips
-          command: sudo apt-get update && sudo apt-get install libvips42
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-dashboard-bundle-v10-ruby-3-2-{{ checksum "Gemfile.lock" }}
-
-  tests_ruby_3_0_rails_7_0_postgres:
-    <<: *run_tests_3_0
-    environment:
+  tests_mysql:
+    <<: *run_tests
+    environment: &mysql_environment
       <<: *environment
-      DB: postgres
-      DB_HOST: localhost
-      DB_USERNAME: postgres
-      RAILS_VERSION: '~> 7.0.0'
+      DB: mysql
+      DB_HOST: 127.0.0.1
+      DB_USERNAME: root
+      COVERAGE: true
+      COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_3_0_image
-      - image: &postgres_image circleci/postgres:12-alpine
-        environment:
-          POSTGRES_USER: postgres
-      - image: *redis_image
+      - image: *ruby_image
+      - image: cimg/mysql:8.0
 
-  tests_ruby_3_2_rails_7_1_postgres:
-    <<: *run_tests_3_2
-    environment:
+  tests_postgres:
+    <<: *run_tests
+    environment: &postgres_environment
       <<: *environment
       DB: postgres
       DB_HOST: localhost
       DB_USERNAME: postgres
     docker:
-      - image: *ruby_3_2_image
-      - image: *postgres_image
-      - image: *redis_image
-
-  tests_ruby_3_2_rails_7_1_mysql:
-    <<: *run_tests_3_2
-    environment:
-      <<: *environment
-      DB: mysql
-      DB_HOST: 127.0.0.1
-      DB_USERNAME: root
-      COVERAGE: true
-      COVERAGE_DIR: /tmp/workspace/simplecov
-    docker:
-      - image: *ruby_3_2_image
-      - image: *redis_image
-      - image: &mysql_image circleci/mysql:8-ram
+      - image: *ruby_image
+      - image: cimg/postgres:16.2
+        environment:
+          POSTGRES_USER: postgres
 
 workflows:
   version: 2
   main:
     jobs:
-      - bundle_ruby_3_0
-      - bundle_ruby_3_2
-      - tests_ruby_3_2_rails_7_1_postgres:
-          requires:
-            - bundle_ruby_3_2
-      - tests_ruby_3_0_rails_7_0_postgres:
+      - bundle
+      - tests_postgres:
           requires:
-            - bundle_ruby_3_0
-      - tests_ruby_3_2_rails_7_1_mysql:
+            - bundle
+      - tests_mysql:
           requires:
-            - bundle_ruby_3_2
+            - bundle

data/.github/CONTRIBUTING.md

@@ -1 +1 @@
-Please visit [Contributing section](https://dev-docs.spreecommerce.org/contributing/index) of Spree Guides. Thank you!
+Please visit [Contributing section](https://docs.spreecommerce.org/developer/contributing/quickstart) of Spree Guides. Thank you!

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/Gemfile

@@ -16,8 +16,10 @@ end
 platforms :ruby do
   if ENV['DB'] == 'mysql'
     gem 'mysql2'
+  elsif ENV['DB'] == 'postgres'
+    gem 'pg'
   else
-    gem 'pg', '~> 1.1'
+    gem 'sqlite3', '~> 2.0'
   end
 end
 
@@ -56,12 +58,11 @@ group :test, :development do
 end
 
 group :development do
-  gem 'github_fast_changelog'
   gem 'solargraph'
 end
 
 
-spree_opts = { github: 'spree/spree', branch: '4-7-stable' }
+spree_opts = { github: 'spree/spree', branch: 'main' }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
 gemspec

data/README.md

@@ -4,7 +4,7 @@
 
 # Spree Admin Dashboard
 
-This is the default Spree Admin Dashboard. 
+This is the default Spree Admin Dashboard.
 
 ## Developed by
 
@@ -37,52 +37,19 @@ Default credentials:
 
 ## Installation
 
-Spree Admin Dashboard is bundled with [Spree Starter](https://github.com/spree/spree_starter) and we recommend following [Spree Getting Started guide](https://dev-docs.spreecommerce.org/getting-started/installation).
+Spree Admin Dashboard is bundled with [Spree Starter](https://github.com/spree/spree_starter) and we recommend following [Spree Getting Started guide](https://docs.spreecommerce.org/getting-started/installation).
 
-You can also [add Spree and Admin Dashboard to an existing Ruby on Rails application](https://dev-docs.spreecommerce.org/advanced/existing_app_tutorial) as well.
+You can also [add Spree and Admin Dashboard to an existing Ruby on Rails application](https://docs.spreecommerce.org/advanced/existing_app_tutorial) as well.
 
 ## Documentation
 
-* [Developer Documentation](https://dev-docs.spreecommerce.org/)
+* [Developer Documentation](https://docs.spreecommerce.org/)
 
 ## Contributing
 
 Spree Admin Dashboard is an open source project and we love contributions in any form - pull requests, issues, feature ideas!
 
-Please review the [Spree Contributing Guide](https://dev-docs.spreecommerce.org/contributing/index)
-
-### Development Setup (JavaScript)
-
-When working on the JavaScript in Spree Dashboard locally, you will need to yarn link your local development copy of `@spree/dashboard`, to the Rails app you are working in, so that your changes are picked up and represented live in the view.
-
-
-From the root of `spree_backend` run:
-
-```bash
-yarn link
-```
-
-Next, from the root of the Rails app you are using to develop run:
-
-```bash
-yarn link "@spree/dashboard"
-```
-
-Once your local Spree Dashboard is linked with the Rails app you are using for development you will need two terminal tabs open, 
-one at the root of your Rails app, and one at the root of `spree_backend`.
-
-In the terminal window at the root of the `spree_backend` run:
-
-```bash
-yarn watch
-```
-
-And from the Rails app you are using to run Spree and develop in run the following:
-
-```bash
-bin/dev
-```
-Any changes made to the JavaScript files in `spree_backend` will be processed by yarn and picked up in the Rails app you are running for development.
+Please review the [Spree Contributing Guide](https://docs.spreecommerce.org/developer/contributing/quickstart)
 
 ### Local setup
 

data/SECURITY.md

@@ -1 +1 @@
-Please see [Spree Guides Security section](https://dev-docs.spreecommerce.org/security/index).
+Please see [Spree Guides Security section](https://docs.spreecommerce.org/developer/security/quickstart).

data/app/assets/config/spree_backend_manifest.js

@@ -1,6 +1,9 @@
 //= link_tree ../images
 
-//= link spree-dashboard.js
+//= link_directory ../../javascript/spree/backend .js
+//= link_directory ../../javascript/spree/backend/controllers .js
+//= link_directory ../../javascript/spree/backend/helpers .js
+
 //= link spree/backend/all.js
 //= link spree/backend/all.css
 

data/app/assets/javascripts/spree/backend/global/_index.js

@@ -1,3 +1,4 @@
+//= require spree/backend/global/tooltips
 //= require spree/backend/global/alerts
 //= require spree/backend/global/animate_css
 //= require spree/backend/global/fetch_request_utility

data/app/assets/javascripts/spree/backend/global/tooltips.es6

@@ -0,0 +1,21 @@
+const initTooltips = () => {
+  $('.with-tip').each(function() {
+    $(this).tooltip()
+  })
+
+  $('.with-tip').on('show.bs.tooltip', function(event) {
+    if (('ontouchstart' in window)) {
+      event.preventDefault()
+    }
+  })
+}
+
+const removeTooltips = () => {
+  $('.with-tip').each(function() {
+    $(this).tooltip('dispose')
+  })
+}
+
+document.addEventListener("turbo:click", removeTooltips)
+document.addEventListener("turbo:load", initTooltips)
+document.addEventListener('turbo:frame-render', initTooltips)

data/app/assets/javascripts/spree/backend.js

@@ -10,6 +10,9 @@
 //= require tinymce
 //= require underscore-min.js
 //= require jsonapi-serializer.min
+//= require popper
+//= require bootstrap-sprockets
+//= require flatpickr
 
 //= require spree/backend/global/_index
 

data/app/assets/stylesheets/spree/backend/components/_buttons.scss

@@ -1,7 +1,3 @@
-.payment-action-save {
-  @include button-variant(theme-color('success'), theme-color('success'), theme-color('success') );
-}
-
 .btn,
 .nav-pills > li > a {
   vertical-align: middle;

data/app/assets/stylesheets/spree/backend/components/_navbar.scss

@@ -1,3 +1,7 @@
+.dropdown-menu {
+  @extend .shadow;
+}
+
 .header {
   .navbar {
     min-height:54px;
@@ -16,13 +20,6 @@
       }
     }
 
-    #accountNav {
-      i {
-        font-size: 1.3em;
-        line-height: 1rem;
-      }
-    }
-
     #storeSwitcherDropdown {
       .dropdown-menu.show {
         min-width: 250px;

data/app/assets/stylesheets/spree/backend/components/_tables.scss

@@ -19,7 +19,6 @@ table.table {
 
   thead {
     th {
-      text-transform: uppercase;
       font-size: $small-font-size;
       padding: 0.5rem;
       padding-top: 14px;

data/app/assets/stylesheets/spree/backend/global/_variables.scss

@@ -1,8 +1,22 @@
+// https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss
+
 $theme-colors: (
-  "primary": #4C75BA,
+  "primary": #000,
 );
 
-$enable-shadows: true;
+$enable-responsive-font-sizes: true;
+$font-family-sans-serif: "Inter", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-size-base:   0.813rem !default;
+$font-size-plus:   0.875rem !default;
+$font-size-sm:    0.75rem !default;
+$font-size-lg:    1rem !default;
+
+$border-radius: 0.5rem !default;
+$border-radius-sm: 0.4rem !default;
+$border-radius-lg: 0.75rem !default;
+
+$dropdown-item-padding-y:           .5rem !default;
+$dropdown-item-padding-x:           1rem !default;
 
 // https://github.com/twbs/bootstrap/issues/32019
 // we need this hotfix for sassc

data/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss

@@ -5,7 +5,7 @@ body.swal2-shown {
   }
   .swal2-html-container {
     text-align: left;
-    font-size: 0.9em;
+    font-size: 0.813rem !important;
 
     .alert-link {
       font-weight: 400;

data/app/assets/stylesheets/spree/backend/shared/_base.scss

@@ -44,8 +44,6 @@ div.admin-product-image-container {
   img {
     max-width: 100%;
     height: auto;
-    align-self: center;
-    transform: scale(1.6);
   }
 
   svg {

data/app/helpers/spree/admin/base_helper.rb

@@ -286,6 +286,14 @@ module Spree
       def taxon_wysiwyg_editor_enabled?
         Spree::Backend::Config[:taxon_wysiwyg_editor_enabled]
       end
+
+      def spree_admin_show_version?
+        can?(:admin, current_store) && Spree::Backend::RuntimeConfig[:admin_show_version]
+      end
+
+      def spree_update_available?
+        @spree_update_available ||= !Rails.env.test? && Spree::Admin::Updater.update_available?
+      end
     end
   end
 end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -301,7 +301,7 @@ module Spree
       end
 
       def page_header_back_button(url)
-        link_to url, class: 'btn btn-outline-info mr-3 pr-1' do
+        link_to url, class: 'btn btn-light mr-3 pr-1' do
           svg_icon name: 'chevron-left.svg', width: 15, height: 15
         end
       end

data/app/helpers/spree/admin/stores_helper.rb

@@ -16,14 +16,14 @@ module Spree
       def store_switcher_link(store)
         if current_store.id == store.id
           classes = 'disabled bg-light'
-          icon = svg_icon name: 'circle-fill.svg', width: '18', height: '18'
+          icon = svg_icon name: 'circle-fill.svg', width: '14', height: '14'
         else
           classes = nil
-          icon = svg_icon name: 'circle.svg', width: '18', height: '18'
+          icon = svg_icon name: 'circle.svg', width: '14', height: '14'
         end
 
         link_to icon + store.unique_name, spree.admin_url(host: store.formatted_url),
-                class: "#{classes} py-3 px-4 dropdown-item rounded", id: store.code, data: { turbo: false }
+                class: "#{classes} dropdown-item", id: store.code, data: { turbo: false }
       end
     end
   end

data/app/javascript/spree/backend/application.js

@@ -0,0 +1,5 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import "@hotwired/turbo-rails"
+import "@rails/request.js"
+import "controllers"
+import "helpers"

data/app/javascript/spree/{dashboard → backend}/controllers/clipboard_controller.js

@@ -4,7 +4,6 @@ export default class extends Controller {
   static targets = [ "source" ]
 
   copy(event) {
-    console.log(event)
     event.preventDefault()
     this.sourceTarget.select()
     document.execCommand("copy")

data/app/javascript/spree/backend/controllers/index.js

@@ -0,0 +1,11 @@
+// Import and register all your controllers from the importmap under controllers/*
+
+import { application } from "controllers/application"
+
+// Eager load all controllers defined in the import map under controllers/**/*_controller
+import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
+eagerLoadControllersFrom("controllers", application)
+
+// Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
+// import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading"
+// lazyLoadControllersFrom("controllers", application)

data/app/javascript/spree/{dashboard → backend}/controllers/sortable_tree_controller.js

@@ -1,6 +1,6 @@
 import { Controller } from "@hotwired/stimulus"
 import { Sortable } from "sortablejs"
-import { patch } from "../utilities/request_utility"
+import { patch } from "helpers"
 
 export default class extends Controller {
   static values = { handle: String }

data/app/javascript/spree/backend/helpers/index.js

@@ -0,0 +1 @@
+export * from "helpers/request_utility"

data/app/javascript/spree/{dashboard/utilities → backend/helpers}/request_utility.js

@@ -50,4 +50,4 @@ export function patch (url, options) {
 export function destroy (url, options) {
   const request = new FetchRequest("delete", url, options)
   return withProgress(request.perform())
-}
+}

data/app/models/spree/admin/actions/action.rb

@@ -3,7 +3,7 @@ module Spree
     module Actions
       class Action
         STYLE_CLASSES = {
-          ::Spree::Admin::Actions::ActionStyle::PRIMARY => 'btn-success',
+          ::Spree::Admin::Actions::ActionStyle::PRIMARY => 'btn-primary',
           ::Spree::Admin::Actions::ActionStyle::SECONDARY => 'btn-secondary',
           ::Spree::Admin::Actions::ActionStyle::LIGHT => 'btn-light'
         }

data/app/models/spree/admin/updater.rb

@@ -0,0 +1,35 @@
+require 'net/http'
+require 'json'
+require 'uri'
+
+module Spree
+  module Admin
+    class Updater
+      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'
+
+      @updates = nil
+
+      def self.update_available?
+        fetch_updates.any?
+      end
+
+      def self.fetch_updates
+        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{Spree.version}", expires_in: 1.day) do
+          uri = URI(SPREE_CLOUD_UPDATES_URL)
+          params = { version: Spree.version }
+          uri.query = URI.encode_www_form(params)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == 'https'
+          http.open_timeout = 1 # 1s timeout for opening the connection
+          http.read_timeout = 1 # 1s timeout for reading the response
+
+          response = http.get(uri)
+          return {} unless response.is_a?(Net::HTTPSuccess)
+
+          JSON.parse(response.body)
+        end
+      end
+    end
+  end
+end

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -21,7 +21,7 @@
   <div class="card-footer">
     <div class="row text-center pb-0">
       <div class="col-12 col-lg-6">
-        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :put, class: "btn btn-success" %>
+        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :put, class: "btn btn-primary" %>
       </div>
       <div class="col-12 col-lg-6">
         <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :put, class: "btn btn-danger" %>