Merge pull request #912 from rosiel/fix-checksum-view

Filehash Fixes and improve checksum view

composer.json

@@ -19,7 +19,7 @@
     "islandora/jsonld": "^2",
     "stomp-php/stomp-php": "4.* || ^5",
     "drupal/jwt": "^1.0.0-beta5",
-    "drupal/filehash": "^1.1 || ^2",
+    "drupal/filehash": "^2",
     "drupal/prepopulate" : "^2.2",
     "drupal/eva" : "^3.0",
     "drupal/features" : "^3.7",

islandora.module

@@ -183,7 +183,8 @@ function islandora_file_insert(FileInterface $file) {
  */
 function islandora_file_update(FileInterface $file) {
   // Exit early if unchanged.
-  if ($file->filehash != NULL && $file->original->filehash != NULL && $file->filehash['sha1'] == $file->original->filehash['sha1']) {
+  if ($file->hasField('sha1') && $file->original->hasField('sha1')
+    && $file->sha1->getString() == $file->original->sha1->getString()) {
     return;
   }
 

modules/islandora_core_feature/config/install/filehash.settings.yml

@@ -1,5 +1,24 @@
 algos:
-  sha1: sha1
+  blake2b_128: '0'
+  blake2b_160: '0'
+  blake2b_224: '0'
+  blake2b_256: '0'
+  blake2b_384: '0'
+  blake2b_512: '0'
   md5: '0'
+  sha1: sha1
+  sha224: '0'
   sha256: '0'
+  sha384: '0'
+  sha512_224: '0'
+  sha512_256: '0'
+  sha512: '0'
+  sha3_224: '0'
+  sha3_256: '0'
+  sha3_384: '0'
+  sha3_512: '0'
 dedupe: 0
+rehash: true
+original: true
+dedupe_original: false
+mime_types: {  }

modules/islandora_core_feature/config/install/views.view.file_checksum.yml

@@ -1,14 +1,15 @@
 langcode: en
 status: true
 dependencies:
-  enforced:
-    module:
-      - islandora_core_feature
   module:
     - file
     - filehash
     - rest
     - serialization
+    - user
+  enforced:
+    module:
+      - islandora_core_feature
 id: file_checksum
 label: 'File Checksum'
 module: views
@@ -16,71 +17,24 @@ description: 'Exposes a REST endpoint for getting the checksum of a File'
 tag: ''
 base_table: file_managed
 base_field: fid
-core: 8.x
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: none
-        options: {  }
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: serializer
-      row:
-        type: 'entity:file'
-        options:
-          relationship: none
-          view_mode: default
       fields:
         sha1:
           id: sha1
-          table: filehash
+          table: file_managed
           field: sha1
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: sha1
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -92,7 +46,7 @@ display:
             external: false
             replace_spaces: false
             path_case: none
-            trim_whitespace: false
+            trim_whitespace: true
             alt: ''
             rel: ''
             link_class: ''
@@ -106,7 +60,7 @@ display:
             more_link: false
             more_link_text: ''
             more_link_path: ''
-            strip_tags: false
+            strip_tags: true
             trim: false
             preserve_tags: ''
             html: false
@@ -122,13 +76,120 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: standard
+          click_sort_column: value
-      filters: {  }
+          type: filehash
-      sorts: {  }
+          settings: {  }
-      header: {  }
+          group_column: value
-      footer: {  }
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        original_sha1:
+          id: original_sha1
+          table: file_managed
+          field: original_sha1
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: file
+          entity_field: original_sha1
+          plugin_id: field
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: true
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: true
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: false
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: filehash
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'view checksums'
+      cache:
+        type: tag
+        options: {  }
       empty: {  }
-      relationships: {  }
+      sorts: {  }
       arguments:
         fid:
           id: fid
@@ -137,6 +198,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: fid
+          plugin_id: file_fid
           default_action: 'not found'
           exception:
             value: all
@@ -151,8 +215,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -164,31 +228,47 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
-          entity_type: file
+      filters: {  }
-          entity_field: fid
+      style:
-          plugin_id: file_fid
+        type: serializer
+      row:
+        type: 'entity:file'
+        options:
+          relationship: none
+          view_mode: default
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
+        - 'languages:language_content'
         - 'languages:language_interface'
         - request_format
         - url
         - url.query_args
+        - user.permissions
       tags: {  }
   rest_export_1:
-    display_plugin: rest_export
     id: rest_export_1
     display_title: 'REST export'
+    display_plugin: rest_export
     position: 1
     display_options:
-      display_extenders: {  }
-      path: checksum/%file
       pager:
         type: some
         options:
-          items_per_page: 10
           offset: 0
+          items_per_page: 10
       style:
         type: serializer
         options:
@@ -198,6 +278,19 @@ display:
         type: data_field
         options:
           field_options: {  }
+      display_extenders:
+        matomo:
+          enabled: false
+          keyword_gets: ''
+          keyword_behavior: first
+          keyword_concat_separator: ' '
+          category_behavior: none
+          category_gets: ''
+          category_concat_separator: ' '
+          category_fallback: ''
+          category_facets: {  }
+          category_facets_concat_separator: ', '
+      path: checksum/%file
       auth:
         - basic_auth
         - jwt_auth
@@ -205,7 +298,10 @@ display:
     cache_metadata:
       max-age: -1
       contexts:
+        - 'languages:language_content'
         - 'languages:language_interface'
         - request_format
         - url
+        - user.permissions
       tags: {  }
+