Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parallel: true
format: progress
ruby_version: 3.1
ignore:
- "*/spec/dummy/**/*"
- "sandbox/**/*"
96 changes: 47 additions & 49 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,86 +1,84 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"

gemspec require: false

# rubocop:disable Bundler/DuplicatedGem
if /(stable|main)/.match? ENV['RAILS_VERSION']
gem 'rails', github: 'rails', require: false, branch: ENV['RAILS_VERSION']
if /(stable|main)/.match? ENV["RAILS_VERSION"]
gem "rails", github: "rails", require: false, branch: ENV["RAILS_VERSION"]
else
gem 'rails', ENV['RAILS_VERSION'] || ['> 7.0', '< 8.1.0.beta1'], require: false
gem "rails", ENV["RAILS_VERSION"] || ["> 7.0", "< 8.1.0.beta1"], require: false
end
# rubocop:enable Bundler/DuplicatedGem

gem "debug"
gem 'launchy', require: false

dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
gem 'sqlite3', '>= 2.1', require: false if dbs.match?(/all|sqlite/)

gem 'database_cleaner', '~> 2.0', require: false
gem 'rspec-activemodel-mocks', '~> 1.1', require: false
gem 'rspec-rails', '~> 6.0.3', require: false
gem 'rspec-retry', '~> 0.6.2', require: false
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'rack', '< 3', require: false
gem 'rake', require: false, groups: [:lint, :release]
gem 'rails-controller-testing', require: false
gem 'puma', '< 7', require: false
gem 'i18n-tasks', '~> 0.9', require: false
gem 'rspec_junit_formatter', require: false
gem 'yard', require: false
gem 'db-query-matchers', require: false
gem "launchy", require: false

dbs = ENV["DB_ALL"] ? "all" : ENV.fetch("DB", "sqlite")
gem "mysql2", "~> 0.5.0", require: false if dbs.match?(/all|mysql/)
gem "pg", "~> 1.0", require: false if dbs.match?(/all|postgres/)
gem "fast_sqlite", require: false if dbs.match?(/all|sqlite/)
gem "sqlite3", ">= 2.1", require: false if dbs.match?(/all|sqlite/)

gem "database_cleaner", "~> 2.0", require: false
gem "rspec-activemodel-mocks", "~> 1.1", require: false
gem "rspec-rails", "~> 6.0.3", require: false
gem "rspec-retry", "~> 0.6.2", require: false
gem "simplecov", require: false
gem "simplecov-cobertura", require: false
gem "rack", "< 3", require: false
gem "rake", require: false, groups: [:lint, :release]
gem "rails-controller-testing", require: false
gem "puma", "< 7", require: false
gem "i18n-tasks", "~> 0.9", require: false
gem "rspec_junit_formatter", require: false
gem "yard", require: false
gem "db-query-matchers", require: false

# Ensure the requirement is also updated in core/lib/spree/testing_support/factory_bot.rb
gem 'factory_bot_rails', '>= 4.8', require: false
gem "factory_bot_rails", ">= 4.8", require: false

group :backend do
gem 'capybara', '~> 3.13', require: false
gem 'capybara-screenshot', '>= 1.0.18', require: false
gem 'selenium-webdriver', require: false
gem "capybara", "~> 3.13", require: false
gem "capybara-screenshot", ">= 1.0.18", require: false
gem "selenium-webdriver", require: false

# JavaScript testing
gem 'teaspoon', require: false
gem 'teaspoon-mocha', require: false
gem 'webrick', require: false
gem "teaspoon", require: false
gem "teaspoon-mocha", require: false
gem "webrick", require: false
end

group :admin do
gem 'tailwindcss-rails', '~> 3.0', require: false
gem "tailwindcss-rails", "~> 3.0", require: false
end

group :admin, :legacy_promotions, :promotions do
gem 'solidus_admin', path: 'admin', require: false
gem 'axe-core-rspec', '~> 4.8', require: false
gem 'axe-core-capybara', '~> 4.8', require: false
gem "solidus_admin", path: "admin", require: false
gem "axe-core-rspec", "~> 4.8", require: false
gem "axe-core-capybara", "~> 4.8", require: false
end

group :legacy_promotions, :promotions do
gem 'solidus_legacy_promotions', path: 'legacy_promotions', require: false
gem 'solidus_backend', path: 'backend', require: false
gem "solidus_legacy_promotions", path: "legacy_promotions", require: false
gem "solidus_backend", path: "backend", require: false
end

group :promotions do
gem 'solidus_promotions', path: 'promotions', require: false
gem 'shoulda-matchers', '~> 5.0', require: false
gem "solidus_promotions", path: "promotions", require: false
gem "shoulda-matchers", "~> 5.0", require: false
end

group :lint do
gem 'erb-formatter', '~> 0.7', require: false
gem 'rubocop', '~> 1', require: false
gem 'rubocop-performance', '~> 1.4', require: false
gem 'rubocop-rails', '~> 2.9', require: false
gem "erb-formatter", "~> 0.7", require: false
gem "standard", "~> 1.50", require: false
end

group :release do
gem 'octokit', '~> 7.1', require: false
gem 'faraday-retry', '~> 2.0', require: false
gem "octokit", "~> 7.1", require: false
gem "faraday-retry", "~> 2.0", require: false
end

custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
eval File.read(custom_gemfile), nil, custom_gemfile, 0 if File.exist?(custom_gemfile)
custom_gemfile = File.expand_path("Gemfile-custom", __dir__)
eval File.read(custom_gemfile), nil, custom_gemfile, 0 if File.exist?(custom_gemfile) # rubocop:disable Security/Eval
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

import 'tasks/cleaning.rake'
import 'tasks/releasing.rake'
import 'tasks/testing.rake'
import 'tasks/linting.rake'
import "tasks/cleaning.rake"
import "tasks/releasing.rake"
import "tasks/testing.rake"
import "tasks/linting.rake"
30 changes: 15 additions & 15 deletions admin/Rakefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# frozen_string_literal: true

require 'rubygems'
require 'rake'
require 'rake/testtask'
require 'rspec/core/rake_task'
require 'spree/testing_support/dummy_app/rake_tasks'
require 'solidus_admin/testing_support/dummy_app/rake_tasks'
require 'bundler/gem_tasks'
require "rubygems"
require "rake"
require "rake/testtask"
require "rspec/core/rake_task"
require "spree/testing_support/dummy_app/rake_tasks"
require "solidus_admin/testing_support/dummy_app/rake_tasks"
require "bundler/gem_tasks"

namespace :tailwindcss do
tailwindcss_command = [
Expand All @@ -18,31 +18,31 @@ namespace :tailwindcss do
"--input",
"#{__dir__}/app/assets/stylesheets/solidus_admin/application.tailwind.css",
"--output",
"#{__dir__}/app/assets/builds/solidus_admin/tailwind.css",
"#{__dir__}/app/assets/builds/solidus_admin/tailwind.css"
]

desc 'Build Tailwind CSS'
desc "Build Tailwind CSS"
task :build do
sh tailwindcss_command.shelljoin
end

desc 'Watch Tailwind CSS'
desc "Watch Tailwind CSS"
task :watch do
sh (tailwindcss_command + ['--watch']).shelljoin
sh (tailwindcss_command + ["--watch"]).shelljoin
end
end

task build: 'tailwindcss:build'
task build: "tailwindcss:build"

RSpec::Core::RakeTask.new
task default: :spec

DummyApp::RakeTasks.new(
gem_root: File.expand_path(__dir__),
lib_name: 'solidus_admin'
lib_name: "solidus_admin"
)

task test_app: 'db:reset'
task test_app: "db:reset"

# Namespace release tags, e.g. 'solidus_admin/v1.2.3'
Bundler::GemHelper.tag_prefix = 'solidus_admin/'
Bundler::GemHelper.tag_prefix = "solidus_admin/"
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ def search_key
def page_actions
render component("ui/button").new(
tag: :a,
text: t('.add'),
text: t(".add"),
href: solidus_admin.new_adjustment_reason_path(**search_filter_params),
data: { turbo_frame: :resource_form },
data: {turbo_frame: :resource_form},
icon: "add-line",
class: "align-self-end w-full",
class: "align-self-end w-full"
)
end

Expand All @@ -37,11 +37,11 @@ def edit_path(adjustment_reason)
def batch_actions
[
{
label: t('.batch_actions.delete'),
label: t(".batch_actions.delete"),
action: solidus_admin.adjustment_reasons_path(**search_filter_params),
method: :delete,
icon: 'delete-bin-7-line',
},
icon: "delete-bin-7-line"
}
]
end

Expand All @@ -51,24 +51,24 @@ def columns
header: :name,
data: ->(adjustment_reason) do
link_to adjustment_reason.name, edit_path(adjustment_reason),
class: 'body-link',
data: { turbo_frame: :resource_form }
class: "body-link",
data: {turbo_frame: :resource_form}
end
},
{
header: :code,
data: ->(adjustment_reason) do
link_to adjustment_reason.code, edit_path(adjustment_reason),
class: 'body-link',
data: { turbo_frame: :resource_form }
class: "body-link",
data: {turbo_frame: :resource_form}
end
},
{
header: :active,
data: ->(adjustment_reason) do
adjustment_reason.active? ? component('ui/badge').yes : component('ui/badge').no
adjustment_reason.active? ? component("ui/badge").yes : component("ui/badge").no
end
},
}
]
end
end
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/base_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ def icon_tag(name, **attrs)
def missing_translation(key, options)
keys = I18n.normalize_keys(options[:locale] || I18n.locale, key, options[:scope])

logger.debug " [#{self.class}] Missing translation: #{keys.join('.')}"
logger.debug " [#{self.class}] Missing translation: #{keys.join(".")}"

if (options[:locale] || I18n.default_locale) != :en
t(key, **options, locale: :en)
else
"translation missing: #{keys.join('.')}"
"translation missing: #{keys.join(".")}"
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SolidusAdmin::Layout::Flashes::Alerts::Component < SolidusAdmin::BaseCompo
# and default title (see +SolidusAdmin::UI::Alert::Component+).
def initialize(alerts:)
if alerts.is_a?(String)
alerts = { danger: { message: alerts } }
alerts = {danger: {message: alerts}}
end

@alerts = alerts.slice(*SolidusAdmin::UI::Alert::Component::SCHEMES.keys)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def locale_options_for_select(available_locales)
available_locales.map do |locale|
[
t("spree.i18n.this_file_language", locale:, default: locale.to_s, fallback: false),
locale,
locale
]
end.sort
end
Expand All @@ -22,14 +22,14 @@ def theme_options_for_select
end

def autosubmit_select_tag(name, options, icon:, &block)
form_tag(request.fullpath, method: :get, 'data-turbo': false, class: "w-full") do
form_tag(request.fullpath, method: :get, "data-turbo": false, class: "w-full") do
safe_join([
block_given? ? capture(&block) : nil,
tag.label(safe_join([
icon_tag(icon, class: "w-full max-w-[20px] h-5 fill-current shrink"),
tag.select(options, name:, onchange: "this.form.requestSubmit()", class: "w-full appearance-none grow bg-transparent outline-none"),
icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink"),
]), class: "flex gap-2 items-center px-2"),
icon_tag("expand-up-down-line", class: "w-full max-w-[20px] h-5 fill-current shrink")
]), class: "flex gap-2 items-center px-2")
])
end
end
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/layout/page_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def page(**attrs, &block)

def page_header_actions(&block)
tag.div(safe_join([
capture(&block),
capture(&block)
]), class: "flex gap-2 items-center")
end

Expand All @@ -19,7 +19,7 @@ def page_header_back(back_path)
def page_header_title(title, &block)
tag.h1(safe_join([
tag.span(title, class: "font-semibold text-xl"),
(capture(&block) if block_given?) || "",
(capture(&block) if block) || ""
]), class: "flex-1 text-2xl font-bold")
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ def initialize(href:)

def call
link_to t(".skip_link"),
@href,
class: %{
@href,
class: %(
sr-only
focus:not-sr-only
inline-block
Expand All @@ -17,6 +17,6 @@ def call
font-normal text-sm
text-white
bg-black
}
)
end
end
Loading
Loading