Merge pull request #1 from Islandora/2.x

from upstream
Islandora · Jul 10, 2024 · 23e2f5a · 23e2f5a
2 parents 9b26616 + 60a1678
commit 23e2f5a
Show file tree

Hide file tree

Showing 22 changed files with 536 additions and 441 deletions.
diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
@@ -1,38 +1,30 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
-# Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the 2.x branch
   push:
     branches: [ 2.x ]
   pull_request:
     branches: [ 2.x ]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
+    env:
+      DRUPAL_VERSION: ${{ matrix.drupal-version }}
+      SCRIPT_DIR: ${{ github.workspace }}/islandora_ci
+      DRUPAL_DIR: /opt/drupal
+      PHPUNIT_FILE: ${{ github.workspace }}/build_dir/phpunit.xml
+
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
       fail-fast: false
       matrix:
         php-versions: ["8.1", "8.2", "8.3"]
-        # test-suite functional-javascript will appear to pass but will skip tests; missing chromedriver.
         test-suite: ["kernel", "functional", "functional-javascript"]
-        drupal-version: ["10.1.x", "10.2.x", "10.3.x-dev"]
+        drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev"]
         mysql: ["8.0"]
         allowed_failure: [false]
-        exclude:
-          - php-versions: "8.3"
-            drupal-version: "10.1.x"
-
 
     name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}
 
@@ -51,17 +43,15 @@ jobs:
           - 61616:61616
           - 61613:61613
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: build_dir
 
       - name: Checkout islandora_ci
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: islandora/islandora_ci
           ref: github-actions
@@ -79,13 +69,6 @@ jobs:
           sudo apt-get remove -y mysql-client mysql-common
           sudo apt-get install -y mysql-client
 
-      - name: Set environment variables
-        run: |
-          echo "DRUPAL_VERSION=${{ matrix.drupal-version }}" >> $GITHUB_ENV
-          echo "SCRIPT_DIR=$GITHUB_WORKSPACE/islandora_ci" >> $GITHUB_ENV
-          echo "DRUPAL_DIR=/opt/drupal" >> $GITHUB_ENV
-          echo "PHPUNIT_FILE=$GITHUB_WORKSPACE/build_dir/phpunit.xml" >> $GITHUB_ENV
-
       - name: Cache Composer dependencies
         uses: actions/cache@v3
         with:
@@ -118,8 +101,21 @@ jobs:
 
       - name: Test scripts
         run: $SCRIPT_DIR/travis_scripts.sh
+
+      - name: Start chromedriver
+        if: matrix.test-suite == 'functional-javascript'
+        run: |-
+          /usr/local/share/chromedriver-linux64/chromedriver \
+            --log-path=/tmp/chromedriver.log \
+            --verbose \
+            --allowed-ips= \
+            --allowed-origins=* &
 
       - name: PHPUNIT tests
         run: |
           cd $DRUPAL_DIR/web/core
           $DRUPAL_DIR/vendor/bin/phpunit --verbose --testsuite "${{ matrix.test-suite }}"
+
+      - name: Print chromedriver logs
+        if: matrix.test-suite == 'functional-javascript'
+        run: cat /tmp/chromedriver.log
diff --git a/composer.json b/composer.json
@@ -18,8 +18,9 @@
     "drupal/ctools": "^3.8 || ^4",
     "drupal/eva" : "^3.0",
     "drupal/file_replace": "^1.1",
-    "drupal/filehash": "^2",
+    "drupal/filehash": "^2 || ^3",
     "drupal/flysystem" : "^2.0@alpha",
+    "drupal/jsonld": "^2 || ^3",
     "drupal/jwt": "^1.1 || ^2",
     "drupal/migrate_plus" : "^5.1 || ^6",
     "drupal/migrate_source_csv" : "^3.4",
@@ -28,7 +29,6 @@
     "drupal/token" : "^1.3",
     "islandora/chullo": "^2.0",
     "islandora/fedora-entity-mapper": "^1.0",
-    "islandora/jsonld": "^2 || ^3",
     "stomp-php/stomp-php": "4.* || ^5"
   },
   "require-dev": {

diff --git a/config/schema/islandora.schema.yml b/config/schema/islandora.schema.yml
@@ -173,6 +173,10 @@ condition.plugin.node_had_namespace:
 field.formatter.settings.islandora_image:
   type: field.formatter.settings.image
   label: 'Islandora image field display format settings'
+  mapping:
+    image_alt_text:
+      type: string
+      label: "Alt text source"
 
 condition.plugin.islandora_entity_bundle:
   type: condition.plugin

diff --git a/islandora.info.yml b/islandora.info.yml
@@ -4,7 +4,7 @@ name: 'islandora'
 description: "Islandora Core"
 type: module
 package: Islandora
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.2
 dependencies:
   - context:context_ui
   - ctools:ctools

diff --git a/islandora.module b/islandora.module
@@ -16,19 +16,18 @@
 
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
+use Drupal\file\FileInterface;
 use Drupal\islandora\Form\IslandoraSettingsForm;
-use Drupal\node\NodeInterface;
 use Drupal\media\MediaInterface;
-use Drupal\file\FileInterface;
-use Drupal\taxonomy\TermInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\node\NodeInterface;
 use Drupal\serialization\Normalizer\CacheableNormalizerInterface;
-use Drupal\Core\Entity\EntityForm;
-use Drupal\file\Entity\File;
+use Drupal\taxonomy\TermInterface;
 
 /**
  * Implements hook_help().
@@ -408,132 +407,25 @@ function islandora_media_custom_form_submit(&$form, FormStateInterface $form_sta
  * Implements a submit handler for the delete form.
  */
 function islandora_object_delete_form_submit($form, FormStateInterface $form_state) {
-
   $result = $form_state->getValues('delete_associated_content');
-  $utils = \Drupal::service('islandora.utils');
-
   if ($result['delete_associated_content'] == 1) {
-
+    $utils = \Drupal::service('islandora.utils');
     $node = $form_state->getFormObject()->getEntity();
     $medias = $utils->getMedia($node);
-    $media_list = [];
-
-    $entity_field_manager = \Drupal::service('entity_field.manager');
-    $current_user = \Drupal::currentUser();
+    $results = $utils->deleteMediaAndFiles($medias);
     $logger = \Drupal::logger('logger.channel.islandora');
     $messenger = \Drupal::messenger();
-
-    $delete_media = [];
-    $media_translations = [];
-    $media_files = [];
-    $entity_protected_medias = [];
-    $inaccessible_entities = [];
-
-    foreach ($medias as $id => $media) {
-      $lang = $media->language()->getId();
-      $selected_langcodes[$lang] = $lang;
-
-      if (!$media->access('delete', $current_user)) {
-        $inaccessible_entities[] = $media;
-        continue;
-      }
-      // Check for files.
-      $fields = $entity_field_manager->getFieldDefinitions('media', $media->bundle());
-      foreach ($fields as $field) {
-        $type = $field->getType();
-        if ($type == 'file' || $type == 'image') {
-          $target_id = $media->get($field->getName())->target_id;
-          $file = File::load($target_id);
-          if ($file) {
-            if (!$file->access('delete', $current_user)) {
-              $inaccessible_entities[] = $file;
-              continue;
-            }
-            $media_files[$id][$file->id()] = $file;
-          }
-        }
-      }
-
-      foreach ($selected_langcodes as $langcode) {
-        // We're only working with media, which are translatable.
-        $entity = $media->getTranslation($langcode);
-        if ($entity->isDefaultTranslation()) {
-          $delete_media[$id] = $entity;
-          unset($media_translations[$id]);
-        }
-        elseif (!isset($delete_media[$id])) {
-          $media_translations[$id][] = $entity;
-        }
-      }
-    }
-
-    if ($delete_media) {
-      foreach ($delete_media as $id => $media) {
-        try {
-          $media->delete();
-          $media_list[] = $id;
-          $logger->notice('The media %label has been deleted.', [
-            '%label' => $media->label(),
-          ]);
-        }
-        catch (Exception $e) {
-          $entity_protected_medias[] = $id;
-        }
-      }
-    }
-
-    $delete_files = array_filter($media_files, function ($media) use ($entity_protected_medias) {
-      return !in_array($media, $entity_protected_medias);
-    }, ARRAY_FILTER_USE_KEY);
-
-    if ($delete_files) {
-      foreach ($delete_files as $files_array) {
-        foreach ($files_array as $file) {
-          $file->delete();
-          $logger->notice('The file %label has been deleted.', [
-            '%label' => $file->label(),
-          ]);
-        }
-      }
+    if (isset($results['inaccessible'])) {
+      $messenger->addWarning($results['inaccessible']);
     }
-
-    $delete_media_translations = array_filter($media_translations, function ($media) use ($entity_protected_medias) {
-      return !in_array($media, $entity_protected_medias);
-    }, ARRAY_FILTER_USE_KEY);
-
-    if ($delete_media_translations) {
-      foreach ($delete_media_translations as $id => $translations) {
-        $media = $medias[$id];
-        foreach ($translations as $translation) {
-          $media->removeTranslation($translation->language()->getId());
-        }
-        $media->save();
-        foreach ($translations as $translation) {
-          $logger->notice('The media %label @language translation has been deleted', [
-            '%label' => $media->label(),
-            '@language' => $translation->language()->getName(),
-          ]);
-        }
-      }
-    }
-
-    if ($inaccessible_entities) {
-      $messenger->addWarning("@count items have not been deleted because you do not have the necessary permissions.", [
-        '@count' => count($inaccessible_entities),
-      ]);
-    }
-
+    $logger->notice($results['deleted']);
     $build = [
       'heading' => [
         '#type' => 'html_tag',
         '#tag' => 'div',
         '#value' => t("The repository item @node and @media", [
           '@node' => $node->getTitle(),
-          '@media' => \Drupal::translation()->formatPlural(
-            count($media_list), 'the media with the id @media has been deleted.',
-            'the medias with the ids @media have been deleted.',
-            ['@media' => implode(", ", $media_list)],
-          ),
+          '@media' => $results['deleted'],
         ]),
       ],
     ];
@@ -653,12 +545,11 @@ function islandora_entity_view(array &$build, EntityInterface $entity, EntityVie
   $route_match_item = \Drupal::routeMatch()->getParameters()->get($entity->getEntityTypeId());
   // Ensure the entity matches the route.
   if ($entity === $route_match_item) {
-    if ($display->getComponent('field_gemini_uri')) {
-      $mapper = \Drupal::service('islandora.entity_mapper');
-      $flysystem_config = Settings::get('flysystem');
-      $fedora_root = $flysystem_config['fedora']['config']['root'];
+    $flysystem_config = Settings::get('flysystem');
+    $fedora_root = $flysystem_config['fedora']['config']['root'] ?? NULL;
+    if ($display->getComponent('field_gemini_uri') && $fedora_root) {
       $fedora_root = rtrim($fedora_root, '/');
-
+      $mapper = \Drupal::service('islandora.entity_mapper');
       if ($entity->getEntityTypeId() == 'media') {
         // Check if the source file is in Fedora or not.
         $media_source_service = \Drupal::service('islandora.media_source_service');

diff --git a/islandora.services.yml b/islandora.services.yml
@@ -54,7 +54,7 @@ services:
     arguments: ['@entity_type.manager', '@current_user', '@language_manager', '@file_system', '@islandora.utils']
   islandora.utils:
     class: Drupal\islandora\IslandoraUtils
-    arguments: ['@entity_type.manager', '@entity_field.manager', '@context.manager', '@flysystem_factory', '@language_manager']
+    arguments: ['@entity_type.manager', '@entity_field.manager', '@context.manager', '@flysystem_factory', '@language_manager', '@current_user']
   islandora.entity_mapper:
     class: Islandora\EntityMapper\EntityMapper
   islandora.stomp.auth_header_listener:

diff --git a/islandora.tokens.inc b/islandora.tokens.inc
@@ -80,6 +80,9 @@ function islandora_tokens($type, $tokens, array $data, array $options, Bubbleabl
       return;
     }
     $islandoraUtils = \Drupal::service('islandora.utils');
+    if (!$islandoraUtils->isIslandoraType('node', $data['node']->bundle())) {
+      return;
+    }
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'media-original-file:basename':

diff --git a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php
@@ -494,17 +494,20 @@ protected function defineOptions() {
    */
   protected function addSearchEndpoint(array &$json, array $url_components) {
     $url_base = $this->getRequest()->getSchemeAndHttpHost();
-    $hocr_search_path = $this->options['search_endpoint'];
-    $hocr_search_url = $url_base . '/' . ltrim($hocr_search_path, '/');
+    $hocr_search_path = $this->options['search_endpoint'] ?? null;
 
-    $hocr_search_url = str_replace('%node', $url_components[1], $hocr_search_url);
+    if ($hocr_search_path) {
+      $hocr_search_url = $url_base . '/' . ltrim($hocr_search_path, '/');
 
-    $json['service'][] = [
-      "@context" => "http://iiif.io/api/search/0/context.json",
-      "@id" => $hocr_search_url,
-      "profile" => "http://iiif.io/api/search/0/search",
-      "label" => t("Search inside this work"),
-    ];
+      $hocr_search_url = str_replace('%node', $url_components[1], $hocr_search_url);
+
+      $json['service'][] = [
+        "@context" => "http://iiif.io/api/search/0/context.json",
+        "@id" => $hocr_search_url,
+        "profile" => "http://iiif.io/api/search/0/search",
+        "label" => t("Search inside this work"),
+      ];
+    }
   }
 
   /**

diff --git a/modules/islandora_text_extraction/src/Plugin/Action/GenerateOCRDerivative.php b/modules/islandora_text_extraction/src/Plugin/Action/GenerateOCRDerivative.php
@@ -48,8 +48,9 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
     parent::validateConfigurationForm($form, $form_state);
-    $exploded_mime = explode('/', $form_state->getValue('mimetype'));
-    if ($exploded_mime[0] != 'text') {
+    $mime = $form_state->getValue('mimetype');
+    $exploded_mime = explode('/', $mime);
+    if ($exploded_mime[0] != 'text' && $mime != 'application/xml') {
       $form_state->setErrorByName(
         'mimetype',
         $this->t('Please enter file mimetype (e.g. text/plain.)')

diff --git a/phpunit.xml b/phpunit.xml
@@ -47,7 +47,7 @@
     <!-- Example for changing the driver args to phantomjs tests MINK_DRIVER_ARGS_PHANTOMJS value: '["http://127.0.0.1:8510"]' -->
     <env name="MINK_DRIVER_ARGS_PHANTOMJS" value=""/>
     <!-- Example for changing the driver args to webdriver tests MINK_DRIVER_ARGS_WEBDRIVER value: '["chrome", { "chromeOptions": { "w3c": false } }, "http://localhost:4444/wd/hub"]' For using the Firefox browser, replace "chrome" with "firefox" -->
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value=""/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://localhost:9515"]'/>
   </php>
   <testsuites>
     <testsuite name="unit">