Skip to content

Commit ee9fbd5

Browse files
committed
Merge branch 'PC-82', remote-tracking branch 'origin' into PC-93
3 parents 62bdf77 + abe41e8 + 07fe925 commit ee9fbd5

12 files changed

Lines changed: 348 additions & 175 deletions

.rubocop.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,13 @@ Metrics/PerceivedComplexity:
101101
- spec/**/*_spec.rb
102102
- app/helpers/**/*.rb
103103
- config/**/*.rb
104+
105+
Metrics/ClassLength:
106+
Exclude:
107+
- db/seeds/**/*.rb
108+
- lib/tasks/**/*.rake
109+
- app/admin/**/*.rb
110+
- db/migrate/**/*.rb
111+
- spec/**/*_spec.rb
112+
- app/helpers/**/*.rb
113+
- config/**/*.rb

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem 'sass-rails', '~> 6.0.0' # Ruby on Ra
2020
gem "solid_cable", '~> 3.0.7' # Use the database-backed adapters for Action Cable
2121
gem "solid_cache", '~> 1.0.7' # Use the database-backed adapters for Rails.cache
2222
gem "solid_queue", '~> 1.1.4' # Use the database-backed adapters for Active Job
23-
gem "sprockets", '= 3.7.5' # Rack-based asset packaging system
23+
gem "sprockets", '~> 3.7.5' # Rack-based asset packaging system
2424
gem "sprockets-rails", '~> 3.5.2' # The asset pipeline for Rails
2525
gem "stimulus-rails", '~> 1.3.4' # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
2626
gem "thruster", '~> 0.1.12', require: false # Add HTTP asset caching/compression and X-Sendfile acceleration to Puma [https://github.com/basecamp/thruster/]

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ DEPENDENCIES
495495
solid_cable (~> 3.0.7)
496496
solid_cache (~> 1.0.7)
497497
solid_queue (~> 1.1.4)
498-
sprockets (= 3.7.5)
498+
sprockets (~> 3.7.5)
499499
sprockets-rails (~> 3.5.2)
500500
stimulus-rails (~> 1.3.4)
501501
thruster (~> 0.1.12)

app/assets/stylesheets/application/input.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,14 @@ textarea {
7878
width: 26px;
7979
cursor: pointer;
8080
}
81+
}
82+
83+
.pc-logo-uploader {
84+
width: 136px;
85+
height: 117px;
86+
87+
&-display {
88+
width: 130px;
89+
height: 110px;
90+
}
8191
}

app/javascript/components/ui/PcLogoUploader.jsx

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@ import { Form } from 'react-bootstrap'
44

55
export const PcLogoUploader = ({ id, logo, error, ...props }) => {
66
const logoDisplay = logo ?
7-
<img src={logo} alt="Logo"
8-
className={'object-fit-contain w-100 h-100'} />
9-
: <PcIcon name="placeholder" alt="Placeholder Logo" />
7+
(<img src={logo}
8+
alt="Logo"
9+
className={'pc-logo-uploader-display object-fit-contain'} />)
10+
: (<PcIcon name="placeholder" alt="Placeholder Logo" />)
1011

11-
return <Form.Group className="d-flex flex-column">
12-
<Form.Label htmlFor={id}
13-
className={'m-0 d-flex justify-content-center align-items-center h-100 w-100 bg-white border rounded border-primary p-1'}
14-
style={{ flexBasis: '117px', maxHeight: '117px' }}
15-
column={'sm'}>
16-
{logoDisplay}
17-
</Form.Label>
18-
<Form.Control
19-
id={id}
20-
className={'d-none'}
21-
type={'file'}
22-
{...props}
23-
/>
24-
{error && <div className="text-danger fs-12">{error}</div>}
25-
</Form.Group>
12+
return (
13+
<Form.Group className="d-flex flex-column">
14+
<Form.Label htmlFor={id}
15+
className={'pc-logo-uploader m-0 d-flex justify-content-center align-items-center bg-white border rounded border-primary p-1'}>
16+
{logoDisplay}
17+
</Form.Label>
18+
<Form.Control
19+
id={id}
20+
className={'d-none'}
21+
type={'file'}
22+
{...props}
23+
/>
24+
{error && <div className="text-danger fs-12">{error}</div>}
25+
</Form.Group>
26+
)
2627
}

db/cable_schema.rb

Lines changed: 0 additions & 11 deletions
This file was deleted.

db/cache_schema.rb

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
class CreateSolidQueueTables < ActiveRecord::Migration[8.0]
2+
def change
3+
create_table "solid_queue_blocked_executions", force: :cascade do |t|
4+
t.bigint "job_id", null: false
5+
t.string "queue_name", null: false
6+
t.integer "priority", default: 0, null: false
7+
t.string "concurrency_key", null: false
8+
t.datetime "expires_at", null: false
9+
t.datetime "created_at", null: false
10+
t.index %w[concurrency_key priority job_id], name: "index_solid_queue_blocked_executions_for_release"
11+
t.index %w[expires_at concurrency_key], name: "index_solid_queue_blocked_executions_for_maintenance"
12+
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
13+
end
14+
15+
create_table "solid_queue_claimed_executions", force: :cascade do |t|
16+
t.bigint "job_id", null: false
17+
t.bigint "process_id"
18+
t.datetime "created_at", null: false
19+
t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
20+
t.index %w[process_id job_id], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
21+
end
22+
23+
create_table "solid_queue_failed_executions", force: :cascade do |t|
24+
t.bigint "job_id", null: false
25+
t.text "error"
26+
t.datetime "created_at", null: false
27+
t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true
28+
end
29+
30+
create_table "solid_queue_jobs", force: :cascade do |t|
31+
t.string "queue_name", null: false
32+
t.string "class_name", null: false
33+
t.text "arguments"
34+
t.integer "priority", default: 0, null: false
35+
t.string "active_job_id"
36+
t.datetime "scheduled_at"
37+
t.datetime "finished_at"
38+
t.string "concurrency_key"
39+
t.datetime "created_at", null: false
40+
t.datetime "updated_at", null: false
41+
t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id"
42+
t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name"
43+
t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at"
44+
t.index %w[queue_name finished_at], name: "index_solid_queue_jobs_for_filtering"
45+
t.index %w[scheduled_at finished_at], name: "index_solid_queue_jobs_for_alerting"
46+
end
47+
48+
create_table "solid_queue_pauses", force: :cascade do |t|
49+
t.string "queue_name", null: false
50+
t.datetime "created_at", null: false
51+
t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true
52+
end
53+
54+
create_table "solid_queue_processes", force: :cascade do |t|
55+
t.string "kind", null: false
56+
t.datetime "last_heartbeat_at", null: false
57+
t.bigint "supervisor_id"
58+
t.integer "pid", null: false
59+
t.string "hostname"
60+
t.text "metadata"
61+
t.datetime "created_at", null: false
62+
t.string "name", null: false
63+
t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at"
64+
t.index %w[name supervisor_id], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
65+
t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id"
66+
end
67+
68+
create_table "solid_queue_ready_executions", force: :cascade do |t|
69+
t.bigint "job_id", null: false
70+
t.string "queue_name", null: false
71+
t.integer "priority", default: 0, null: false
72+
t.datetime "created_at", null: false
73+
t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true
74+
t.index %w[priority job_id], name: "index_solid_queue_poll_all"
75+
t.index %w[queue_name priority job_id], name: "index_solid_queue_poll_by_queue"
76+
end
77+
78+
create_table "solid_queue_recurring_executions", force: :cascade do |t|
79+
t.bigint "job_id", null: false
80+
t.string "task_key", null: false
81+
t.datetime "run_at", null: false
82+
t.datetime "created_at", null: false
83+
t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
84+
t.index %w[task_key run_at], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
85+
end
86+
87+
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
88+
t.string "key", null: false
89+
t.string "schedule", null: false
90+
t.string "command", limit: 2048
91+
t.string "class_name"
92+
t.text "arguments"
93+
t.string "queue_name"
94+
t.integer "priority", default: 0
95+
t.boolean "static", default: true, null: false
96+
t.text "description"
97+
t.datetime "created_at", null: false
98+
t.datetime "updated_at", null: false
99+
t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true
100+
t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static"
101+
end
102+
103+
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
104+
t.bigint "job_id", null: false
105+
t.string "queue_name", null: false
106+
t.integer "priority", default: 0, null: false
107+
t.datetime "scheduled_at", null: false
108+
t.datetime "created_at", null: false
109+
t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
110+
t.index %w[scheduled_at priority job_id], name: "index_solid_queue_dispatch_all"
111+
end
112+
113+
create_table "solid_queue_semaphores", force: :cascade do |t|
114+
t.string "key", null: false
115+
t.integer "value", default: 1, null: false
116+
t.datetime "expires_at", null: false
117+
t.datetime "created_at", null: false
118+
t.datetime "updated_at", null: false
119+
t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at"
120+
t.index %w[key value], name: "index_solid_queue_semaphores_on_key_and_value"
121+
t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true
122+
end
123+
124+
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
125+
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
126+
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
127+
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
128+
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
129+
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
130+
end
131+
end
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
class CreateSolidCacheTable < ActiveRecord::Migration[8.0]
2+
def change
3+
create_table "solid_cache_entries", force: :cascade do |t|
4+
t.binary "key", limit: 1024, null: false
5+
t.binary "value", limit: 536_870_912, null: false
6+
t.datetime "created_at", null: false
7+
t.integer "key_hash", limit: 8, null: false
8+
t.integer "byte_size", limit: 4, null: false
9+
t.index ["byte_size"], name: "index_solid_cache_entries_on_byte_size"
10+
t.index %w[key_hash byte_size], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
11+
t.index ["key_hash"], name: "index_solid_cache_entries_on_key_hash", unique: true
12+
end
13+
end
14+
end
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
class CreateSolidCableTable < ActiveRecord::Migration[8.0]
2+
def change
3+
create_table "solid_cable_messages", force: :cascade do |t|
4+
t.binary "channel", limit: 1024, null: false
5+
t.binary "payload", limit: 536_870_912, null: false
6+
t.datetime "created_at", null: false
7+
t.integer "channel_hash", limit: 8, null: false
8+
t.index ["channel"], name: "index_solid_cable_messages_on_channel"
9+
t.index ["channel_hash"], name: "index_solid_cable_messages_on_channel_hash"
10+
t.index ["created_at"], name: "index_solid_cable_messages_on_created_at"
11+
end
12+
end
13+
end

0 commit comments

Comments
 (0)