From 21b916b427354ff5f5ea63af0aa6f81f33177f0c Mon Sep 17 00:00:00 2001
From: dannylamb <dlamb@islandora.ca>
Date: Fri, 15 Nov 2019 18:11:14 +0000
Subject: [PATCH] Removing dependency loop in view

---
 config/schema/islandora.schema.yml            | 21 -------------
 islandora.links.action.yml                    | 18 ++---------
 islandora.routing.yml                         | 22 -------------
 .../config/install/views.view.collections.yml | 31 ++++++++++++++++---
 4 files changed, 30 insertions(+), 62 deletions(-)

diff --git a/config/schema/islandora.schema.yml b/config/schema/islandora.schema.yml
index b4983fa2..8fd719ce 100644
--- a/config/schema/islandora.schema.yml
+++ b/config/schema/islandora.schema.yml
@@ -14,18 +14,6 @@ islandora.settings:
     jwt_expiry:
       type: string
       label: 'How long JWTs should last before expiring.'
-    upload_form_bundle:
-      type: string
-      label: 'Upload Form Content Type'
-    upload_form_location:
-      type: string
-      label: 'Upload Form Location'
-    upload_form_term:
-      type: string
-      label: 'Upload Form Media Use Term'
-    upload_form_allowed_extensions:
-      type: string
-      label: 'Upload Form Allowed Extensions'
     gemini_url:
       type: uri
       label: 'Url to Gemini microservice'
@@ -90,9 +78,6 @@ condition.plugin.node_has_term:
     uri:
       type: text
       label: 'Taxonomy Term URI'
-    logic:
-      type: string
-      label: 'Logic (AND or OR)'
 
 condition.plugin.node_has_parent:
   type: condition.plugin
@@ -110,9 +95,6 @@ condition.plugin.media_has_term:
     uri:
       type: text
       label: 'Taxonomy Term URI'
-    logic:
-      type: string
-      label: 'Logic (AND or OR)'
 
 condition.plugin.parent_node_has_term:
   type: condition.plugin
@@ -120,9 +102,6 @@ condition.plugin.parent_node_has_term:
     uri:
       type: text
       label: 'Taxonomy Term URI'
-    logic:
-      type: text
-      label: 'Logic (AND or OR)'
 
 condition.plugin.file_uses_filesystem:
   type: condition.plugin
diff --git a/islandora.links.action.yml b/islandora.links.action.yml
index ffd1dd71..4b0a01be 100644
--- a/islandora.links.action.yml
+++ b/islandora.links.action.yml
@@ -1,24 +1,12 @@
-islandora.upload_media:
-  route_name: islandora.upload_media
-  title: Upload Media
-  appears_on:
-    - view.media_of.page_1
-
 islandora.add_media_to_node:
   route_name: islandora.add_media_to_node_page
-  title: Add Media
+  title: Add media
   appears_on:
     - view.media_of.page_1
 
-islandora.upload_children:
-  route_name: islandora.upload_children
-  title: Upload Children
-  appears_on:
-    - view.manage_members.page_1
-
 islandora.add_member_to_node:
   route_name: islandora.add_member_to_node_page
-  title: Add Child
+  title: Add child
   appears_on:
     - view.manage_members.page_1
 
@@ -30,6 +18,6 @@ islandora.reorder_children:
 
 islandora.add_collection:
   route_name: islandora.add_collection
-  title: Add Collection
+  title: Add collection
   appears_on:
     - view.collections.page_1
diff --git a/islandora.routing.yml b/islandora.routing.yml
index 464dd9a0..72529c77 100644
--- a/islandora.routing.yml
+++ b/islandora.routing.yml
@@ -27,17 +27,6 @@ islandora.add_member_to_node_page:
   requirements:
     _entity_create_any_access: 'node'
 
-islandora.upload_children:
-  path: '/node/{node}/members/upload'
-  defaults:
-    _form: '\Drupal\islandora\Form\AddChildrenForm'
-    _title: 'Upload Children'
-  options:
-    _admin_route: 'TRUE'
-  requirements:
-    _access: 'TRUE'
-    #_permssion: 'create node,create media'
-
 islandora.add_media_to_node_page:
   path: '/node/{node}/media/add'
   defaults:
@@ -49,16 +38,6 @@ islandora.add_media_to_node_page:
   requirements:
     _entity_create_any_access: 'media'
 
-islandora.upload_media:
-  path: '/node/{node}/media/upload'
-  defaults:
-    _form: '\Drupal\islandora\Form\AddMediaForm'
-    _title: 'Add media'
-  options:
-    _admin_route: 'TRUE'
-  requirements:
-    _custom_access: '\Drupal\islandora\Form\AddMediaForm::access'
-
 islandora.add_collection:
   path: '/collection/add'
   defaults:
@@ -83,7 +62,6 @@ islandora.media_source_put_to_node:
   path: '/node/{node}/media/{media_type}/{taxonomy_term}'
   defaults:
     _controller: '\Drupal\islandora\Controller\MediaSourceController::putToNode'
-
   methods: [PUT]
   requirements:
     _custom_access: '\Drupal\islandora\Controller\MediaSourceController::putToNodeAccess'
diff --git a/modules/islandora_core_feature/config/install/views.view.collections.yml b/modules/islandora_core_feature/config/install/views.view.collections.yml
index f682cf2e..ab6c47ab 100644
--- a/modules/islandora_core_feature/config/install/views.view.collections.yml
+++ b/modules/islandora_core_feature/config/install/views.view.collections.yml
@@ -1,8 +1,6 @@
 langcode: en
 status: true
 dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
   module:
     - media
     - node
@@ -79,6 +77,9 @@ display:
           description: ''
           columns:
             title: title
+            field_member_of: field_member_of
+            field_file_size: field_file_size
+            operations: operations
           info:
             title:
               sortable: false
@@ -87,12 +88,34 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            field_member_of:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_file_size:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
           default: '-1'
           empty_table: false
       row:
-        type: 'entity:node'
+        type: fields
         options:
-          view_mode: teaser
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
       fields:
         title:
           id: title