Merge remote-tracking branch 'origin/dev' into feature/71380-inplace-edit-for-project-attributes-on-project-overview-page

Author: HDinger

.env.example

@@ -48,10 +48,15 @@ FE_PORT=4200
 OPENPROJECT_COLLABORATIVE__EDITING__HOCUSPOCUS__URL=ws://localhost:1234
 OPENPROJECT_COLLABORATIVE__EDITING__HOCUSPOCUS__SECRET=secret12345
 
+# Hocuspocus (collaborative editing) - docker dev development
+# OPENPROJECT_COLLABORATIVE__EDITING__HOCUSPOCUS__URL=wss://hocuspocus.local
+# OPENPROJECT_COLLABORATIVE__EDITING__HOCUSPOCUS__SECRET=secret12345
+
 # Default TLD for docker dev stack (e.g. when set to "local", services will be openproject.local, nextcloud.local, etc.)
 OPENPROJECT_DOCKER_DEV_TLD=local
 
 # Use this variables to configure hostnames for frontend and backend, e.g. to enable HTTPS in docker development setup
+# For docker development: openproject.local and localhost for "local" development
 OPENPROJECT_DEV_HOST=localhost
 OPENPROJECT_DEV_URL=http://${OPENPROJECT_DEV_HOST}:${FE_PORT}
 

.github/workflows/cla.yml

@@ -59,6 +59,7 @@ jobs:
             dominic-braeunlein,
             dsteiner,
             dtohmucu,
+            fereshtehnm,
             gleone-art,
             ihor-khomenko,
             judithroth,

.github/workflows/docker.yml

@@ -192,18 +192,18 @@ jobs:
           echo "https://github.com/opf/openproject/commits/${{ inputs.branch }}" > PRODUCT_URL
           date -u +"%Y-%m-%dT%H:%M:%SZ" > RELEASE_DATE
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           context: git
           labels: |
@@ -228,7 +228,7 @@ jobs:
           sed -i 's/vendor\/bundle//g' .dockerignore
       - name: Build image
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -273,7 +273,7 @@ jobs:
             --platform "${{ matrix.platform }}"
       - name: Push image
         id: push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -324,10 +324,10 @@ jobs:
           if [ "$suffix" = "-all-in-one" ]; then suffix="" ; fi
           echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ needs.setup.outputs.registry_image }}
           labels: |
@@ -342,7 +342,7 @@ jobs:
           tags: |
             ${{ needs.setup.outputs.docker_tags }}
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/hocuspocus-docker.yml

@@ -83,20 +83,20 @@ jobs:
           echo $REGISTRY:$LATEST_TAG >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build and push
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: extensions/op-blocknote-hocuspocus
           push: true

.rubocop.yml

@@ -226,6 +226,10 @@ Rails/SkipsModelValidations:
 RSpecRails/HttpStatus:
   Enabled: false
 
+# The block form of `travel_to` is often the tighter and safer option in our Rails specs.
+RSpecRails/TravelAround:
+  Enabled: false
+
 # expect not_to change is not working as expected
 # if you chain it with multiple expected changes
 RSpec/ChangeByZero:

.ruby-version

@@ -1 +1 @@
-3.4.7
+4.0.1

Gemfile

@@ -69,7 +69,7 @@ gem "scimitar", "~> 2.13"
 gem "acts_as_list", "~> 1.2.6"
 gem "acts_as_tree", "~> 2.9.0"
 gem "awesome_nested_set", "~> 3.9.0"
-gem "closure_tree", "~> 9.6.0"
+gem "closure_tree", "~> 9.6.1"
 gem "rubytree", "~> 2.2.0"
 
 gem "addressable", "~> 2.8.9"
@@ -201,6 +201,7 @@ gem "nokogiri", "~> 1.19.1"
 
 gem "carrierwave", "~> 2.2.6"
 gem "carrierwave_direct", "~> 3.0.0"
+gem "ssrf_filter", "~> 1.3"
 gem "fog-aws"
 
 gem "aws-sdk-core", "~> 3.241"
@@ -255,7 +256,7 @@ gem "turbo-rails", "~> 2.0.20"
 
 # There is a problem with version 1.4.0. Do not update until you're sure there is no infinite hang
 # happenning in failing tests when WebMock or VCR stub cannot be found.
-gem "httpx", "~> 1.7.2"
+gem "httpx", "~> 1.7.3"
 
 # Brings actual deep-freezing to most ruby objects
 gem "ice_nine"

Gemfile.lock

@@ -223,7 +223,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    action_text-trix (2.1.16)
+    action_text-trix (2.1.17)
       railties
     actioncable (8.1.2)
       actionpack (= 8.1.2)
@@ -424,7 +424,7 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     climate_control (1.2.0)
-    closure_tree (9.6.0)
+    closure_tree (9.6.1)
       activerecord (>= 7.2.0)
       with_advisory_lock (>= 7.5.0)
       zeitwerk (~> 2.7)
@@ -697,8 +697,8 @@ GEM
     htmlentities (4.3.4)
     http-2 (1.1.3)
     http_parser.rb (0.8.1)
-    httpx (1.7.2)
-      http-2 (>= 1.0.0)
+    httpx (1.7.3)
+      http-2 (>= 1.1.3)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     i18n-js (4.2.4)
@@ -740,7 +740,7 @@ GEM
     jmespath (1.6.2)
     job-iteration (1.12.0)
       activejob (>= 6.1)
-    json (2.18.1)
+    json (2.19.1)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -767,7 +767,7 @@ GEM
       addressable (~> 2.8)
       childprocess (~> 5.0)
       logger (~> 1.6)
-    lefthook (2.1.2)
+    lefthook (2.1.3)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1452,7 +1452,7 @@ GEM
     thor (1.5.0)
     thread_safe (0.3.6)
     timecop (0.9.10)
-    timeout (0.6.0)
+    timeout (0.6.1)
     tpm-key_attestation (0.14.1)
       bindata (~> 2.4)
       openssl (> 2.0)
@@ -1588,7 +1588,7 @@ DEPENDENCIES
   carrierwave (~> 2.2.6)
   carrierwave_direct (~> 3.0.0)
   climate_control
-  closure_tree (~> 9.6.0)
+  closure_tree (~> 9.6.1)
   colored2
   commonmarker (~> 2.6.0)
   compare-xml (~> 0.66)
@@ -1629,7 +1629,7 @@ DEPENDENCIES
   grids!
   html-pipeline (~> 2.14.0)
   htmldiff
-  httpx (~> 1.7.2)
+  httpx (~> 1.7.3)
   i18n-js (~> 4.2.4)
   i18n-tasks (~> 1.1.0)
   ice_cube (~> 0.17.0)
@@ -1753,6 +1753,7 @@ DEPENDENCIES
   spring-commands-rubocop
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.5.1)
+  ssrf_filter (~> 1.3)
   stackprof
   statesman (~> 13.1.0)
   store_attribute (~> 2.0)
@@ -1784,7 +1785,7 @@ DEPENDENCIES
 
 CHECKSUMS
   Ascii85 (2.0.1) sha256=15cb5d941808543cbb9e7e6aea3c8ec3877f154c3461e8b3673e97f7ecedbe5a
-  action_text-trix (2.1.16) sha256=f645a2c21821b8449fd1d6770708f4031c91a2eedf9ef476e9be93c64e703a8a
+  action_text-trix (2.1.17) sha256=b44691639d77e67169dc054ceacd1edc04d44dc3e4c6a427aa155a2beb4cc951
   actioncable (8.1.2) sha256=dc31efc34cca9cdefc5c691ddb8b4b214c0ea5cd1372108cbc1377767fb91969
   actionmailbox (8.1.2) sha256=058b2fb1980e5d5a894f675475fcfa45c62631103d5a2596d9610ec81581889b
   actionmailer (8.1.2) sha256=f4c1d2060f653bfe908aa7fdc5a61c0e5279670de992146582f2e36f8b9175e9
@@ -1847,7 +1848,7 @@ CHECKSUMS
   cgi (0.5.1) sha256=e93fcafc69b8a934fe1e6146121fa35430efa8b4a4047c4893764067036f18e9
   childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
   climate_control (1.2.0) sha256=36b21896193fa8c8536fa1cd843a07cf8ddbd03aaba43665e26c53ec1bd70aa5
-  closure_tree (9.6.0) sha256=75aac8f058597b0d96f2052f1419c912e8f4e92425e56273db122913cdae5d1e
+  closure_tree (9.6.1) sha256=f6af11243dea13d888788ffb0fd28014bd1077abe3a4233ea1e7044e52fc6377
   coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
   coercible (1.0.0) sha256=5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc
   color_conversion (0.1.2) sha256=99bea5fa412e1527a11389975aa6ad445ff8528ebae202c11d08c45ea2b94c96
@@ -1965,7 +1966,7 @@ CHECKSUMS
   htmlentities (4.3.4) sha256=125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da
   http-2 (1.1.3) sha256=1b2f379d35a11dbae94f8a1a52c053d8c161eb4a0c98b5d1605ff1b2bf171c9c
   http_parser.rb (0.8.1) sha256=9ae8df145b39aa5398b2f90090d651c67bd8e2ebfe4507c966579f641e11097a
-  httpx (1.7.2) sha256=10cdcd5b03794de743bec87e8cdba2ca93e2124084b6cdb1ad01b00c192a51f7
+  httpx (1.7.3) sha256=126914109a58350e5ad0c13786092f35e2419857dad15745f31fc81c371f93a8
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   i18n-js (4.2.4) sha256=61390d372f8fa68c495c5907d577657e8cc3a7031f4945db1e91f935e1391355
   i18n-tasks (1.1.2) sha256=4dcfba49e52a623f30661cb316cb80d84fbba5cb8c6d88ef5e02545fffa3637a
@@ -1980,7 +1981,7 @@ CHECKSUMS
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
   jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
   job-iteration (1.12.0) sha256=0164057417750f6e9c3ed548f029f1136b18eb53975fa438b09304a525d6c6c0
-  json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  json (2.19.1) sha256=dd94fdc59e48bff85913829a32350b3148156bc4fd2a95a2568a78b11344082d
   json-jwt (1.17.0) sha256=6ff99026b4c54281a9431179f76ceb81faa14772d710ef6169785199caadc4cc
   json-schema (4.3.1) sha256=d5e68dc32b94408d0b06ad04f9382ccbb6fe5a44910e066f8547f56c471a7825
   json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
@@ -1989,7 +1990,7 @@ CHECKSUMS
   ladle (1.0.1) sha256=e8586964108c798d48bf57d2a65bd5602e8e5223a176b6602a0fb36c0bda90dc
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   launchy (3.1.1) sha256=72b847b5cc961589dde2c395af0108c86ff0119f42d4648d25b5440ebb10059e
-  lefthook (2.1.2) sha256=da5a2484d68ee00d7fcc7e072e925c0246363eb20d77499d536bea209ae6ae06
+  lefthook (2.1.3) sha256=399eae9411d5a65fbeff38230a685073fefac6ef9ae18165a81f5f7ffa2df7a7
   letter_opener (1.10.0) sha256=2ff33f2e3b5c3c26d1959be54b395c086ca6d44826e8bf41a14ff96fdf1bdbb2
   letter_opener_web (3.0.0) sha256=3f391efe0e8b9b24becfab5537dfb17a5cf5eb532038f947daab58cb4b749860
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
@@ -2273,7 +2274,7 @@ CHECKSUMS
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
   thread_safe (0.3.6) sha256=9ed7072821b51c57e8d6b7011a8e282e25aeea3a4065eab326e43f66f063b05a
   timecop (0.9.10) sha256=12ba45ce57cdcf6b1043cb6cdffa6381fd89ce10d369c28a7f6f04dc1b0cd8eb
-  timeout (0.6.0) sha256=6d722ad619f96ee383a0c557ec6eb8c4ecb08af3af62098a0be5057bf00de1af
+  timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
   tpm-key_attestation (0.14.1) sha256=7fd4e4653a7afd0a386632ddfb05d10ecfdd47678299c5e69165bc9ae111193f
   trailblazer-option (0.1.2) sha256=20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
@@ -2316,7 +2317,7 @@ CHECKSUMS
   zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
 
 RUBY VERSION
-   ruby 3.4.7p58
+  ruby 4.0.1
 
 BUNDLED WITH
-   2.7.2
+  4.0.6

app/components/admin/import/jira/import_runs/status_badge_component.rb

@@ -44,15 +44,18 @@ def status_color_scheme(status)
       when Import::JiraImportStateMachine::IMPORT_ERROR,
            Import::JiraImportStateMachine::REVERT_ERROR,
            Import::JiraImportStateMachine::INSTANCE_META_ERROR,
-           Import::JiraImportStateMachine::PROJECTS_META_ERROR
+           Import::JiraImportStateMachine::PROJECTS_META_ERROR,
+           Import::JiraImportStateMachine::FINALIZING_ERROR
         :danger
-      when Import::JiraImportStateMachine::COMPLETED,
+      when Import::JiraImportStateMachine::FINALIZING_DONE,
            Import::JiraImportStateMachine::REVERTED
         :success
       when Import::JiraImportStateMachine::INSTANCE_META_FETCHING,
            Import::JiraImportStateMachine::PROJECTS_META_FETCHING,
            Import::JiraImportStateMachine::IMPORTING,
-           Import::JiraImportStateMachine::REVERTING
+           Import::JiraImportStateMachine::FINALIZING,
+           Import::JiraImportStateMachine::REVERTING,
+           Import::JiraImportStateMachine::REVERT_CANCELLING
         :accent
       else
         :attention

app/components/admin/import/jira/import_runs/wizard_step_review_component.html.erb

@@ -52,6 +52,30 @@ See COPYRIGHT and LICENSE files for more details.
         render(Admin::Import::Jira::ImportRuns::ErrorBannerComponent.new(model, 'revert'))
       end
     end
+  elsif model.in_state?(:finalizing, :finalizing_done, :finalizing_error)
+    box.with_row do
+      concat(render(Primer::Beta::Text.new(font_weight: :semibold, tag: :div)) {
+        I18n.t(:"admin.jira.run.wizard.sections.import_result.label_finalize_import")
+      })
+    end
+    case model.current_state.to_sym
+    when :finalizing
+      box.with_row(mt: 3) do
+        render(Admin::Import::Jira::ImportRuns::ProgressBoxComponent.new(
+          I18n.t(:"admin.jira.run.wizard.sections.import_result.label_finalizing")
+        ))
+      end
+    when :finalizing_done
+      box.with_row(mt: 3) do
+        render(Primer::Alpha::Banner.new(scheme: :success, icon: :"check-circle")) {
+          I18n.t(:"admin.jira.run.wizard.sections.import_result.label_finalizing_done")
+        }
+      end
+    when :finalizing_error
+      box.with_row(mt: 3) do
+        render(Admin::Import::Jira::ImportRuns::ErrorBannerComponent.new(model, 'finalize'))
+      end
+    end
   else
     box.with_row do
       concat(render(Primer::Beta::Text.new(font_weight: :semibold, tag: :div)) {
@@ -70,7 +94,7 @@ See COPYRIGHT and LICENSE files for more details.
         }
       end
     end
-    if model.in_state?(:imported, :completed)
+    if model.in_state?(:imported, :finalizing_done)
       box.with_row(mt: 3, mb: 3) do
         render(Admin::Import::Jira::ImportRuns::InfoListBoxComponent.new(
           title: I18n.t(:"admin.jira.run.wizard.sections.import_result.label_results"),