Automated Drupal 10 compatibility fixes

Hello,

I will review whether the patch makes the module compatible with drupal 10.

Hello,

After applying the patch, the module gets installed successfully on drupal 10.

and we get an option as "Enable rotate icon" in the configuration of the image field.

But the icon to rotate the image is missing, hence shifting the issue to Needs work.

Thanks and regards.

Couldn't fix the issue, needs work.
I have attached the screenshot of Drupal 9 which contains the rotate button.

In D9 upgrade status, I get
web/modules/custom/simple_image_rotate/simple_image_rotate.module 184 Call to deprecated function file_move(). Deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use Drupal\file\FileRepositoryInterface::move() instead.
The patch did not apply.

Please fix this for D10 and issue a release. This simple module is really useful and important when importing images from others.

Please fix this for D10!

Patch created for D10 tjtj

mukesh88: Which version does this patch?

Still does not work.
1. The patch is strange in that it is applied from the Web directory, not the directory of the module itself.
2. It applied to the release 2.1.0 version.
3. The icon appears and rotates the thumbnails
4. BUT it throws a php error when the content page is saved:

Error: Class "FileSystemInterface" not found in
                                                     simple_image_rotate_rotate_image() (line 194 of
                                                     /home/mysite/public_html/web/modules/contrib/simple_image_rotat
                                                     e/simple_image_rotate.modul

tjtj i have created patch for 2.1.x version and patch is created to change the path of module itself and i have checked after save node i amn't getting any error also checked the FileSystemInterface class is already include in 2.1.x version. attached screenshot of node edit and node image rotate

Also, I tried to edit composer.json to use 2.1.0, and wegan's patch plugin, and the lenient plugin, but that threw a gazillion composer update errors, so I just did a manual install and patch.

[~/www/web/modules/contrib/simple_image_rotate]# patch -p1 < 3298061-12.patch
patching file js/simple_image_rotate.js
Hunk #1 FAILED at 19.
Hunk #2 succeeded at 36 (offset -1 lines).
1 out of 2 hunks FAILED -- saving rejects to file js/simple_image_rotate.js.rej
patching file simple_image_rotate.info.yml
patching file simple_image_rotate.libraries.yml
patching file simple_image_rotate.module
Hunk #1 succeeded at 65 (offset -3 lines).
Hunk #2 FAILED at 193.
1 out of 2 hunks FAILED -- saving rejects to file simple_image_rotate.module.rej

cat simple_image_rotate.js.rej
--- js/simple_image_rotate.js
+++ js/simple_image_rotate.js
@@ -19,14 +19,12 @@
           // Leaving out absolute icon placement for now.
           // $('.rotate-icon').parent('.image-preview').addClass('rotate-enabled');
             // Treat click on rotate image icon
-            $(".rotate-icon").once().click(function (e) {
-
+            $(once('rotate', '.rotate-icon', context)).each(function () {
+              $(this).on('click', function(e) {
                 // Prevent default click on rotate icon
                 e.preventDefault();
-                // Current rotate value and thumbnail image
-                var rotate = parseInt($(this).attr("data-rotate"));
-                $image = $(this).closest(".image-widget").find("img")
-                    .add($(this).closest(".media-library-add-form li").find('[data-drupal-selector="edit-preview"] img'));
+                var rotate = parseInt($(this).attr("data-rotate")),
+                $image = $(this).closest(".image-widget").find("img");
                 // Rotate Input
                 $rotate_input = $(this).closest(".image-widget").find('.rotate');
                 // Remove current rotate CSS class

This (line 2) was not in the file:
- $image = $(this).closest(".image-widget").find("img")
- .add($(this).closest(".media-library-add-form li").find('[data-drupal-selector="edit-preview"] img'));

This 2 line was not in js file when i was created patch. After cloning 2.1.x branch and recreate patch

The patch applied. But when I added the rotate box option to the image field, it does not appear when I make a new instance of that content type.
See two attached images

See two images

@tjtj I checked the new instance of content type and used existing image field and added image rotate box and create content with new content type image is rotate. see the attached images.

Then please issue this so I need not jump through patch hoops in my composer file.

I cloned the git repository and changed info.yml for D10. But when installed, and box checked to display the rotate icon, it is not displayed. I tried it on 2 sites.

I used patch #17 on a downloaded version 2.1.1-alpha1 (manual by hand)

I also changed line 197 in simple_image_rotate.module from:
if (file_move($file, $new_uri, FileSystemInterface::EXISTS_ERROR)) {
to:
if (\Drupal::service('file.repository')->move($file, $new_uri, FileSystemInterface::EXISTS_ERROR)) {

Module installed and tested on the imagefield of "article".

The icon was visible and usable and the image rotated.

Drupal 10.0.8
PHP 8.1.6

MGStables: Yes that worked perfectly. Thank you.
Now someone please release the new version.

I added #17 and #23 to the git branch. I also added a composer.json file so that I could import it directly into my installation with composer.

  "repositories": [
        {
            "type": "vcs",
            "url": "https://git.drupalcode.org/issue/simple_image_rotate-3298061.git"
        },
        {
            "type": "composer",
            "url": "https://packages.drupal.org/8",
            "exclude": ["drupal/simple_image_rotate"]

        }
]

Then further down:

        "drupal/simple_image_rotate": "dev-3298061-automated-drupal-10",

Thanks jaime@gingerrobot.com for this git version.

I've tested the git version from #26 and it didn't work. So I compared it with my self-patched version that did work.
In simple_image_rotate.module on line 74, an important element has been removed. (Maybe accidentally removed a line too much?)
$elements = &$field_widget_complete_form['widget'];

Now this is:

function simple_image_rotate_field_widget_complete_form_alter(&$field_widget_complete_form, FormStateInterface $form_state, array $context) {
  $field_definition = $context['items']->getFieldDefinition();
  $field_name = $field_definition->getType();

If I put this line back, it works again.

function simple_image_rotate_field_widget_complete_form_alter(&$field_widget_complete_form, FormStateInterface $form_state, array $context) {
  $elements = &$field_widget_complete_form['widget'];
  $field_definition = $context['items']->getFieldDefinition();
  $field_name = $field_definition->getType();

Drupal 10.1.2
PHP 8.1.6

Hello,

I committed the fix to set the value for $elements, see #27

So back to ready to be reviewed.

Best regards,
Marc

Latest git version works perfectly. The icon was visible and usable and the image rotated.

Drupal 10.1.4
PHP 8.1.6

You should simplify the once() function override in MR !4

Before:
$(".rotate-icon").once().click(function (e) {

After:
$(once('rotate', '.rotate-icon', context)).on('click', function (e) {

Updated the MR as suggested in #32.

Tested the change on Drupal 10.1.7-dev, works as expected.

Recording -
https://www.drupal.org/files/issues/2023-11-20/Screen%20Recording%202023...

Actual image -

After rotating -

Looks good, just one spelling typo and its ready to go

In the composer.json file, change "GPL-2.0-or-latery" to "GPL-2.0-or-later"

Addressed the change requested in #35, thanks!

Thanks for the fix @ankithashetty

Find this fix with https://www.drupal.org/project/simple_image_rotate/releases/2.3.0-alpha1

Thanks for contributing