diff --git a/.env b/.env index 3ccf6cef4..dc38d2284 100644 --- a/.env +++ b/.env @@ -69,7 +69,7 @@ REPOSITORY=ghcr.io/jhu-sheridan-libraries/idc-isle-dc TAG=upstream-20200824-f8d1e8e-23-g9fe79fc # Docker image and tag for snapshot image -SNAPSHOT_TAG=upstream-20201007-739693ae-233-g5a043ef.1618257390 +SNAPSHOT_TAG=upstream-20201007-739693ae-251-g0145185.1618855066 # IdP, SP entity URIs and base URLs SP_BASEURL=https://islandora-idc.traefik.me diff --git a/codebase/composer.json b/codebase/composer.json index d7775e8e1..87876b179 100644 --- a/codebase/composer.json +++ b/codebase/composer.json @@ -53,6 +53,7 @@ "composer/installers": "^1.2", "cweagans/composer-patches": "^1.6.5", "drupal/admin_toolbar": "^2.0", + "drupal/auto_entitylabel": "^3.0@beta", "drupal/captcha": "^1.1", "drupal/console": "~1.0", "drupal/contact_ajax": "^1.5", @@ -63,6 +64,8 @@ "drupal/core": "^8.9.13", "drupal/core-composer-scaffold": "^8.9.13", "drupal/devel": "^2.0", + "drupal/embed": "^1.4", + "drupal/entity_reference_unpublished": "^1.2", "drupal/epp": "^1.0", "drupal/facets": "^1.3", "drupal/libraries": "3.x-dev@dev", @@ -73,9 +76,13 @@ "drupal/remote_stream_wrapper": "^1.5", "drupal/rest_oai_pmh": "^1.0", "drupal/restui": "^1.16", + "drupal/role_delegation": "^1.1", + "drupal/role_hierarchy": "^2.2", "drupal/search_api_solr": "^4.1", "drupal/simplesamlphp_auth": "^3.2", "drupal/transliterate_filenames": "^1.3", + "drupal/workbench": "^1.3", + "drupal/workbench_access": "^1.0@beta", "drush/drush": "^9.7.1", "islandora-rdm/islandora_fits": "dev-master", "islandora/carapace": "dev-8.x-3.x", diff --git a/codebase/composer.lock b/codebase/composer.lock index a08bc13c4..3d75c81d3 100644 --- a/codebase/composer.lock +++ b/codebase/composer.lock @@ -1770,6 +1770,20 @@ "sqlserver", "sqlsrv" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", + "type": "tidelift" + } + ], "time": "2020-11-14T20:26:58+00:00" }, { @@ -2274,6 +2288,75 @@ "issues": "https://www.drupal.org/project/issues/admin_toolbar" } }, + { + "name": "drupal/auto_entitylabel", + "version": "3.0.0-beta4", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/auto_entitylabel.git", + "reference": "8.x-3.0-beta4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/auto_entitylabel-8.x-3.0-beta4.zip", + "reference": "8.x-3.0-beta4", + "shasum": "916befd4ce95b5d73de48ac1b105cc33e9f7821f" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.0-beta4", + "datestamp": "1609349103", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Pravin Ajaaz", + "homepage": "https://www.drupal.org/user/2910049" + }, + { + "name": "RenatoG", + "homepage": "https://www.drupal.org/user/3326031" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" + }, + { + "name": "bforchhammer", + "homepage": "https://www.drupal.org/user/216396" + }, + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704" + }, + { + "name": "diqidoq", + "homepage": "https://www.drupal.org/user/1001934" + }, + { + "name": "purushotam.rai", + "homepage": "https://www.drupal.org/user/3193859" + } + ], + "description": "Allows hiding of entity label fields and automatic label creation.", + "homepage": "https://www.drupal.org/project/auto_entitylabel", + "support": { + "source": "https://git.drupalcode.org/project/auto_entitylabel", + "issues": "https://www.drupal.org/project/issues/auto_entitylabel" + } + }, { "name": "drupal/captcha", "version": "1.1.0", @@ -3607,6 +3690,50 @@ "irc": "irc://irc.freenode.org/drupal-media" } }, + { + "name": "drupal/entity_reference_unpublished", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/entity_reference_unpublished.git", + "reference": "8.x-1.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/entity_reference_unpublished-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "a0685c19126506cda83cb2becb7cfa6c51b2bd1c" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.2", + "datestamp": "1589564667", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "lahoosascoots", + "homepage": "https://www.drupal.org/user/1933614" + } + ], + "description": "Allows unpublished content to be referenced in an entity reference.", + "homepage": "https://www.drupal.org/project/entity_reference_unpublished", + "support": { + "source": "https://git.drupalcode.org/project/entity_reference_unpublished" + } + }, { "name": "drupal/epp", "version": "1.0.0", @@ -4627,7 +4754,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -5198,19 +5325,117 @@ "source": "https://git.drupalcode.org/project/restui" } }, + { + "name": "drupal/role_delegation", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/role_delegation.git", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/role_delegation-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "a63b548056cc729beacfd385625fafb983e0f73e" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.1", + "datestamp": "1580498751", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Jeroen Tubex", + "homepage": "https://www.drupal.org/u/jeroent", + "role": "Maintainer" + }, + { + "name": "benjy", + "homepage": "https://www.drupal.org/user/1852732" + } + ], + "description": "Allows site administrators to grant some roles the authority to assign selected roles to users.", + "homepage": "http://drupal.org/project/role_delegation", + "support": { + "source": "https://git.drupalcode.org/project/role_delegation", + "issues": "http://drupal.org/project/role_delegation" + } + }, + { + "name": "drupal/role_hierarchy", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/role_hierarchy.git", + "reference": "8.x-2.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/role_hierarchy-8.x-2.2.zip", + "reference": "8.x-2.2", + "shasum": "b5dc500ffbcdab00f3fc2200816f041730efd4f2" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.2", + "datestamp": "1613641956", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "cristiroma", + "homepage": "https://www.drupal.org/user/2267390" + }, + { + "name": "stefan.butura", + "homepage": "https://www.drupal.org/user/3535177" + } + ], + "description": "Provides security updates for platforms that are using a clear role hierarchy.", + "homepage": "https://www.drupal.org/project/role_hierarchy", + "support": { + "source": "https://git.drupalcode.org/project/role_hierarchy" + } + }, { "name": "drupal/search_api", - "version": "1.18.0", + "version": "1.19.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.18" + "reference": "8.x-1.19" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.18.zip", - "reference": "8.x-1.18", - "shasum": "6cf1d6820ba55891e204bac40b6031ed15db482a" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.19.zip", + "reference": "8.x-1.19", + "shasum": "5654e9d02117e28c585d89a25ea3cc40d20c5019" }, "require": { "drupal/core": "^8.8 || ^9" @@ -5231,8 +5456,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.18", - "datestamp": "1605204423", + "version": "8.x-1.19", + "datestamp": "1612192040", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5559,6 +5784,139 @@ "issues": "https://www.drupal.org/project/issues/transliterate_filenames" } }, + { + "name": "drupal/workbench", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/workbench.git", + "reference": "8.x-1.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/workbench-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "643d5f27503d7fceda8673812ca9a3bc25ed53e5" + }, + "require": { + "drupal/core": "^8.8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.3", + "datestamp": "1590419810", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, + { + "name": "agentrickard", + "homepage": "https://www.drupal.org/user/20975" + }, + { + "name": "bbinkovitz", + "homepage": "https://www.drupal.org/user/161263" + }, + { + "name": "becw", + "homepage": "https://www.drupal.org/user/81067" + }, + { + "name": "caroltron", + "homepage": "https://www.drupal.org/user/171342" + }, + { + "name": "robeano", + "homepage": "https://www.drupal.org/user/67660" + }, + { + "name": "stevector", + "homepage": "https://www.drupal.org/user/179805" + } + ], + "description": "Provides convenient dashboards and shortcuts for editors.", + "homepage": "https://www.drupal.org/project/workbench", + "support": { + "source": "https://git.drupalcode.org/project/workbench" + } + }, + { + "name": "drupal/workbench_access", + "version": "1.0.0-beta4", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/workbench_access.git", + "reference": "8.x-1.0-beta4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/workbench_access-8.x-1.0-beta4.zip", + "reference": "8.x-1.0-beta4", + "shasum": "8d81c3daef91d89ecb3c0e3823ee0144b37889a8" + }, + "require": { + "drupal/core": "^8.7.7 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-beta4", + "datestamp": "1591119383", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, + { + "name": "agentrickard", + "homepage": "https://www.drupal.org/user/20975" + }, + { + "name": "becw", + "homepage": "https://www.drupal.org/user/81067" + }, + { + "name": "robeano", + "homepage": "https://www.drupal.org/user/67660" + }, + { + "name": "stevector", + "homepage": "https://www.drupal.org/user/179805" + } + ], + "description": "Hierarchical access control for content.", + "homepage": "https://www.drupal.org/project/workbench_access", + "support": { + "source": "https://git.drupalcode.org/project/workbench_access" + } + }, { "name": "drush/drush", "version": "9.7.2", @@ -6684,12 +7042,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/controlled_access_terms.git", - "reference": "bf962a8bbbe32ae6a1c27e9753ab9d4981042db9" + "reference": "7a03834409e91807cf1c94900a1749c1b582ae03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/controlled_access_terms/zipball/bf962a8bbbe32ae6a1c27e9753ab9d4981042db9", - "reference": "bf962a8bbbe32ae6a1c27e9753ab9d4981042db9", + "url": "https://api.github.com/repos/jhu-idc/controlled_access_terms/zipball/7a03834409e91807cf1c94900a1749c1b582ae03", + "reference": "7a03834409e91807cf1c94900a1749c1b582ae03", "shasum": "" }, "require": { @@ -6731,7 +7089,7 @@ "issues": "https://github.com/jhu-idc/controlled_access_terms/issues", "source": "https://github.com/jhu-idc/controlled_access_terms/tree/8.x-1.x" }, - "time": "2021-02-22T22:01:08+00:00" + "time": "2021-04-06T18:27:53+00:00" }, { "name": "jhu-idc/idc-ui-theme", @@ -6783,12 +7141,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/islandora_defaults.git", - "reference": "e6a1083a7d7ea821dad45043fe1863127538d5af" + "reference": "ffbbe98f1202ad734ba9b0287221fe722e01c50f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/islandora_defaults/zipball/e6a1083a7d7ea821dad45043fe1863127538d5af", - "reference": "e6a1083a7d7ea821dad45043fe1863127538d5af", + "url": "https://api.github.com/repos/jhu-idc/islandora_defaults/zipball/ffbbe98f1202ad734ba9b0287221fe722e01c50f", + "reference": "ffbbe98f1202ad734ba9b0287221fe722e01c50f", "shasum": "" }, "require": { @@ -6814,7 +7172,7 @@ "issues": "https://github.com/jhu-idc/islandora_defaults/issues", "source": "https://github.com/jhu-idc/islandora_defaults/tree/8.x-1.x" }, - "time": "2021-03-17T14:28:23+00:00" + "time": "2021-04-06T18:04:35+00:00" }, { "name": "jhu-idc/migrate_file", @@ -7438,6 +7796,12 @@ "sftp", "storage" ], + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], "time": "2020-08-23T07:39:11+00:00" }, { @@ -7829,6 +8193,16 @@ "logging", "psr-3" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2020-12-14T12:56:38+00:00" }, { @@ -10885,6 +11259,16 @@ "rabbitmq", "stomp" ], + "funding": [ + { + "url": "https://github.com/jmglsn", + "type": "github" + }, + { + "url": "https://github.com/staabm", + "type": "github" + } + ], "time": "2020-06-15T18:01:49+00:00" }, { @@ -11452,6 +11836,20 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-09-07T11:33:47+00:00" }, { @@ -12973,6 +13371,20 @@ ], "description": "Symfony Security Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-28T05:23:51+00:00" }, { @@ -16753,10 +17165,12 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "drupal/auto_entitylabel": 10, "drupal/content_browser": 15, "drupal/libraries": 20, "drupal/migrate_source_ui": 5, "drupal/pdf": 20, + "drupal/workbench_access": 10, "islandora-rdm/islandora_fits": 20, "islandora/carapace": 20, "jhu-idc/idc-ui-theme": 20, diff --git a/codebase/config/sync/block.block.contributors.yml b/codebase/config/sync/block.block.contributors.yml deleted file mode 100644 index f71668aba..000000000 --- a/codebase/config/sync/block.block.contributors.yml +++ /dev/null @@ -1,42 +0,0 @@ -uuid: d92feaba-2c95-4c66-b7c9-7b29ec550258 -langcode: en -status: true -dependencies: - config: - - facets.facet.contributors - module: - - context - - facets - - islandora - theme: - - carapace -_core: - default_config_hash: dvifUKfHq5BtFKPJWQrVbQbqMwwCzHTqtcNxY0b5XwA -id: contributors -theme: carapace -region: sidebar_second -weight: -7 -provider: null -plugin: 'facet_block:contributors' -settings: - id: 'facet_block:contributors' - label: Contributors - provider: facets - label_display: visible - block_id: contributors -visibility: - request_path_exclusion: - id: request_path_exclusion - pages: '' - negate: null - context_mapping: { } - view_inclusion: - id: view_inclusion - negate: null - view_inclusion: { } - context_mapping: { } - media_source_mimetype: - id: media_source_mimetype - mimetype: '' - negate: false - context_mapping: { } diff --git a/codebase/config/sync/block.block.exposedformsolr_search_contentpage_1.yml b/codebase/config/sync/block.block.exposedformsolr_search_contentpage_1.yml deleted file mode 100644 index 15da8d948..000000000 --- a/codebase/config/sync/block.block.exposedformsolr_search_contentpage_1.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 64b40114-4835-4f02-b14b-7704bbff3929 -langcode: en -status: true -dependencies: - config: - - views.view.solr_search_content - module: - - views - theme: - - carapace -_core: - default_config_hash: qAfb4caT_8NQ1iWN2j6l0TBEGLytvNolwkPexVyhDxs -id: exposedformsolr_search_contentpage_1 -theme: carapace -region: sidebar_second -weight: -8 -provider: null -plugin: 'views_exposed_filter_block:solr_search_content-page_1' -settings: - id: 'views_exposed_filter_block:solr_search_content-page_1' - label: '' - provider: views - label_display: visible - views_label: '' -visibility: { } diff --git a/codebase/config/sync/block.block.idcui_exposedformsolr_search_contentpage_1.yml b/codebase/config/sync/block.block.idcui_exposedformsolr_search_contentpage_1.yml deleted file mode 100644 index fc34a9526..000000000 --- a/codebase/config/sync/block.block.idcui_exposedformsolr_search_contentpage_1.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: caf57bab-6094-40ed-b151-5eb6a09ac705 -langcode: en -status: true -dependencies: - config: - - views.view.solr_search_content - module: - - views - theme: - - idcui -_core: - default_config_hash: qAfb4caT_8NQ1iWN2j6l0TBEGLytvNolwkPexVyhDxs -id: idcui_exposedformsolr_search_contentpage_1 -theme: idcui -region: top_menu -weight: -5 -provider: null -plugin: 'views_exposed_filter_block:solr_search_content-page_1' -settings: - id: 'views_exposed_filter_block:solr_search_content-page_1' - label: '' - provider: views - label_display: visible - views_label: '' -visibility: { } diff --git a/codebase/config/sync/block.block.idcui_subject.yml b/codebase/config/sync/block.block.idcui_subject.yml deleted file mode 100644 index dc8aafa6b..000000000 --- a/codebase/config/sync/block.block.idcui_subject.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 1081880b-7aad-4418-90fa-d6499d7afc48 -langcode: en -status: true -dependencies: - config: - - facets.facet.subject - module: - - facets - - system - theme: - - idcui -_core: - default_config_hash: Qy_nSE_PRV3YUVnl6KeCHqh_Ja3TtmqZD6bjj0ANEoM -id: idcui_subject -theme: idcui -region: top_menu -weight: 0 -provider: null -plugin: 'facet_block:subject' -settings: - id: 'facet_block:subject' - label: Subject - provider: facets - label_display: visible - block_id: subject -visibility: - request_path: - id: request_path - pages: /solr-search/content - negate: false - context_mapping: { } diff --git a/codebase/config/sync/block.block.subject.yml b/codebase/config/sync/block.block.subject.yml deleted file mode 100644 index 25f4c62b2..000000000 --- a/codebase/config/sync/block.block.subject.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 841432f2-31bf-4e89-a0ce-6185596c015c -langcode: en -status: true -dependencies: - config: - - facets.facet.subject - module: - - facets - - system - theme: - - carapace -_core: - default_config_hash: Qy_nSE_PRV3YUVnl6KeCHqh_Ja3TtmqZD6bjj0ANEoM -id: subject -theme: carapace -region: sidebar_second -weight: -6 -provider: null -plugin: 'facet_block:subject' -settings: - id: 'facet_block:subject' - label: Subject - provider: facets - label_display: visible - block_id: subject -visibility: - request_path: - id: request_path - pages: /solr-search/content - negate: false - context_mapping: { } diff --git a/codebase/config/sync/block.block.years.yml b/codebase/config/sync/block.block.years.yml deleted file mode 100644 index 1c50a1a5a..000000000 --- a/codebase/config/sync/block.block.years.yml +++ /dev/null @@ -1,40 +0,0 @@ -uuid: bfe5207d-5568-4184-82fe-63343bb2c66c -langcode: en -status: true -dependencies: - config: - - facets.facet.years - module: - - context - - facets - - islandora - theme: - - carapace -id: years -theme: carapace -region: sidebar_second -weight: -5 -provider: null -plugin: 'facet_block:years' -settings: - id: 'facet_block:years' - label: Years - provider: facets - label_display: visible - block_id: years -visibility: - request_path_exclusion: - id: request_path_exclusion - pages: '' - negate: null - context_mapping: { } - view_inclusion: - id: view_inclusion - negate: null - view_inclusion: { } - context_mapping: { } - media_source_mimetype: - id: media_source_mimetype - mimetype: '' - negate: false - context_mapping: { } diff --git a/codebase/config/sync/core.entity_form_display.media.audio.default.yml b/codebase/config/sync/core.entity_form_display.media.audio.default.yml index 78f4bfa19..ce76b5528 100644 --- a/codebase/config/sync/core.entity_form_display.media.audio.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.audio.default.yml @@ -31,7 +31,7 @@ content: weight: 3 settings: { } third_party_settings: { } - type: options_buttons + type: options_select region: content field_media_audio_file: weight: 1 diff --git a/codebase/config/sync/core.entity_form_display.media.document.default.yml b/codebase/config/sync/core.entity_form_display.media.document.default.yml index a5fff0a9e..cbf373901 100644 --- a/codebase/config/sync/core.entity_form_display.media.document.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.document.default.yml @@ -31,7 +31,7 @@ content: weight: 3 settings: { } third_party_settings: { } - type: options_buttons + type: options_select region: content field_media_document: settings: diff --git a/codebase/config/sync/core.entity_form_display.media.extracted_text.default.yml b/codebase/config/sync/core.entity_form_display.media.extracted_text.default.yml index ecd182be0..03a71d49e 100644 --- a/codebase/config/sync/core.entity_form_display.media.extracted_text.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.extracted_text.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.media.extracted_text.field_access_terms - field.field.media.extracted_text.field_edited_text - field.field.media.extracted_text.field_media_file - field.field.media.extracted_text.field_media_of @@ -26,9 +27,15 @@ content: region: content settings: { } third_party_settings: { } + field_access_terms: + weight: 4 + settings: { } + third_party_settings: { } + type: options_select + region: content field_edited_text: type: text_textarea - weight: 7 + weight: 8 region: content settings: rows: 5 @@ -36,7 +43,7 @@ content: third_party_settings: { } field_media_file: type: file_generic - weight: 6 + weight: 7 region: content settings: progress_indicator: throbber @@ -58,7 +65,7 @@ content: third_party_settings: { } path: type: path - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } @@ -66,7 +73,7 @@ content: type: boolean_checkbox settings: display_label: true - weight: 5 + weight: 6 region: content third_party_settings: { } uid: diff --git a/codebase/config/sync/core.entity_form_display.media.file.default.yml b/codebase/config/sync/core.entity_form_display.media.file.default.yml index 027d54e4e..c184d5ad4 100644 --- a/codebase/config/sync/core.entity_form_display.media.file.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.file.default.yml @@ -31,7 +31,7 @@ content: weight: 3 settings: { } third_party_settings: { } - type: options_buttons + type: options_select region: content field_media_file: settings: diff --git a/codebase/config/sync/core.entity_form_display.media.image.default.yml b/codebase/config/sync/core.entity_form_display.media.image.default.yml index 33e096212..8719ab4e2 100644 --- a/codebase/config/sync/core.entity_form_display.media.image.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.image.default.yml @@ -34,7 +34,7 @@ content: weight: 3 settings: { } third_party_settings: { } - type: options_buttons + type: options_select region: content field_media_image: settings: diff --git a/codebase/config/sync/core.entity_form_display.media.remote_video.default.yml b/codebase/config/sync/core.entity_form_display.media.remote_video.default.yml index 71b9d4296..59824576a 100644 --- a/codebase/config/sync/core.entity_form_display.media.remote_video.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.remote_video.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.media.remote_video.field_access_terms - field.field.media.remote_video.field_media_oembed_video - media.type.remote_video module: @@ -17,10 +18,16 @@ mode: default content: created: type: datetime_timestamp - weight: 10 + weight: 3 region: content settings: { } third_party_settings: { } + field_access_terms: + weight: 4 + settings: { } + third_party_settings: { } + type: options_select + region: content field_media_oembed_video: type: oembed_textfield weight: 0 @@ -31,14 +38,14 @@ content: region: content langcode: type: language_select - weight: 2 + weight: 1 region: content settings: include_locked: true third_party_settings: { } path: type: path - weight: 30 + weight: 5 region: content settings: { } third_party_settings: { } @@ -46,12 +53,12 @@ content: type: boolean_checkbox settings: display_label: true - weight: 100 + weight: 6 region: content third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 5 + weight: 2 settings: match_operator: CONTAINS match_limit: 10 diff --git a/codebase/config/sync/core.entity_form_display.media.video.default.yml b/codebase/config/sync/core.entity_form_display.media.video.default.yml index 351957f91..0de361675 100644 --- a/codebase/config/sync/core.entity_form_display.media.video.default.yml +++ b/codebase/config/sync/core.entity_form_display.media.video.default.yml @@ -31,7 +31,7 @@ content: weight: 3 settings: { } third_party_settings: { } - type: options_buttons + type: options_select region: content field_media_of: type: entity_reference_autocomplete diff --git a/codebase/config/sync/core.entity_form_display.node.collection_object.default.yml b/codebase/config/sync/core.entity_form_display.node.collection_object.default.yml index 429162a53..ff02a3067 100644 --- a/codebase/config/sync/core.entity_form_display.node.collection_object.default.yml +++ b/codebase/config/sync/core.entity_form_display.node.collection_object.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.collection_object.field_access_terms - field.field.node.collection_object.field_alternative_title - field.field.node.collection_object.field_citable_url - field.field.node.collection_object.field_collection_contact_email @@ -12,6 +13,7 @@ dependencies: - field.field.node.collection_object.field_featured_item - field.field.node.collection_object.field_finding_aid - field.field.node.collection_object.field_member_of + - field.field.node.collection_object.field_model - field.field.node.collection_object.field_title_language - node.type.collection_object module: @@ -24,10 +26,16 @@ mode: default content: created: type: datetime_timestamp - weight: 12 + weight: 13 region: content settings: { } third_party_settings: { } + field_access_terms: + weight: 26 + settings: { } + third_party_settings: { } + type: options_select + region: content field_alternative_title: weight: 3 settings: @@ -103,6 +111,26 @@ content: third_party_settings: { } type: entity_reference_autocomplete region: content + field_model: + weight: 15 + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + type: entity_reference_autocomplete + region: content + field_model: + weight: 15 + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + type: entity_reference_autocomplete + region: content field_title_language: weight: 1 settings: { } @@ -113,7 +141,7 @@ content: type: boolean_checkbox settings: display_label: true - weight: 13 + weight: 14 region: content third_party_settings: { } title: @@ -126,7 +154,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 11 + weight: 12 settings: match_operator: CONTAINS size: 60 diff --git a/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml b/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml index 046b614e3..cbe7b967a 100644 --- a/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml +++ b/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml @@ -61,7 +61,7 @@ third_party_settings: children: - field_model - field_member_of - - langcode + - field_access_terms - field_display_hints - field_weight parent_name: '' @@ -232,6 +232,12 @@ content: third_party_settings: { } type: options_buttons region: content + field_access_terms: + weight: 10 + settings: { } + third_party_settings: { } + type: options_select + region: content field_alternative_title: weight: 15 settings: @@ -358,7 +364,7 @@ content: region: content field_display_hints: type: options_buttons - weight: 13 + weight: 11 region: content settings: { } third_party_settings: { } @@ -475,10 +481,29 @@ content: region: content settings: match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' - match_limit: 10 - third_party_settings: { } + third_party_settings: + conditional_fields: + 4f370f9a-983c-415f-9f05-684f9a7369fb: + dependee: field_access_terms + settings: + state: '!empty' + condition: '!empty' + grouping: AND + values_set: 1 + value: '' + values: { } + value_form: { } + effect: fill + effect_options: + fill: + value: '' + reset: 1 + selector: '%val' + entity_type: node + bundle: islandora_object field_model: type: options_select weight: 8 @@ -555,7 +580,7 @@ content: type: options_select region: content field_weight: - weight: 15 + weight: 12 settings: placeholder: '' third_party_settings: { } @@ -570,13 +595,6 @@ content: third_party_settings: { } type: edtf_default region: content - langcode: - type: language_select - weight: 10 - region: content - settings: - include_locked: true - third_party_settings: { } status: type: boolean_checkbox settings: @@ -603,7 +621,7 @@ content: match_limit: 10 third_party_settings: { } hidden: - field_access_terms: true + langcode: true path: true promote: true sticky: true diff --git a/codebase/config/sync/core.entity_form_display.taxonomy_term.access_rights.default.yml b/codebase/config/sync/core.entity_form_display.taxonomy_term.access_rights.default.yml index 16813a2c3..abf092978 100644 --- a/codebase/config/sync/core.entity_form_display.taxonomy_term.access_rights.default.yml +++ b/codebase/config/sync/core.entity_form_display.taxonomy_term.access_rights.default.yml @@ -15,14 +15,14 @@ mode: default content: description: type: text_textarea - weight: 0 + weight: 1 region: content settings: placeholder: '' rows: 5 third_party_settings: { } field_authority_link: - weight: 102 + weight: 2 settings: placeholder_url: '' placeholder_title: '' @@ -31,17 +31,17 @@ content: region: content name: type: string_textfield - weight: -5 + weight: 0 region: content settings: - size: 60 + size: 255 placeholder: '' third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 103 + weight: 4 region: content third_party_settings: { } hidden: diff --git a/codebase/config/sync/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml b/codebase/config/sync/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml index e39226445..adc4a298d 100644 --- a/codebase/config/sync/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml +++ b/codebase/config/sync/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml @@ -34,7 +34,7 @@ content: weight: -5 region: content settings: - size: 60 + size: 255 placeholder: '' third_party_settings: { } status: diff --git a/codebase/config/sync/core.entity_form_display.taxonomy_term.corporate_body.default.yml b/codebase/config/sync/core.entity_form_display.taxonomy_term.corporate_body.default.yml index 13c132b94..44f535f7c 100644 --- a/codebase/config/sync/core.entity_form_display.taxonomy_term.corporate_body.default.yml +++ b/codebase/config/sync/core.entity_form_display.taxonomy_term.corporate_body.default.yml @@ -139,7 +139,7 @@ content: weight: 0 region: content settings: - size: 60 + size: 1024 placeholder: '' third_party_settings: { } status: diff --git a/codebase/config/sync/core.entity_form_display.taxonomy_term.islandora_access.default.yml b/codebase/config/sync/core.entity_form_display.taxonomy_term.islandora_access.default.yml new file mode 100644 index 000000000..0d8789857 --- /dev/null +++ b/codebase/config/sync/core.entity_form_display.taxonomy_term.islandora_access.default.yml @@ -0,0 +1,34 @@ +uuid: 60e06ae4-0b0d-46bd-9b0a-b214bc8bae21 +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.islandora_access + module: + - text +id: taxonomy_term.islandora_access.default +targetEntityType: taxonomy_term +bundle: islandora_access +mode: default +content: + description: + type: text_textarea + weight: 1 + region: content + settings: + placeholder: '' + rows: 5 + third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + langcode: true + path: true + status: true + translation: true diff --git a/codebase/config/sync/core.entity_view_display.media.extracted_text.default.yml b/codebase/config/sync/core.entity_view_display.media.extracted_text.default.yml index 346a5734a..8c4c62901 100644 --- a/codebase/config/sync/core.entity_view_display.media.extracted_text.default.yml +++ b/codebase/config/sync/core.entity_view_display.media.extracted_text.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.media.extracted_text.field_access_terms - field.field.media.extracted_text.field_edited_text - field.field.media.extracted_text.field_media_file - field.field.media.extracted_text.field_media_of @@ -30,6 +31,14 @@ content: custom_date_format: '' timezone: '' third_party_settings: { } + field_access_terms: + weight: 5 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content field_edited_text: type: text_default weight: 3 diff --git a/codebase/config/sync/core.entity_view_display.media.remote_video.default.yml b/codebase/config/sync/core.entity_view_display.media.remote_video.default.yml index 790b5e965..72aa35a61 100644 --- a/codebase/config/sync/core.entity_view_display.media.remote_video.default.yml +++ b/codebase/config/sync/core.entity_view_display.media.remote_video.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.media.remote_video.field_access_terms - field.field.media.remote_video.field_media_oembed_video - media.type.remote_video module: @@ -14,6 +15,14 @@ targetEntityType: media bundle: remote_video mode: default content: + field_access_terms: + weight: 1 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content field_media_oembed_video: type: oembed weight: 0 diff --git a/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml b/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml index 85087f189..0625b7e81 100644 --- a/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml +++ b/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.collection_object.field_access_terms - field.field.node.collection_object.field_alternative_title - field.field.node.collection_object.field_citable_url - field.field.node.collection_object.field_collection_contact_email @@ -12,6 +13,7 @@ dependencies: - field.field.node.collection_object.field_featured_item - field.field.node.collection_object.field_finding_aid - field.field.node.collection_object.field_member_of + - field.field.node.collection_object.field_model - field.field.node.collection_object.field_title_language - node.type.collection_object module: @@ -33,6 +35,14 @@ content: region: content settings: { } third_party_settings: { } + field_access_terms: + weight: 102 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content field_alternative_title: type: reference_value_formatter weight: 6 @@ -55,7 +65,7 @@ content: type: link region: content field_collection_contact_email: - weight: 9 + weight: 17 label: above settings: { } third_party_settings: { } @@ -116,6 +126,14 @@ content: third_party_settings: { } type: entity_reference_label region: content + field_model: + weight: 101 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content field_title_language: weight: 5 label: above @@ -124,6 +142,11 @@ content: third_party_settings: { } type: entity_reference_label region: content + islandora_fits_checksum: + weight: 100 + settings: { } + third_party_settings: { } + region: content links: weight: 4 region: content diff --git a/codebase/config/sync/core.entity_view_display.node.collection_object.teaser.yml b/codebase/config/sync/core.entity_view_display.node.collection_object.teaser.yml index caa56ef86..faeed4b1a 100644 --- a/codebase/config/sync/core.entity_view_display.node.collection_object.teaser.yml +++ b/codebase/config/sync/core.entity_view_display.node.collection_object.teaser.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser + - field.field.node.collection_object.field_access_terms - field.field.node.collection_object.field_alternative_title - field.field.node.collection_object.field_citable_url - field.field.node.collection_object.field_collection_contact_email @@ -13,6 +14,7 @@ dependencies: - field.field.node.collection_object.field_featured_item - field.field.node.collection_object.field_finding_aid - field.field.node.collection_object.field_member_of + - field.field.node.collection_object.field_model - field.field.node.collection_object.field_title_language - node.type.collection_object module: @@ -40,6 +42,11 @@ content: rel: '' target: '' third_party_settings: { } + islandora_fits_checksum: + weight: 100 + settings: { } + third_party_settings: { } + region: content links: weight: 3 region: content @@ -49,6 +56,7 @@ hidden: display_media_entity_view_1: true display_media_entity_view_2: true display_media_service_file: true + field_access_terms: true field_alternative_title: true field_collection_contact_email: true field_collection_contact_name: true @@ -57,6 +65,7 @@ hidden: field_featured_item: true field_finding_aid: true field_member_of: true + field_model: true field_title_language: true langcode: true openseadragon_media_evas_entity_view_1: true diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml index 8f24625c5..861e30006 100644 --- a/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml +++ b/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml @@ -84,6 +84,22 @@ content: third_party_settings: { } type: entity_reference_label region: content + field_access_terms: + weight: 42 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content + field_access_terms: + weight: 42 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content field_alternative_title: weight: 3 label: above @@ -442,7 +458,6 @@ hidden: display_media_entity_view_1: true display_media_entity_view_2: true display_media_thumbnail: true - field_access_terms: true field_display_hints: true field_gemini_uri: true field_model: true diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml index 2021dc1df..8aec3a537 100644 --- a/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml +++ b/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml @@ -55,7 +55,6 @@ dependencies: - controlled_access_terms - link - reference_value_pair - - taxonomy - user _core: default_config_hash: BOKmqgfhsFt_yEb5fjCzV99sysk7G9p43DoVfTsh3OQ @@ -86,13 +85,6 @@ content: settings: link: true third_party_settings: { } - field_access_terms: - type: entity_reference_rss_category - weight: 27 - region: content - label: above - settings: { } - third_party_settings: { } field_alternative_title: type: reference_value_formatter weight: 26 @@ -442,6 +434,7 @@ hidden: display_media_entity_view_2: true display_media_service_file: true display_media_thumbnail: true + field_access_terms: true field_display_hints: true field_dspace_identifier: true field_dspace_item_id: true diff --git a/codebase/config/sync/core.entity_view_display.node.page.content_browser.yml b/codebase/config/sync/core.entity_view_display.node.page.content_browser.yml index d6f2d6747..1d0d66376 100644 --- a/codebase/config/sync/core.entity_view_display.node.page.content_browser.yml +++ b/codebase/config/sync/core.entity_view_display.node.page.content_browser.yml @@ -24,9 +24,59 @@ content: settings: trim_length: 600 third_party_settings: { } + display_media_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_thumbnail: + weight: 10 + settings: { } + third_party_settings: { } + region: content links: weight: 101 region: content + openseadragon_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content hidden: langcode: true search_api_excerpt: true diff --git a/codebase/config/sync/core.entity_view_display.node.page.default.yml b/codebase/config/sync/core.entity_view_display.node.page.default.yml index eea1a5d46..3f9415bcd 100644 --- a/codebase/config/sync/core.entity_view_display.node.page.default.yml +++ b/codebase/config/sync/core.entity_view_display.node.page.default.yml @@ -22,9 +22,59 @@ content: region: content settings: { } third_party_settings: { } + display_media_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_thumbnail: + weight: 10 + settings: { } + third_party_settings: { } + region: content links: weight: 101 region: content + openseadragon_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content hidden: langcode: true search_api_excerpt: true diff --git a/codebase/config/sync/core.entity_view_display.node.page.teaser.yml b/codebase/config/sync/core.entity_view_display.node.page.teaser.yml index 7f8a6fb63..7a11248d7 100644 --- a/codebase/config/sync/core.entity_view_display.node.page.teaser.yml +++ b/codebase/config/sync/core.entity_view_display.node.page.teaser.yml @@ -24,9 +24,59 @@ content: settings: trim_length: 600 third_party_settings: { } + display_media_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + display_media_thumbnail: + weight: 10 + settings: { } + third_party_settings: { } + region: content links: weight: 101 region: content + openseadragon_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + openseadragon_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_1: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_entity_view_2: + weight: 10 + settings: { } + third_party_settings: { } + region: content + pdfjs_media_evas_service_file: + weight: 10 + settings: { } + third_party_settings: { } + region: content hidden: langcode: true search_api_excerpt: true diff --git a/codebase/config/sync/core.entity_view_display.taxonomy_term.islandora_access.default.yml b/codebase/config/sync/core.entity_view_display.taxonomy_term.islandora_access.default.yml new file mode 100644 index 000000000..1122054c7 --- /dev/null +++ b/codebase/config/sync/core.entity_view_display.taxonomy_term.islandora_access.default.yml @@ -0,0 +1,23 @@ +uuid: d1633c2a-6d57-41d6-b1b6-c8025fe5fd0e +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.islandora_access + module: + - text +id: taxonomy_term.islandora_access.default +targetEntityType: taxonomy_term +bundle: islandora_access +mode: default +content: + description: + label: hidden + type: text_default + weight: 0 + region: content + settings: { } + third_party_settings: { } +hidden: + langcode: true + search_api_excerpt: true diff --git a/codebase/config/sync/core.extension.yml b/codebase/config/sync/core.extension.yml index ed7bb8da7..7e96b9628 100644 --- a/codebase/config/sync/core.extension.yml +++ b/codebase/config/sync/core.extension.yml @@ -1,6 +1,7 @@ module: action: 0 admin_toolbar: 0 + admin_toolbar_links_access_filter: 0 automated_cron: 0 basic_auth: 0 big_pipe: 0 @@ -32,6 +33,7 @@ module: embed: 0 entity_browser: 0 entity_embed: 0 + entity_reference_unpublished: 0 epp: 0 eva: 0 facets: 0 @@ -101,6 +103,8 @@ module: rest: 0 rest_oai_pmh: 0 restui: 0 + role_delegation: 0 + role_hierarchy: 0 search_api: 0 search_api_solr: 0 search_api_solr_defaults: 0 @@ -119,6 +123,8 @@ module: update: 0 user: 0 views_ui: 0 + workbench: 0 + workbench_access: 0 content_translation: 10 externalauth: 10 views: 10 diff --git a/codebase/config/sync/core.menu.static_menu_link_overrides.yml b/codebase/config/sync/core.menu.static_menu_link_overrides.yml index 55dc4b6e8..70ff36a3f 100644 --- a/codebase/config/sync/core.menu.static_menu_link_overrides.yml +++ b/codebase/config/sync/core.menu.static_menu_link_overrides.yml @@ -5,5 +5,11 @@ definitions: parent: '' weight: 0 expanded: false + workbench__create_content: + menu_name: workbench + parent: '' + weight: 1 + expanded: false + enabled: true _core: default_config_hash: o4bYR9ZupWb3AsOIizTUG4g-nu1mdJqA59UB7QT-ifQ diff --git a/codebase/config/sync/facets.facet.contributors.yml b/codebase/config/sync/facets.facet.contributors.yml deleted file mode 100644 index 58bffa402..000000000 --- a/codebase/config/sync/facets.facet.contributors.yml +++ /dev/null @@ -1,72 +0,0 @@ -uuid: 2f3314ec-7bba-461d-8992-9ec4e01cc1ac -langcode: en -status: true -dependencies: - config: - - search_api.index.default_solr_index - - views.view.solr_search_content - module: - - search_api -_core: - default_config_hash: dMN5WpPPKoWAenqVLJW8dUMrHoVXLE_eVewFvMBVg6o -id: contributors -name: Contributors -url_alias: contributors -weight: 0 -min_count: 1 -show_only_one_result: false -field_identifier: aggregated_field -facet_source_id: 'search_api:views_page__solr_search_content__page_1' -widget: - type: links - config: - show_numbers: false - soft_limit: 0 - soft_limit_settings: - show_less_label: 'Show less' - show_more_label: 'Show more' - show_reset_link: false - reset_text: 'Show all' - hide_reset_when_no_selection: false -query_operator: or -use_hierarchy: false -expand_hierarchy: false -enable_parent_when_child_gets_disabled: true -hard_limit: 0 -exclude: false -only_visible_when_facet_source_is_visible: true -processor_configs: - active_widget_order: - processor_id: active_widget_order - weights: - sort: 20 - settings: - sort: DESC - count_widget_order: - processor_id: count_widget_order - weights: - sort: 30 - settings: - sort: DESC - display_value_widget_order: - processor_id: display_value_widget_order - weights: - sort: 40 - settings: - sort: ASC - translate_entity_aggregated_fields: - processor_id: translate_entity_aggregated_fields - weights: - build: 5 - settings: { } - url_processor_handler: - processor_id: url_processor_handler - weights: - pre_query: 50 - build: 15 - settings: { } -empty_behavior: - behavior: text - text_format: plain_text - text: '-empty-' -show_title: false diff --git a/codebase/config/sync/facets.facet.subject.yml b/codebase/config/sync/facets.facet.subject.yml deleted file mode 100644 index 4f283b1b2..000000000 --- a/codebase/config/sync/facets.facet.subject.yml +++ /dev/null @@ -1,70 +0,0 @@ -uuid: d67fc4d6-be0b-408f-a0f8-cb1a7817e273 -langcode: en -status: true -dependencies: - config: - - search_api.index.default_solr_index - - views.view.solr_search_content - module: - - search_api -_core: - default_config_hash: TJP2yG8ZBf2x4H9SYx7VkrLBTYmBm2kE9uxA1cbrCas -id: subject -name: Subject -url_alias: subject -weight: -2 -min_count: 1 -show_only_one_result: false -field_identifier: field_subject -facet_source_id: 'search_api:views_page__solr_search_content__page_1' -widget: - type: links - config: - show_numbers: true - soft_limit: 10 - soft_limit_settings: - show_less_label: 'Show less' - show_more_label: 'Show more' - show_reset_link: true - reset_text: 'Show all' - hide_reset_when_no_selection: true -query_operator: or -use_hierarchy: false -expand_hierarchy: false -enable_parent_when_child_gets_disabled: true -hard_limit: 0 -exclude: false -only_visible_when_facet_source_is_visible: true -processor_configs: - active_widget_order: - processor_id: active_widget_order - weights: - sort: 20 - settings: - sort: DESC - count_widget_order: - processor_id: count_widget_order - weights: - sort: 30 - settings: - sort: DESC - display_value_widget_order: - processor_id: display_value_widget_order - weights: - sort: 40 - settings: - sort: ASC - hide_non_narrowing_result_processor: - processor_id: hide_non_narrowing_result_processor - weights: - build: 40 - settings: { } - url_processor_handler: - processor_id: url_processor_handler - weights: - pre_query: 50 - build: 15 - settings: { } -empty_behavior: - behavior: none -show_title: false diff --git a/codebase/config/sync/facets.facet.years.yml b/codebase/config/sync/facets.facet.years.yml deleted file mode 100644 index 0daf448d8..000000000 --- a/codebase/config/sync/facets.facet.years.yml +++ /dev/null @@ -1,57 +0,0 @@ -uuid: 16c03018-b899-4733-a40b-e2c79f897976 -langcode: en -status: true -dependencies: - config: - - search_api.index.default_solr_index - - views.view.solr_search_content - module: - - search_api -id: years -name: Years -url_alias: years -weight: 0 -min_count: 1 -show_only_one_result: true -field_identifier: field_years -facet_source_id: 'search_api:views_page__solr_search_content__page_1' -widget: - type: dropdown - config: - show_numbers: true - default_option_label: Choose -query_operator: or -use_hierarchy: false -expand_hierarchy: false -enable_parent_when_child_gets_disabled: true -hard_limit: 0 -exclude: false -only_visible_when_facet_source_is_visible: true -processor_configs: - active_widget_order: - processor_id: active_widget_order - weights: - sort: 20 - settings: - sort: DESC - count_widget_order: - processor_id: count_widget_order - weights: - sort: 30 - settings: - sort: DESC - display_value_widget_order: - processor_id: display_value_widget_order - weights: - sort: 40 - settings: - sort: ASC - url_processor_handler: - processor_id: url_processor_handler - weights: - pre_query: 50 - build: 15 - settings: { } -empty_behavior: - behavior: none -show_title: false diff --git a/codebase/config/sync/field.field.media.extracted_text.field_access_terms.yml b/codebase/config/sync/field.field.media.extracted_text.field_access_terms.yml new file mode 100644 index 000000000..b1f01875a --- /dev/null +++ b/codebase/config/sync/field.field.media.extracted_text.field_access_terms.yml @@ -0,0 +1,29 @@ +uuid: fa2e8118-8d80-4a79-ba4a-6acf41055780 +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_access_terms + - media.type.extracted_text + - taxonomy.vocabulary.islandora_access +id: media.extracted_text.field_access_terms +field_name: field_access_terms +entity_type: media +bundle: extracted_text +label: 'Access terms' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + islandora_access: islandora_access + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/codebase/config/sync/field.field.media.remote_video.field_access_terms.yml b/codebase/config/sync/field.field.media.remote_video.field_access_terms.yml new file mode 100644 index 000000000..c3492e6d1 --- /dev/null +++ b/codebase/config/sync/field.field.media.remote_video.field_access_terms.yml @@ -0,0 +1,29 @@ +uuid: b73980c8-30b8-4995-bc23-02a04547b84c +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_access_terms + - media.type.remote_video + - taxonomy.vocabulary.islandora_access +id: media.remote_video.field_access_terms +field_name: field_access_terms +entity_type: media +bundle: remote_video +label: 'Access terms' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + islandora_access: islandora_access + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/codebase/config/sync/field.field.node.collection_object.field_access_terms.yml b/codebase/config/sync/field.field.node.collection_object.field_access_terms.yml new file mode 100644 index 000000000..d9f710d23 --- /dev/null +++ b/codebase/config/sync/field.field.node.collection_object.field_access_terms.yml @@ -0,0 +1,35 @@ +uuid: 7cf1a8b0-cec5-42e1-b85c-366f1301ff5d +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_access_terms + - node.type.collection_object + - taxonomy.vocabulary.islandora_access + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 1 +id: node.collection_object.field_access_terms +field_name: field_access_terms +entity_type: node +bundle: collection_object +label: 'Access Terms' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + islandora_access: islandora_access + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/codebase/config/sync/field.field.node.collection_object.field_member_of.yml b/codebase/config/sync/field.field.node.collection_object.field_member_of.yml index c8f7f5c17..7536593c6 100644 --- a/codebase/config/sync/field.field.node.collection_object.field_member_of.yml +++ b/codebase/config/sync/field.field.node.collection_object.field_member_of.yml @@ -5,6 +5,12 @@ dependencies: config: - field.storage.node.field_member_of - node.type.collection_object + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 1 id: node.collection_object.field_member_of field_name: field_member_of entity_type: node @@ -16,12 +22,13 @@ translatable: true default_value: { } default_value_callback: '' settings: - handler: 'default:node' + handler: unpublished handler_settings: target_bundles: collection_object: collection_object sort: - field: _none - auto_create: false - auto_create_bundle: '' + field: title + direction: ASC + auto_create: 0 + auto_create_bundle: collection_object field_type: entity_reference diff --git a/codebase/config/sync/field.field.node.collection_object.field_model.yml b/codebase/config/sync/field.field.node.collection_object.field_model.yml new file mode 100644 index 000000000..f6cd6f5d4 --- /dev/null +++ b/codebase/config/sync/field.field.node.collection_object.field_model.yml @@ -0,0 +1,35 @@ +uuid: 958f6e3b-7796-4c0f-9b1e-c73963877f30 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_model + - node.type.collection_object + content: + - 'taxonomy_term:islandora_models:e9ee0e3a-791b-4888-8ace-3c1529380dd1' + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 1 +id: node.collection_object.field_model +field_name: field_model +entity_type: node +bundle: collection_object +label: Model +description: '' +required: false +translatable: true +default_value: + - + target_uuid: e9ee0e3a-791b-4888-8ace-3c1529380dd1 +default_value_callback: '' +settings: + handler: views + handler_settings: + view: + view_name: collection_object_models + display_name: entity_reference_1 + arguments: { } +field_type: entity_reference diff --git a/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml b/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml index a50993908..872e15775 100644 --- a/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml +++ b/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml @@ -1,4 +1,4 @@ -uuid: ed674684-92f4-478e-a7bf-6105dd0b39f1 +uuid: f8542ca6-17e6-4b23-abc0-4c92060a650b langcode: en status: true dependencies: @@ -6,19 +6,20 @@ dependencies: - field.storage.node.field_access_terms - node.type.islandora_object - taxonomy.vocabulary.islandora_access - enforced: - module: - - islandora_defaults -_core: - default_config_hash: bxdvVF5ex2stzftf8k4q-FcAOHcefS7mz8lKm1MitYU + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 0 id: node.islandora_object.field_access_terms field_name: field_access_terms entity_type: node bundle: islandora_object -label: 'Access Control' -description: 'Terms that define who has access to view/edit this resource.' +label: 'Access Terms' +description: '' required: false -translatable: false +translatable: true default_value: { } default_value_callback: '' settings: diff --git a/codebase/config/sync/field.field.node.islandora_object.field_member_of.yml b/codebase/config/sync/field.field.node.islandora_object.field_member_of.yml index 864aaba99..2b647bee5 100644 --- a/codebase/config/sync/field.field.node.islandora_object.field_member_of.yml +++ b/codebase/config/sync/field.field.node.islandora_object.field_member_of.yml @@ -9,6 +9,12 @@ dependencies: enforced: module: - islandora_defaults + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 1 _core: default_config_hash: v20YaVtVj46zHNe2jXTgkFAVVLS2UcyzL9Pw1ng9038 id: node.islandora_object.field_member_of @@ -22,13 +28,14 @@ translatable: false default_value: { } default_value_callback: '' settings: - handler: 'default:node' + handler: unpublished handler_settings: target_bundles: collection_object: collection_object islandora_object: islandora_object sort: - field: _none - auto_create: false + field: title + direction: ASC + auto_create: 0 auto_create_bundle: collection_object field_type: entity_reference diff --git a/codebase/config/sync/field.field.node.islandora_object.field_model.yml b/codebase/config/sync/field.field.node.islandora_object.field_model.yml index 02700d3eb..46ac449f7 100644 --- a/codebase/config/sync/field.field.node.islandora_object.field_model.yml +++ b/codebase/config/sync/field.field.node.islandora_object.field_model.yml @@ -8,6 +8,12 @@ dependencies: enforced: module: - islandora_defaults + module: + - epp +third_party_settings: + epp: + value: '' + on_update: 1 _core: default_config_hash: T8b37Vjp-fwzxYT0ebD4CZEIvVM1NmZkK2bStnHYskw id: node.islandora_object.field_model diff --git a/codebase/config/sync/field.field.taxonomy_term.geo_location.field_broader.yml b/codebase/config/sync/field.field.taxonomy_term.geo_location.field_broader.yml index d3515d53d..5375150e5 100644 --- a/codebase/config/sync/field.field.taxonomy_term.geo_location.field_broader.yml +++ b/codebase/config/sync/field.field.taxonomy_term.geo_location.field_broader.yml @@ -6,7 +6,12 @@ dependencies: - field.storage.taxonomy_term.field_broader - taxonomy.vocabulary.geo_location module: + - epp - link +third_party_settings: + epp: + value: '' + on_update: 1 id: taxonomy_term.geo_location.field_broader field_name: field_broader entity_type: taxonomy_term @@ -18,6 +23,6 @@ translatable: false default_value: { } default_value_callback: '' settings: - link_type: 17 - title: 1 + link_type: 16 + title: 0 field_type: link diff --git a/codebase/config/sync/field.storage.node.field_access_terms.yml b/codebase/config/sync/field.storage.node.field_access_terms.yml index 097b2d3e0..81c8cf424 100644 --- a/codebase/config/sync/field.storage.node.field_access_terms.yml +++ b/codebase/config/sync/field.storage.node.field_access_terms.yml @@ -1,4 +1,4 @@ -uuid: 20f6e0ac-0bf1-442f-89c4-6bac50c26bc5 +uuid: 5adeb564-8f1d-486f-a890-9323e4c169da langcode: en status: true dependencies: @@ -8,9 +8,7 @@ dependencies: - taxonomy third_party_settings: field_permissions: - permission_type: private -_core: - default_config_hash: yf5ONBhEFtk6wecSjGIXs8lk_eatTCLSPPVBBG6pk4o + permission_type: custom id: node.field_access_terms field_name: field_access_terms entity_type: node diff --git a/codebase/config/sync/field.storage.node.field_model.yml b/codebase/config/sync/field.storage.node.field_model.yml index 4ef94d737..9492e1174 100644 --- a/codebase/config/sync/field.storage.node.field_model.yml +++ b/codebase/config/sync/field.storage.node.field_model.yml @@ -8,7 +8,7 @@ dependencies: - taxonomy third_party_settings: field_permissions: - permission_type: public + permission_type: custom _core: default_config_hash: A_k0ZwrnLc07NfPad0ADTT6O09l691c3_s6Jztrphg0 id: node.field_model diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_collection.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_collection.yml index fb7c2e3f1..4a826d122 100644 --- a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_collection.yml +++ b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_collection.yml @@ -78,6 +78,21 @@ process: plugin: migration_lookup migration: idc_ingest_new_collection source: member_of + field_access_terms: + - + plugin: skip_on_empty + method: process + source: access_terms + - + plugin: explode + delimiter: '|' + strict: false + - + plugin: entity_lookup + bundle_key: vid + bundle: islandora_access + entity_type: taxonomy_term + value_key: name field_title_language: plugin: entity_lookup source: title_language diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml index 04728bb0a..5c6d4d820 100644 --- a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml +++ b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml @@ -72,6 +72,21 @@ process: bundle: access_rights entity_type: taxonomy_term value_key: name + field_access_terms: + - + plugin: skip_on_empty + method: process + source: access_terms + - + plugin: explode + delimiter: '|' + strict: false + - + plugin: entity_lookup + bundle_key: vid + bundle: islandora_access + entity_type: taxonomy_term + value_key: name field_alternative_title: - plugin: explode diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_taxonomy_islandora_accessterms.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_taxonomy_islandora_accessterms.yml new file mode 100644 index 000000000..ea8634b52 --- /dev/null +++ b/codebase/config/sync/migrate_plus.migration.idc_ingest_taxonomy_islandora_accessterms.yml @@ -0,0 +1,38 @@ +uuid: abe27bf2-82e0-4a30-aa2f-39463059e718 +langcode: en +status: true +dependencies: { } +id: idc_ingest_taxonomy_islandora_accessterms +class: null +field_plugin_method: null +cck_plugin_method: null +migration_tags: null +migration_group: idc_ingest +label: 'Taxonomy: Islandora Access Terms' +source: + plugin: csv + ids: + - local_id + path: 'Will be populated by the Migrate Source UI' + constants: + STATUS: true + ADMIN: 1 + DESC_FORMAT: basic_html +process: + name: name + description/value: description + description/format: + plugin: default_value + default_value: basic_html + status: constants/STATUS + parent: + plugin: entity_lookup + source: parent + entity_type: taxonomy_term + value_key: name + bundle_key: vid + bundle: islandora_access +destination: + plugin: 'entity:taxonomy_term' + default_bundle: islandora_access +migration_dependencies: null diff --git a/codebase/config/sync/rdf.mapping.node.islandora_object.yml b/codebase/config/sync/rdf.mapping.node.islandora_object.yml index b4ec19811..1c5c23228 100644 --- a/codebase/config/sync/rdf.mapping.node.islandora_object.yml +++ b/codebase/config/sync/rdf.mapping.node.islandora_object.yml @@ -46,9 +46,13 @@ fieldMappings: field_date_available: properties: - 'dcterms:available' + datatype_callback: + callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value' field_date_coprighted: properties: - 'dcterms:dateCopyrighted' + datatype_callback: + callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value' field_date_created: properties: - 'dcterms:created' diff --git a/codebase/config/sync/role_hierarchy.settings.yml b/codebase/config/sync/role_hierarchy.settings.yml new file mode 100644 index 000000000..7a7636608 --- /dev/null +++ b/codebase/config/sync/role_hierarchy.settings.yml @@ -0,0 +1,8 @@ +strict: 0 +non_hierarchical_roles: + administrator: 0 + global_admin: 0 + collection_level_admin: 0 + fedoraadmin: 0 + authenticated: 0 + anonymous: 0 diff --git a/codebase/config/sync/search_api.index.default_solr_index.yml b/codebase/config/sync/search_api.index.default_solr_index.yml index d6c88bc1a..65a38fa1b 100644 --- a/codebase/config/sync/search_api.index.default_solr_index.yml +++ b/codebase/config/sync/search_api.index.default_solr_index.yml @@ -12,8 +12,8 @@ dependencies: - search_api config: - field.storage.node.field_abstract - - field.storage.node.field_access_terms - field.storage.node.field_access_rights + - field.storage.node.field_access_terms - field.storage.node.field_alternative_title - field.storage.node.body - field.storage.node.field_citable_url @@ -186,7 +186,7 @@ field_settings: config: - field.storage.node.field_access_rights field_access_terms: - label: 'Access Control' + label: 'Access Terms' datasource_id: 'entity:node' property_path: field_access_terms type: integer diff --git a/codebase/config/sync/shortcut.set.islandora-shortcuts.yml b/codebase/config/sync/shortcut.set.islandora-shortcuts.yml new file mode 100644 index 000000000..def47c586 --- /dev/null +++ b/codebase/config/sync/shortcut.set.islandora-shortcuts.yml @@ -0,0 +1,6 @@ +uuid: d1a3d7e1-cf30-4e02-8375-ab7bb9d862cb +langcode: en +status: true +dependencies: { } +id: islandora-shortcuts +label: Islandora diff --git a/codebase/config/sync/simplesamlphp_auth.settings.yml b/codebase/config/sync/simplesamlphp_auth.settings.yml index f08171569..3f88813b2 100644 --- a/codebase/config/sync/simplesamlphp_auth.settings.yml +++ b/codebase/config/sync/simplesamlphp_auth.settings.yml @@ -8,7 +8,7 @@ login_link_show: true login_link_display_name: 'Federated login' header_no_cache: false role: - population: 'staff:eduPersonAffiliation,~=,STAFF' + population: 'global_admin:eduPersonPrincipalName,=,staff1@johnshopkins.edu|collection_level_admin:eduPersonPrincipalName,=,staff2@johnshopkins.edu' eval_every_time: true register_users: true allow: @@ -16,6 +16,8 @@ allow: default_login: true default_login_roles: administrator: administrator + collection_level_admin: collection_level_admin + global_admin: global_admin default_login_users: '1' logout_goto_url: '' user_register_original: visitors_admin_approval diff --git a/codebase/config/sync/system.action.user_add_role_action.collection_level_admin.yml b/codebase/config/sync/system.action.user_add_role_action.collection_level_admin.yml new file mode 100644 index 000000000..915bd215a --- /dev/null +++ b/codebase/config/sync/system.action.user_add_role_action.collection_level_admin.yml @@ -0,0 +1,14 @@ +uuid: 034f7b73-cc86-451b-b1b0-d18280043319 +langcode: en +status: true +dependencies: + config: + - user.role.collection_level_admin + module: + - user +id: user_add_role_action.collection_level_admin +label: 'Add the Collection Level Admin role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: collection_level_admin diff --git a/codebase/config/sync/system.action.user_add_role_action.global_admin.yml b/codebase/config/sync/system.action.user_add_role_action.global_admin.yml new file mode 100644 index 000000000..7e1949d3d --- /dev/null +++ b/codebase/config/sync/system.action.user_add_role_action.global_admin.yml @@ -0,0 +1,14 @@ +uuid: 9525d141-a3a2-4e79-8691-e941247c5946 +langcode: en +status: true +dependencies: + config: + - user.role.global_admin + module: + - user +id: user_add_role_action.global_admin +label: 'Add the Global Admin role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: global_admin diff --git a/codebase/config/sync/system.action.user_add_role_action.staff.yml b/codebase/config/sync/system.action.user_add_role_action.staff.yml deleted file mode 100644 index 477c70c3c..000000000 --- a/codebase/config/sync/system.action.user_add_role_action.staff.yml +++ /dev/null @@ -1,14 +0,0 @@ -uuid: e63e8081-e550-4e21-9c43-f28db9ff1975 -langcode: en -status: true -dependencies: - config: - - user.role.staff - module: - - user -id: user_add_role_action.staff -label: 'Add the Staff role to the selected user(s)' -type: user -plugin: user_add_role_action -configuration: - rid: staff diff --git a/codebase/config/sync/system.action.user_remove_role_action.collection_level_admin.yml b/codebase/config/sync/system.action.user_remove_role_action.collection_level_admin.yml new file mode 100644 index 000000000..ad610bf93 --- /dev/null +++ b/codebase/config/sync/system.action.user_remove_role_action.collection_level_admin.yml @@ -0,0 +1,14 @@ +uuid: 592d0999-dc2d-4d96-8387-8dcf3ff9ab87 +langcode: en +status: true +dependencies: + config: + - user.role.collection_level_admin + module: + - user +id: user_remove_role_action.collection_level_admin +label: 'Remove the Collection Level Admin role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: collection_level_admin diff --git a/codebase/config/sync/system.action.user_remove_role_action.global_admin.yml b/codebase/config/sync/system.action.user_remove_role_action.global_admin.yml new file mode 100644 index 000000000..043c1034b --- /dev/null +++ b/codebase/config/sync/system.action.user_remove_role_action.global_admin.yml @@ -0,0 +1,14 @@ +uuid: b839bd0a-3d5c-4bbe-b987-58ccd9f474f8 +langcode: en +status: true +dependencies: + config: + - user.role.global_admin + module: + - user +id: user_remove_role_action.global_admin +label: 'Remove the Global Admin role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: global_admin diff --git a/codebase/config/sync/system.action.user_remove_role_action.staff.yml b/codebase/config/sync/system.action.user_remove_role_action.staff.yml deleted file mode 100644 index d2ecc9ad9..000000000 --- a/codebase/config/sync/system.action.user_remove_role_action.staff.yml +++ /dev/null @@ -1,14 +0,0 @@ -uuid: f41e3554-bf90-433c-92c1-958a57eec8fb -langcode: en -status: true -dependencies: - config: - - user.role.staff - module: - - user -id: user_remove_role_action.staff -label: 'Remove the Staff role from the selected user(s)' -type: user -plugin: user_remove_role_action -configuration: - rid: staff diff --git a/codebase/config/sync/system.menu.collections.yml b/codebase/config/sync/system.menu.collections.yml new file mode 100644 index 000000000..451f663a2 --- /dev/null +++ b/codebase/config/sync/system.menu.collections.yml @@ -0,0 +1,8 @@ +uuid: 4557f1a2-3738-4b2a-b2ba-05c68408d95c +langcode: en +status: true +dependencies: { } +id: collections +label: Collections +description: '' +locked: false diff --git a/codebase/config/sync/system.menu.workbench.yml b/codebase/config/sync/system.menu.workbench.yml new file mode 100644 index 000000000..989ffd076 --- /dev/null +++ b/codebase/config/sync/system.menu.workbench.yml @@ -0,0 +1,10 @@ +uuid: 8d36e189-cfa4-4090-a67c-a6b2b2a7b448 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: Uk5hyWhkNv7DHmWKBBnOc-W05llRdbXe19rUxCsSt8Y +id: workbench +label: Workbench +description: 'The editorial workbench.' +locked: true diff --git a/codebase/config/sync/taxonomy.vocabulary.islandora_access.yml b/codebase/config/sync/taxonomy.vocabulary.islandora_access.yml index f08ec5bbe..75d2de3fd 100644 --- a/codebase/config/sync/taxonomy.vocabulary.islandora_access.yml +++ b/codebase/config/sync/taxonomy.vocabulary.islandora_access.yml @@ -6,5 +6,5 @@ _core: default_config_hash: sQg5b6M8H_5jJt0gGa3xqAIh7ny7yU8TdHFwnwmzDdc name: 'Islandora Access' vid: islandora_access -description: 'Terms used to limit, restrict or coordinate access' +description: 'Terms used to limit, restrict or coordinate access among collections' weight: 1 diff --git a/codebase/config/sync/user.role.administrator.yml b/codebase/config/sync/user.role.administrator.yml index 521450855..e0d403820 100644 --- a/codebase/config/sync/user.role.administrator.yml +++ b/codebase/config/sync/user.role.administrator.yml @@ -6,6 +6,6 @@ _core: default_config_hash: Om6FEO7vZZMkPIbVvfxtdkWerQ2PvQM4sWUd6Q3ZnfI id: administrator label: Administrator -weight: 2 +weight: -10 is_admin: true permissions: { } diff --git a/codebase/config/sync/user.role.anonymous.yml b/codebase/config/sync/user.role.anonymous.yml index c7eae6c1a..94a17e7cf 100644 --- a/codebase/config/sync/user.role.anonymous.yml +++ b/codebase/config/sync/user.role.anonymous.yml @@ -6,14 +6,18 @@ _core: default_config_hash: pq_mEIu_B4widZN7Ap81iCJSjShFFdcL0jEiCi8VrDk id: anonymous label: 'Anonymous user' -weight: 0 +weight: -5 is_admin: false permissions: - - 'access comments' - 'access content' - 'access site-wide contact form' + - 'restful get oai_pmh' - 'search content' - 'use text format restricted_html' + - 'view field_access_terms' - 'view field_citable_url' + - 'view field_model' - 'view media' + - 'view own field_access_terms' - 'view own field_citable_url' + - 'view own field_model' diff --git a/codebase/config/sync/user.role.authenticated.yml b/codebase/config/sync/user.role.authenticated.yml index d5a74c453..d3b0671a9 100644 --- a/codebase/config/sync/user.role.authenticated.yml +++ b/codebase/config/sync/user.role.authenticated.yml @@ -6,18 +6,20 @@ _core: default_config_hash: btW6TFHajhy7Eo6YUvdFiPh4TcPggo8GBXYctjV6zag id: authenticated label: 'Authenticated user' -weight: 1 +weight: -6 is_admin: false permissions: - - 'access comments' - 'access content' - 'access shortcuts' - 'access site-wide contact form' - 'opt-in or out of matomo tracking' - - 'post comments' + - 'restful get oai_pmh' - 'search content' - - 'skip comment approval' - 'use text format basic_html' + - 'view field_access_terms' - 'view field_citable_url' + - 'view field_model' - 'view media' + - 'view own field_access_terms' - 'view own field_citable_url' + - 'view own field_model' diff --git a/codebase/config/sync/user.role.collection_level_admin.yml b/codebase/config/sync/user.role.collection_level_admin.yml new file mode 100644 index 000000000..e836c413f --- /dev/null +++ b/codebase/config/sync/user.role.collection_level_admin.yml @@ -0,0 +1,100 @@ +uuid: dd96fbc1-cb9a-42fc-ae6e-82c3eceae88d +langcode: en +status: true +dependencies: { } +id: collection_level_admin +label: 'Collection Level Admin' +weight: -8 +is_admin: null +permissions: + - 'access administration pages' + - 'access media overview' + - 'access migrate source ui' + - 'access site reports' + - 'access taxonomy overview' + - 'access toolbar' + - 'access workbench' + - 'administer migrations' + - 'batch update workbench access' + - 'create audio media' + - 'create document media' + - 'create extracted_text media' + - 'create field_access_control' + - 'create field_access_terms' + - 'create field_model' + - 'create file media' + - 'create fits_technical_metadata media' + - 'create image media' + - 'create islandora_object content' + - 'create media' + - 'create remote_video media' + - 'create terms in access_rights' + - 'create terms in copyright_and_use' + - 'create terms in corporate_body' + - 'create terms in family' + - 'create terms in genre' + - 'create terms in geo_location' + - 'create terms in language' + - 'create terms in person' + - 'create terms in resource_types' + - 'create terms in subject' + - 'create video media' + - 'edit any audio media' + - 'edit any collection_object content' + - 'edit any document media' + - 'edit any extracted_text media' + - 'edit any file media' + - 'edit any fits_technical_metadata media' + - 'edit any image media' + - 'edit any islandora_object content' + - 'edit any remote_video media' + - 'edit any video media' + - 'edit field_access_control' + - 'edit field_access_terms' + - 'edit field_model' + - 'edit own audio media' + - 'edit own collection_object content' + - 'edit own document media' + - 'edit own extracted_text media' + - 'edit own field_access_control' + - 'edit own field_access_terms' + - 'edit own field_model' + - 'edit own file media' + - 'edit own fits_technical_metadata media' + - 'edit own image media' + - 'edit own islandora_object content' + - 'edit own remote_video media' + - 'edit own video media' + - 'edit terms in access_rights' + - 'edit terms in copyright_and_use' + - 'edit terms in corporate_body' + - 'edit terms in family' + - 'edit terms in genre' + - 'edit terms in geo_location' + - 'edit terms in language' + - 'edit terms in person' + - 'edit terms in resource_types' + - 'edit terms in subject' + - 'manage media' + - 'manage members' + - 'replace files' + - 'restful get oai_pmh' + - 'revert collection_object revisions' + - 'revert islandora_object revisions' + - 'update any media' + - 'update media' + - 'use text format full_html' + - 'use text format restricted_html' + - 'use workbench access' + - 'view all media revisions' + - 'view checksums' + - 'view collection_object revisions' + - 'view field_access_control' + - 'view field_access_terms' + - 'view islandora_object revisions' + - 'view own field_access_control' + - 'view own field_access_terms' + - 'view own unpublished content' + - 'view own unpublished media' + - 'view the administration theme' + - 'view workbench access information' diff --git a/codebase/config/sync/user.role.fedoraadmin.yml b/codebase/config/sync/user.role.fedoraadmin.yml index 64b85f912..300bcfbfc 100644 --- a/codebase/config/sync/user.role.fedoraadmin.yml +++ b/codebase/config/sync/user.role.fedoraadmin.yml @@ -6,6 +6,6 @@ _core: default_config_hash: e6W733rBSNmewsIQsvWQ-8mIE5H-CIeArLBwIbN5vVQ id: fedoraadmin label: fedoraAdmin -weight: 3 +weight: -7 is_admin: null permissions: { } diff --git a/codebase/config/sync/user.role.global_admin.yml b/codebase/config/sync/user.role.global_admin.yml new file mode 100644 index 000000000..8c483b7fc --- /dev/null +++ b/codebase/config/sync/user.role.global_admin.yml @@ -0,0 +1,130 @@ +uuid: 5e61c5ea-bc1c-4d5f-afae-8c80a33eeadd +langcode: en +status: true +dependencies: { } +id: global_admin +label: 'Global Admin' +weight: -9 +is_admin: null +permissions: + - 'access administration pages' + - 'access browse_content entity browser pages' + - 'access browse_content_iframe entity browser pages' + - 'access content overview' + - 'access files overview' + - 'access media overview' + - 'access migrate source ui' + - 'access site reports' + - 'access taxonomy overview' + - 'access toolbar' + - 'access user profiles' + - 'access workbench' + - 'administer migrations' + - 'administer nodes' + - 'administer users' + - 'assign collection_level_admin role' + - 'assign selected workbench access' + - 'assign workbench access' + - 'batch update workbench access' + - 'bypass workbench access' + - 'create audio media' + - 'create collection_object content' + - 'create document media' + - 'create extracted_text media' + - 'create field_access_control' + - 'create field_access_group' + - 'create field_access_terms' + - 'create field_model' + - 'create file media' + - 'create fits_technical_metadata media' + - 'create image media' + - 'create islandora_object content' + - 'create media' + - 'create remote_video media' + - 'create terms in access_rights' + - 'create terms in copyright_and_use' + - 'create terms in corporate_body' + - 'create terms in family' + - 'create terms in genre' + - 'create terms in geo_location' + - 'create terms in islandora_access' + - 'create terms in language' + - 'create terms in person' + - 'create terms in resource_types' + - 'create terms in subject' + - 'create video media' + - 'delete terms in access_rights' + - 'delete terms in copyright_and_use' + - 'delete terms in corporate_body' + - 'delete terms in family' + - 'delete terms in genre' + - 'delete terms in geo_location' + - 'delete terms in islandora_access' + - 'delete terms in language' + - 'delete terms in person' + - 'delete terms in resource_types' + - 'delete terms in subject' + - 'edit any audio media' + - 'edit any collection_object content' + - 'edit any document media' + - 'edit any extracted_text media' + - 'edit any file media' + - 'edit any fits_technical_metadata media' + - 'edit any image media' + - 'edit any islandora_object content' + - 'edit any remote_video media' + - 'edit any video media' + - 'edit field_access_control' + - 'edit field_access_group' + - 'edit field_access_terms' + - 'edit field_model' + - 'edit own audio media' + - 'edit own collection_object content' + - 'edit own document media' + - 'edit own extracted_text media' + - 'edit own field_access_control' + - 'edit own field_access_group' + - 'edit own field_access_terms' + - 'edit own field_model' + - 'edit own file media' + - 'edit own fits_technical_metadata media' + - 'edit own image media' + - 'edit own islandora_object content' + - 'edit own remote_video media' + - 'edit own video media' + - 'edit terms in access_rights' + - 'edit terms in copyright_and_use' + - 'edit terms in corporate_body' + - 'edit terms in family' + - 'edit terms in genre' + - 'edit terms in geo_location' + - 'edit terms in islandora_access' + - 'edit terms in language' + - 'edit terms in person' + - 'edit terms in resource_types' + - 'edit terms in subject' + - 'manage media' + - 'manage members' + - 'replace files' + - 'restful get oai_pmh' + - 'revert collection_object revisions' + - 'revert islandora_object revisions' + - 'update any media' + - 'update media' + - 'use text format full_html' + - 'use text format restricted_html' + - 'use workbench access' + - 'view all media revisions' + - 'view checksums' + - 'view collection_object revisions' + - 'view field_access_control' + - 'view field_access_group' + - 'view field_access_terms' + - 'view islandora_object revisions' + - 'view own field_access_control' + - 'view own field_access_group' + - 'view own field_access_terms' + - 'view own unpublished content' + - 'view own unpublished media' + - 'view the administration theme' + - 'view workbench access information' diff --git a/codebase/config/sync/user.role.staff.yml b/codebase/config/sync/user.role.staff.yml deleted file mode 100644 index 761d65b12..000000000 --- a/codebase/config/sync/user.role.staff.yml +++ /dev/null @@ -1,9 +0,0 @@ -uuid: 7d946c88-d762-4efb-83be-27a57ec81223 -langcode: en -status: true -dependencies: { } -id: staff -label: Staff -weight: 4 -is_admin: null -permissions: { } diff --git a/codebase/config/sync/views.view.collection_object_models.yml b/codebase/config/sync/views.view.collection_object_models.yml new file mode 100644 index 000000000..df8221e96 --- /dev/null +++ b/codebase/config/sync/views.view.collection_object_models.yml @@ -0,0 +1,252 @@ +uuid: 87aa2d8b-c59a-49cd-905f-8da4ebf8757a +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.islandora_models + module: + - taxonomy + - user +id: collection_object_models +label: 'Collection Object Models' +module: views +description: 'These are the models in Islandora Models that are applicable to Repository Items. View is used on the Repository Item Edit page' +tag: '' +base_table: taxonomy_term_field_data +base_field: tid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + 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: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + inline: { } + separator: '' + hide_empty: false + default_field_elements: true + fields: + name: + id: name + table: taxonomy_term_field_data + field: name + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: false + ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + 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: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + 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 + convert_spaces: false + entity_type: taxonomy_term + entity_field: name + plugin_id: term_name + filters: + status: + value: '1' + table: taxonomy_term_field_data + field: status + plugin_id: boolean + entity_type: taxonomy_term + entity_field: status + id: status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + vid: + id: vid + table: taxonomy_term_field_data + field: vid + value: + islandora_models: islandora_models + entity_type: taxonomy_term + entity_field: vid + plugin_id: bundle + expose: + operator_limit_selection: false + operator_list: { } + name: + id: name + table: taxonomy_term_field_data + field: name + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: Collection + group: 1 + exposed: false + expose: + operator_id: name_op + label: Name + description: '' + use_operator: false + operator: name_op + operator_limit_selection: false + operator_list: { } + identifier: name + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + fedoraadmin: '0' + staff: '0' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: taxonomy_term + entity_field: name + plugin_id: string + sorts: { } + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.permissions + tags: { } + entity_reference_1: + display_plugin: entity_reference + id: entity_reference_1 + display_title: 'Entity Reference' + position: 1 + display_options: + display_extenders: { } + style: + type: entity_reference + options: + search_fields: + name: name + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + tags: { } diff --git a/codebase/config/sync/views.view.media_of.yml b/codebase/config/sync/views.view.media_of.yml index af1c68013..94a80b1e5 100644 --- a/codebase/config/sync/views.view.media_of.yml +++ b/codebase/config/sync/views.view.media_of.yml @@ -480,7 +480,6 @@ display: - user.permissions tags: - 'config:field.storage.media.field_mime_type' - - extensions page_1: display_plugin: page id: page_1 @@ -928,6 +927,11 @@ display: plugin_id: entity_operations defaults: fields: false + tab_options: + type: none + title: '' + description: '' + weight: 0 cache_metadata: max-age: 0 contexts: @@ -939,7 +943,6 @@ display: tags: - 'config:field.storage.media.field_media_use' - 'config:field.storage.media.field_mime_type' - - extensions rest_export_1: display_plugin: rest_export id: rest_export_1 @@ -1234,4 +1237,3 @@ display: - user.permissions tags: - 'config:field.storage.media.field_mime_type' - - extensions diff --git a/codebase/config/sync/views.view.openseadragon_media_evas.yml b/codebase/config/sync/views.view.openseadragon_media_evas.yml index af08af7cc..bd6ecb372 100644 --- a/codebase/config/sync/views.view.openseadragon_media_evas.yml +++ b/codebase/config/sync/views.view.openseadragon_media_evas.yml @@ -224,20 +224,25 @@ display: group: 1 exposed: false expose: - operator_id: '' - label: '' + operator_id: field_external_uri_uri_op + label: 'External URI (field_external_uri:uri)' description: '' use_operator: false - operator: '' - identifier: '' + operator: field_external_uri_uri_op + operator_limit_selection: false + operator_list: { } + identifier: field_external_uri_uri required: false remember: false multiple: false remember_roles: authenticated: authenticated + anonymous: '0' + administrator: '0' + fedoraadmin: '0' + collection_level_admin: '0' + global_admin: '0' placeholder: '' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' diff --git a/codebase/config/sync/views.view.repository_item_member_of.yml b/codebase/config/sync/views.view.repository_item_member_of.yml new file mode 100644 index 000000000..83ea17ce8 --- /dev/null +++ b/codebase/config/sync/views.view.repository_item_member_of.yml @@ -0,0 +1,183 @@ +uuid: aacd4289-a518-47bd-b864-566f74310187 +langcode: en +status: true +dependencies: + config: + - node.type.collection_object + module: + - node + - user +id: repository_item_member_of +label: 'Repository Item member_of' +module: views +description: '' +tag: '' +base_table: node_field_data +base_field: nid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + 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: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + inline: { } + separator: '' + hide_empty: false + default_field_elements: true + fields: + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + label: '' + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + exclude: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_alter_empty: true + click_sort_column: value + type: string + 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 + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + type: + id: type + table: node_field_data + field: type + value: + collection_object: collection_object + entity_type: node + entity_field: type + plugin_id: bundle + expose: + operator_limit_selection: false + operator_list: { } + sorts: + title: + id: title + table: node_field_data + field: title + order: ASC + entity_type: node + entity_field: title + plugin_id: standard + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + - user.permissions + tags: { } diff --git a/codebase/config/sync/views.view.repsitory_item_access_perm_types.yml b/codebase/config/sync/views.view.repsitory_item_access_perm_types.yml new file mode 100644 index 000000000..fbde41f0f --- /dev/null +++ b/codebase/config/sync/views.view.repsitory_item_access_perm_types.yml @@ -0,0 +1,282 @@ +uuid: 74b8b5d4-2bd2-4ea2-84ed-e061d8ce0521 +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.resource_types + module: + - taxonomy + - user +id: repsitory_item_access_perm_types +label: 'Repsitory Item Access Perm Types' +module: views +description: 'These are the models in Islandora Models that are applicable to Repository Items. View is used on the Repsitory Item Edit page.' +tag: '' +base_table: taxonomy_term_field_data +base_field: tid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + 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: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + inline: { } + separator: '' + hide_empty: false + default_field_elements: true + fields: + name: + id: name + table: taxonomy_term_field_data + field: name + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: false + ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + 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: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + 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 + convert_spaces: false + entity_type: taxonomy_term + entity_field: name + plugin_id: term_name + filters: + status: + value: '1' + table: taxonomy_term_field_data + field: status + plugin_id: boolean + entity_type: taxonomy_term + entity_field: status + id: status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + vid: + id: vid + table: taxonomy_term_field_data + field: vid + relationship: none + group_type: group + admin_label: '' + operator: in + value: + resource_types: resource_types + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: taxonomy_term + entity_field: vid + plugin_id: bundle + name: + id: name + table: taxonomy_term_field_data + field: name + relationship: none + group_type: group + admin_label: '' + operator: '!=' + value: Collection + group: 1 + exposed: false + expose: + operator_id: name_op + label: Name + description: '' + use_operator: false + operator: name_op + operator_limit_selection: false + operator_list: { } + identifier: name + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + fedoraadmin: '0' + staff: '0' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: taxonomy_term + entity_field: name + plugin_id: string + sorts: { } + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.permissions + tags: { } + entity_reference_1: + display_plugin: entity_reference + id: entity_reference_1 + display_title: 'Entity Reference' + position: 1 + display_options: + display_extenders: { } + style: + type: entity_reference + options: + search_fields: + name: name + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + tags: { } diff --git a/codebase/config/sync/views.view.solr_search_content.yml b/codebase/config/sync/views.view.solr_search_content.yml index 1982bb3bf..e0217d37a 100644 --- a/codebase/config/sync/views.view.solr_search_content.yml +++ b/codebase/config/sync/views.view.solr_search_content.yml @@ -5,7 +5,6 @@ dependencies: config: - field.storage.node.field_abstract - field.storage.node.field_access_rights - - field.storage.node.field_access_terms - field.storage.node.field_alternative_title - field.storage.node.field_citable_url - field.storage.node.field_collection_contact_email @@ -900,12 +899,6 @@ display: table: search_api_index_default_solr_index field: field_abstract plugin_id: search_api_field - field_access_terms: - id: field_access_terms - table: search_api_datasource_default_solr_index_entity_node - field: field_access_terms - entity_type: node - plugin_id: search_api_field field_access_rights: id: field_access_rights table: search_api_datasource_default_solr_index_entity_node @@ -1183,7 +1176,6 @@ display: tags: - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_access_rights' - - 'config:field.storage.node.field_access_terms' - 'config:field.storage.node.field_alternative_title' - 'config:field.storage.node.field_citable_url' - 'config:field.storage.node.field_collection_contact_name' @@ -1247,7 +1239,6 @@ display: tags: - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_access_rights' - - 'config:field.storage.node.field_access_terms' - 'config:field.storage.node.field_alternative_title' - 'config:field.storage.node.field_citable_url' - 'config:field.storage.node.field_collection_contact_name' @@ -1642,119 +1633,6 @@ display: multi_separator: ', ' entity_type: node plugin_id: search_api_field - field_access_terms: - id: field_access_terms - table: search_api_datasource_default_solr_index_entity_node - field: field_access_terms - relationship: none - group_type: group - admin_label: '' - label: '' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - 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: false - 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: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: true - group_column: target_id - 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 - field_rendering: true - fallback_handler: search_api_entity - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - display_methods: - access_rights: - display_method: label - view_mode: default - copyright_and_use: - display_method: label - view_mode: default - corporate_body: - display_method: label - view_mode: default - family: - display_method: label - view_mode: default - genre: - display_method: label - view_mode: default - geo_location: - display_method: label - view_mode: default - islandora_access: - display_method: label - islandora_display: - display_method: label - view_mode: default - islandora_media_use: - display_method: label - view_mode: default - islandora_models: - display_method: label - view_mode: default - language: - display_method: label - view_mode: default - person: - display_method: label - view_mode: default - resource_types: - display_method: label - view_mode: default - subject: - display_method: label - view_mode: default - entity_type: node - plugin_id: search_api_field field_access_rights: id: field_access_rights table: search_api_datasource_default_solr_index_entity_node @@ -5710,7 +5588,6 @@ display: tags: - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_access_rights' - - 'config:field.storage.node.field_access_terms' - 'config:field.storage.node.field_alternative_title' - 'config:field.storage.node.field_citable_url' - 'config:field.storage.node.field_collection_contact_email' diff --git a/codebase/config/sync/views.view.workbench_current_user.yml b/codebase/config/sync/views.view.workbench_current_user.yml new file mode 100644 index 000000000..4519bceb5 --- /dev/null +++ b/codebase/config/sync/views.view.workbench_current_user.yml @@ -0,0 +1,444 @@ +uuid: fe6c65c7-1489-45a3-81fd-af775c480caf +langcode: en +status: true +dependencies: + module: + - user +_core: + default_config_hash: x0E2jGoxP9eHkfDCa_squULlpvddE5h3gln_1oKeViY +id: workbench_current_user +label: 'Workbench: Current user' +module: views +description: 'Information about the current user.' +tag: Workbench +base_table: users_field_data +base_field: uid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access user profiles' + cache: + type: none + 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: none + options: + items_per_page: 0 + offset: 0 + style: + type: default + row: + type: fields + fields: + uid: + id: uid + table: users_field_data + field: uid + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + 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: false + 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: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_integer + settings: + thousand_separator: '' + prefix_suffix: false + 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 + entity_type: user + entity_field: uid + plugin_id: field + name: + id: name + table: users_field_data + field: name + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: false + ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + 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: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: user_name + settings: + link_to_entity: false + 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 + entity_type: user + entity_field: name + plugin_id: field + edit_user: + id: edit_user + table: users + field: edit_user + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + 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: false + 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: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + text: 'Edit my profile' + entity_type: user + plugin_id: entity_link_edit + access: + id: access + table: users_field_data + field: access + relationship: none + group_type: group + admin_label: '' + label: 'Last visit' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + 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: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: long + custom_date_format: '' + timezone: '' + 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 + entity_type: user + entity_field: access + plugin_id: field + roles: + id: roles + table: user__roles + field: roles_target_id + relationship: none + group_type: group + admin_label: '' + label: 'Assigned roles' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + 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: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + type: entity_reference_label + separator: ', ' + entity_type: user + entity_field: roles + plugin_id: user_roles + filters: + uid_current: + id: uid_current + table: users + field: uid_current + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '1' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + operator_limit_selection: false + operator_list: { } + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: user + plugin_id: user_current + sorts: { } + title: '' + header: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: false + tokenize: true + content: + value: '
Collections from the archives
", +accesscontrol_02,Collection A,Archives and Special Collections,"For items in Collection A
", +accesscontrol_03,Collection B,Collection A,, +accesscontrol_04,Collection C,Collection A,, +accesscontrol_05,Collection D,Archives and Special Collections,, +accesscontrol_06,Collection E,Collection D,, +accesscontrol_07,Parent Collection,,, diff --git a/tests/10-migration-backend-tests/testcafe/migrations/collection-01.csv b/tests/10-migration-backend-tests/testcafe/migrations/collection-01.csv index b517c3ca7..cbf62980a 100644 --- a/tests/10-migration-backend-tests/testcafe/migrations/collection-01.csv +++ b/tests/10-migration-backend-tests/testcafe/migrations/collection-01.csv @@ -1,3 +1,3 @@ -local_id,title,title_language,alternative_title,member_of,contact_email,contact_name,collection_number,description,finding_aid -collection-01,Parent Collection,,,,,,,, -collection-02,Test Collection One,eng,Titre alternatif pour Test Collection One;fre|Alternate Title for Test Collection One;eng,,emetsger@gmail.com,Elliot Metsger,1|2,This is a description for Test Collection One;eng|Esta es una descripción de la colección de pruebas uno;spa,http://wikipedia.org +local_id,title,title_language,alternative_title,member_of,access_terms,contact_email,contact_name,collection_number,description,finding_aid +collection-01,Parent Collection,,,,Parent Collection,,,,,, +collection-02,Test Collection One,eng,Titre alternatif pour Test Collection One;fre|Alternate Title for Test Collection One;eng,,Parent Collection,emetsger@gmail.com,Elliot Metsger,1|2,This is a description for Test Collection One;eng|Esta es una descripción de la colección de pruebas uno;spa,http://wikipedia.org diff --git a/tests/10-migration-backend-tests/testcafe/migrations/collection-02.csv b/tests/10-migration-backend-tests/testcafe/migrations/collection-02.csv index 0a443ac6b..b1807166d 100644 --- a/tests/10-migration-backend-tests/testcafe/migrations/collection-02.csv +++ b/tests/10-migration-backend-tests/testcafe/migrations/collection-02.csv @@ -1,3 +1,3 @@ -local_id,title,title_language,alternative_title,member_of,contact_email,contact_name,collection_number,description,finding_aid -collection-01,Parent Collection,,,,,,,, -collection-02,Test Collection One,eng,Titre alternatif pour Test Collection One;fre|Alternate Title for Test Collection One;eng,collection-01,emetsger@gmail.com,Elliot Metsger,1|2,This is a description for Test Collection One;eng|Esta es una descripción de la colección de pruebas uno;spa,http://wikipedia.org +local_id,title,title_language,alternative_title,member_of,access_terms,contact_email,contact_name,collection_number,description,finding_aid +collection-01,Parent Collection,,,,Parent Collection,,,,,, +collection-02,Test Collection One,eng,Titre alternatif pour Test Collection One;fre|Alternate Title for Test Collection One;eng,collection-01,Parent Collection,emetsger@gmail.com,Elliot Metsger,1|2,This is a description for Test Collection One;eng|Esta es una descripción de la colección de pruebas uno;spa,http://wikipedia.org diff --git a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-accessterms.csv b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-accessterms.csv new file mode 100644 index 000000000..91549c7ea --- /dev/null +++ b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-accessterms.csv @@ -0,0 +1,4 @@ +local_id,name,parent,description +io-accesscontrol_01,Images Collection,,, +io-accesscontrol_02,Ansel Adams,Images Collection,, + diff --git a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-collections.csv b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-collections.csv index cc1212ade..5c70c4078 100644 --- a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-collections.csv +++ b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-collections.csv @@ -1,3 +1,3 @@ -local_id,title,title_language,alternative_title,member_of,contact_email,contact_name,collection_number,description,finding_aid -io-collection-01,Images Collection,eng,,,,,,Collections of images;eng, -io-collection-02,Ansel Adams,eng,,,,,,Collection of Ansel Adams images;eng, +local_id,title,title_language,alternative_title,member_of,access_terms,contact_email,contact_name,collection_number,description,finding_aid +io-collection-01,Images Collection,eng,,,Images Collection,,,,Collections of images;eng, +io-collection-02,Ansel Adams,eng,,,Ansel Adams,,,,Collection of Ansel Adams images;eng, diff --git a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-corporatebodies.csv b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-corporatebodies.csv index 0ed0d4ca8..aaef52ec1 100644 --- a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-corporatebodies.csv +++ b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object-corporatebodies.csv @@ -1,3 +1,3 @@ local_id,name,primary_name,subordinate_name,date_of_meeting_or_treaty,location_of_meeting,num_of_section_or_meet,alt_date_of_meeting,alt_location_of_meeting,alt_number_of_section_or_meeting,alt_primary_name,alt_subordinate_name,relationships,date,authority,description -io-corp_01,Ansel Adams Publishing Rights Trust,,,,,,,,,,,,1974,,The Ansel Adams Publishing Rights Trust manages copyright for works by Ansel Adams.
-io-corp_02,Mountain Light Gallery,,,,,,,,,,,,1983,,"Mountain Light is a multi-faceted business, established in 1983 by Galen and Barbara Rowell. Mountain Light Gallery is open to the public, although Mountain Light’s core business is an image licensing department, housing hundreds of thousands of Galen’s and Barbara’s color images." +io-corp_01,Ansel Adams Publishing Rights Trust,Ansel Adams Publishing Rights Trust,,,,,,,,,,,1974,,The Ansel Adams Publishing Rights Trust manages copyright for works by Ansel Adams.
+io-corp_02,Mountain Light Gallery,Mountain Light Gallery,,,,,,,,,,,1983,,"Mountain Light is a multi-faceted business, established in 1983 by Galen and Barbara Rowell. Mountain Light Gallery is open to the public, although Mountain Light’s core business is an image licensing department, housing hundreds of thousands of Galen’s and Barbara’s color images." diff --git a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object.csv b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object.csv index 29e944aaa..d3d533f03 100644 --- a/tests/10-migration-backend-tests/testcafe/migrations/islandora_object.csv +++ b/tests/10-migration-backend-tests/testcafe/migrations/islandora_object.csv @@ -1,2 +1,2 @@ local_id,title,abstract,access_rights,access_terms,alt_title,collection_number,contributor,copyright,copyright_holder,creator,date_available,date_copyrighted,date_created,date_published,description,digital_identifier,digital_publisher,display_hints,dspace_identifier,dspace_itemid,extent,finding_aid,genre,geoportal_link,issn,is_part_of,item_barcode,jhir_uri,language,library_catalog_link,member_of,model,oclc_number,publisher,publisher_country,resource_type,spatial_coverage,subject,table_of_contents,title_language,years -io_01,Sample Repository Item,Sample Repository Item Abstract in English;eng|日本語のサンプルリポジトリアイテムの要約;jpn,Public digital access|Public Domain,,Sample Repository Item Alternate Title;eng|Пример альтернативного названия элемента репозитория на русском языке;rus,1|2,"relators:art;Adams, Islandora Object Ansel Easton, 1902-1984|relators:pht;Adams, Islandora Object Ansel Easton, 1902-1984",Copyright Undetermined,"Weston, Islandora Object Edward, 1886-1958|Adams, Islandora Object Ansel Easton, 1902-1984","relators:art;Adams, Islandora Object Ansel Easton, 1902-1984|relators:pht;Weston, Islandora Object Edward, 1886-1958",2020-01-01,2010-01-01|1941-11,1941-11-01|1941-11,1943|1944,Sample Repository Item Description in English;eng|सैंपल रिपोजिटरी आइटम का विवरण हिंदी मे;hin,a digital identifier one|a digital identifier two,Ansel Adams Publishing Rights Trust|Johns Hopkins Sheridan Libraries,Open Seadragon,http://jscholarship.library.jhu.edu,DSpace Item ID,1 item|one image file,http://www.google.com,Analog|Nature,http://catalyst.library.jhu.edu,12345678,https://en.wikipedia.org/wiki/San_Rafael_Reef,123456,http://jhir.jhu.edu,English|German,http://catalog.library.jhu.edu,io-collection-01|io-collection-02,Image,oclc_one|oclc_two,Ansel Adams Publishing Rights Trust|Johns Hopkins Sheridan Libraries,Mountain Light Gallery|Nevada,Dataset|Image,"Hernandez, NM|San Rafael Reef, UT",Analog Islandora Object Photography|General Islandora Object Photography,Table of Contents in English;eng|Inhaltsverzeichnis in deutscher Sprache;ger,English,1941|1943 \ No newline at end of file +io_01,Sample Repository Item,Sample Repository Item Abstract in English;eng|日本語のサンプルリポジトリアイテムの要約;jpn,Public digital access|Public Domain,Images Collection|Ansel Adams,Sample Repository Item Alternate Title;eng|Пример альтернативного названия элемента репозитория на русском языке;rus,1|2,"relators:art;Adams, Islandora Object Ansel Easton, 1902-1984|relators:pht;Adams, Islandora Object Ansel Easton, 1902-1984",Copyright Undetermined,"Weston, Islandora Object Edward, 1886-1958|Adams, Islandora Object Ansel Easton, 1902-1984","relators:art;Adams, Islandora Object Ansel Easton, 1902-1984|relators:pht;Weston, Islandora Object Edward, 1886-1958",2020-01-01,2010-01-01|1941-11,1941-11-01|1941-11,1943|1944,Sample Repository Item Description in English;eng|सैंपल रिपोजिटरी आइटम का विवरण हिंदी मे;hin,a digital identifier one|a digital identifier two,Ansel Adams Publishing Rights Trust|Johns Hopkins Sheridan Libraries,Open Seadragon,http://jscholarship.library.jhu.edu,DSpace Item ID,1 item|one image file,http://www.google.com,Analog|Nature,http://catalyst.library.jhu.edu,12345678,https://en.wikipedia.org/wiki/San_Rafael_Reef,123456,http://jhir.jhu.edu,English|German,http://catalog.library.jhu.edu,io-collection-01|io-collection-02,Image,oclc_one|oclc_two,Ansel Adams Publishing Rights Trust|Johns Hopkins Sheridan Libraries,Mountain Light Gallery|Nevada,Dataset|Image,"Hernandez, NM|San Rafael Reef, UT",Analog Islandora Object Photography|General Islandora Object Photography,Table of Contents in English;eng|Inhaltsverzeichnis in deutscher Sprache;ger,English,1941|1943 diff --git a/tests/10-migration-backend-tests/verification/expected/collection-01.json b/tests/10-migration-backend-tests/verification/expected/collection-01.json index ef6c7c7fa..bad964a32 100644 --- a/tests/10-migration-backend-tests/verification/expected/collection-01.json +++ b/tests/10-migration-backend-tests/verification/expected/collection-01.json @@ -31,7 +31,10 @@ "member_of": [ "Parent Collection" ], - "finding_aid": + "access_terms": [ + "Parent Collection" + ], + "finding_aid": { "uri": "http://wikipedia.org", "title": "Wikipedia" diff --git a/tests/10-migration-backend-tests/verification/expected/collection-02.json b/tests/10-migration-backend-tests/verification/expected/collection-02.json index 0f1a1d5ae..67b55fdfc 100644 --- a/tests/10-migration-backend-tests/verification/expected/collection-02.json +++ b/tests/10-migration-backend-tests/verification/expected/collection-02.json @@ -1,5 +1,8 @@ { "type": "node", "bundle": "collection_object", - "title": "Parent Collection" + "title": "Parent Collection", + "access_terms": [ + "Parent Collection" + ] } diff --git a/tests/10-migration-backend-tests/verification/expected/item-01.json b/tests/10-migration-backend-tests/verification/expected/item-01.json index ebb70292e..ab8b37787 100644 --- a/tests/10-migration-backend-tests/verification/expected/item-01.json +++ b/tests/10-migration-backend-tests/verification/expected/item-01.json @@ -112,6 +112,10 @@ "Images Collection", "Ansel Adams" ], + "access_terms": [ + "Images Collection", + "Ansel Adams" + ], "model": { "name": "Image", "external_uri": "http://purl.org/coar/resource_type/c_c513" diff --git a/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-01.json b/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-01.json new file mode 100644 index 000000000..7525762aa --- /dev/null +++ b/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-01.json @@ -0,0 +1,10 @@ +{ + "type": "taxonomy_term", + "bundle": "islandora_access", + "name": "Archives and Special Collections", + "description": { + "value": "Collections from the archives
", + "format": "basic_html", + "processed": "Collections from the archives
" + } +} diff --git a/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-02.json b/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-02.json new file mode 100644 index 000000000..ef68ca203 --- /dev/null +++ b/tests/10-migration-backend-tests/verification/expected/taxonomy-accessterms-02.json @@ -0,0 +1,13 @@ +{ + "type": "taxonomy_term", + "bundle": "islandora_access", + "name": "Collection A", + "parent": [ + "Archives and Special Collections" + ], + "description": { + "value": "For items in Collection A
", + "format": "basic_html", + "processed": "For items in Collection A
" + } +} diff --git a/tests/10-migration-backend-tests/verification/expected_json_types_test.go b/tests/10-migration-backend-tests/verification/expected_json_types_test.go index 96c80a2ec..8678f3d46 100644 --- a/tests/10-migration-backend-tests/verification/expected_json_types_test.go +++ b/tests/10-migration-backend-tests/verification/expected_json_types_test.go @@ -76,7 +76,8 @@ type ExpectedRepoObj struct { Extent []string FindingAid string `json:"finding_aid"` Genre []string - GeoportalLink string `json:"geoportal_link"` + GeoportalLink string `json:"geoportal_link"` + AccessTerms []string `json:"access_terms"` Issn string IsPartOf string `json:"is_part_of"` ItemBarcode string `json:"item_barcode"` @@ -122,6 +123,19 @@ type ExpectedAccessRights struct { } } +// Represents the expected results of a migrated Islandora Access Terms taxonomy term +type ExpectedIslandoraAccessTerms struct { + Type string + Bundle string + Name string + Parent []string `json:"parent"` + Description struct { + Value string + Format string + Processed string + } +} + // Represents the expected results of a migrated Copyright and Use taxonomy term type ExpectedCopyrightAndUse struct { Type string @@ -269,6 +283,7 @@ type ExpectedCollection struct { ContactName string `json:"contact_name"` CollectionNumber []string `json:"collection_number"` MemberOf []string `json:"member_of"` + AccessTerms []string `json:"access_terms"` FindingAid struct { Uri string Title string diff --git a/tests/10-migration-backend-tests/verification/jsonapi_types_test.go b/tests/10-migration-backend-tests/verification/jsonapi_types_test.go index 399f24fe6..683129b19 100644 --- a/tests/10-migration-backend-tests/verification/jsonapi_types_test.go +++ b/tests/10-migration-backend-tests/verification/jsonapi_types_test.go @@ -4,11 +4,12 @@ import ( "encoding/json" "errors" "fmt" - "github.com/stretchr/testify/assert" "log" "net/url" "strings" "testing" + + "github.com/stretchr/testify/assert" ) // Encapsulates the relevant components of a URL which executes a JSON API request against Drupal @@ -176,6 +177,27 @@ type JsonApiAccessRights struct { } `json:"data"` } +// Represents the results of a JSONAPI query for a single Islandora Access Taxonomy Term +type JsonApiIslandoraAccessTerms struct { + JsonApiData []struct { + Type DrupalType + Id string + JsonApiAttributes struct { + Name string + Description struct { + Value string + Format string + Processed string + } + } `json:"attributes"` + JsonApiRelationships struct { + AccessTerms struct { + Data []JsonApiData + } `json:"parent"` + } `json:"relationships"` + } `json:"data"` +} + // Represents the results of a JSONAPI query for a single Copyright and Use Taxonomy Term type JsonApiCopyrightAndUse struct { JsonApiData []struct { @@ -268,10 +290,11 @@ type JsonApiCollection struct { Description struct { Data []JsonApiLanguageValue } `json:"field_description"` + AccessTerms struct { + Data []JsonApiData + } `json:"field_access_terms"` MemberOf struct { - Data []struct { - JsonApiData - } + Data []JsonApiData } `json:"field_member_of"` } `json:"relationships"` } `json:"data"` @@ -328,7 +351,6 @@ type JsonApiIslandoraObj struct { AccessRights struct { Data []JsonApiData } `json:"field_access_rights"` - // TODO AccessTerms struct { Data []JsonApiData } `json:"field_access_terms"` diff --git a/tests/10-migration-backend-tests/verification/verify_migrations_test.go b/tests/10-migration-backend-tests/verification/verify_migrations_test.go index 3c37d399d..c89b34cc8 100644 --- a/tests/10-migration-backend-tests/verification/verify_migrations_test.go +++ b/tests/10-migration-backend-tests/verification/verify_migrations_test.go @@ -167,6 +167,68 @@ func Test_VerifyTaxonomyTermAccessRights(t *testing.T) { } } +// Verifies that the Islandora Access Terms migrated by testcafe accessterms.csv +// match the expected fields and values present in taxonomy-person-01.json +// This is testing a term with no parent +func Test_VerifyTaxonomyTermIslandoraAccessTerms_Term1(t *testing.T) { + verifyTaxonomyTermIslandoraAccessTerms(t, "taxonomy-accessterms-01.json") +} + +// Verifies that the Islandora Access Terms migrated by testcafe accessterms.csv +// match the expected fields and values present in taxonomy-person-02.json +// This is testing a term with a parent +func Test_VerifyTaxonomyTermIslandoraAccessTerms_Term2(t *testing.T) { + verifyTaxonomyTermIslandoraAccessTerms(t, "taxonomy-accessterms-02.json") +} + +func verifyTaxonomyTermIslandoraAccessTerms(t *testing.T, fileName string) { + expectedJson := ExpectedIslandoraAccessTerms{} + + unmarshalJson(t, fileName, &expectedJson) + + // sanity check the expected json + assert.Equal(t, "taxonomy_term", expectedJson.Type) + assert.Equal(t, "islandora_access", expectedJson.Bundle) + + u := &JsonApiUrl{ + t: t, + baseUrl: DrupalBaseurl, + drupalEntity: expectedJson.Type, + drupalBundle: expectedJson.Bundle, + filter: "name", + value: expectedJson.Name, + } + + // retrieve json of the migrated entity from the jsonapi and unmarshal the single response + accessTermsRes := &JsonApiIslandoraAccessTerms{} + u.get(accessTermsRes) + + actual := accessTermsRes.JsonApiData[0] + assert.Equal(t, expectedJson.Type, actual.Type.entity()) + assert.Equal(t, expectedJson.Bundle, actual.Type.bundle()) + assert.Equal(t, expectedJson.Name, actual.JsonApiAttributes.Name) + assert.Equal(t, expectedJson.Description.Format, actual.JsonApiAttributes.Description.Format) + assert.Equal(t, expectedJson.Description.Value, actual.JsonApiAttributes.Description.Value) + assert.Equal(t, expectedJson.Description.Processed, actual.JsonApiAttributes.Description.Processed) + + // one test doesn't have a parent. + if len(expectedJson.Parent) != 0 { + u.value = expectedJson.Parent[0] + + // retrieve json of the resolved entity from the jsonapi + accessTermsRes = &JsonApiIslandoraAccessTerms{} + u.get(accessTermsRes) + relParent := accessTermsRes.JsonApiData[0] + + // sanity + assert.Equal(t, relParent.Type.bundle(), "islandora_access") + assert.Equal(t, relParent.Type.entity(), "taxonomy_term") + + // test + assert.Equal(t, expectedJson.Parent[0], relParent.JsonApiAttributes.Name) + } +} + func Test_VerifyTaxonomyCopyrightAndUse(t *testing.T) { expectedJson := ExpectedCopyrightAndUse{} unmarshalJson(t, "taxonomy-copyrightanduse.json", &expectedJson) @@ -203,6 +265,42 @@ func Test_VerifyTaxonomyCopyrightAndUse(t *testing.T) { } } +func Test_VerifyTaxonomyTermResourceType(t *testing.T) { + expectedJson := ExpectedResourceType{} + unmarshalJson(t, "taxonomy-resourcetypes.json", &expectedJson) + + // sanity check the expected json + assert.Equal(t, "taxonomy_term", expectedJson.Type) + assert.Equal(t, "resource_types", expectedJson.Bundle) + + u := &JsonApiUrl{ + t: t, + baseUrl: DrupalBaseurl, + drupalEntity: expectedJson.Type, + drupalBundle: expectedJson.Bundle, + filter: "name", + value: expectedJson.Name, + } + + // retrieve json of the migrated entity from the jsonapi and unmarshal the single response + res := &JsonApiResourceType{} + u.getSingle(res) + + actual := res.JsonApiData[0] + assert.Equal(t, expectedJson.Type, actual.Type.entity()) + assert.Equal(t, expectedJson.Bundle, actual.Type.bundle()) + assert.Equal(t, expectedJson.Name, actual.JsonApiAttributes.Name) + assert.Equal(t, expectedJson.Description.Format, actual.JsonApiAttributes.Description.Format) + assert.Equal(t, expectedJson.Description.Value, actual.JsonApiAttributes.Description.Value) + assert.Equal(t, expectedJson.Description.Processed, actual.JsonApiAttributes.Description.Processed) + assert.Equal(t, len(expectedJson.Authority), len(actual.JsonApiAttributes.Authority)) + assert.Equal(t, 2, len(actual.JsonApiAttributes.Authority)) + for i, v := range actual.JsonApiAttributes.Authority { + assert.Equal(t, expectedJson.Authority[i].Source, v.Source) + assert.Equal(t, expectedJson.Authority[i].Uri, v.Uri) + } +} + func Test_VerifyTaxonomyTermFamily(t *testing.T) { expectedJson := ExpectedFamily{} unmarshalJson(t, "taxonomy-family-01.json", &expectedJson) @@ -349,42 +447,6 @@ func Test_VerifyTaxonomyTermGeolocation(t *testing.T) { } } -func Test_VerifyTaxonomyTermResourceType(t *testing.T) { - expectedJson := ExpectedAccessRights{} - unmarshalJson(t, "taxonomy-resourcetypes.json", &expectedJson) - - // sanity check the expected json - assert.Equal(t, "taxonomy_term", expectedJson.Type) - assert.Equal(t, "resource_types", expectedJson.Bundle) - - u := &JsonApiUrl{ - t: t, - baseUrl: DrupalBaseurl, - drupalEntity: expectedJson.Type, - drupalBundle: expectedJson.Bundle, - filter: "name", - value: expectedJson.Name, - } - - // retrieve json of the migrated entity from the jsonapi and unmarshal the single response - res := &JsonApiResourceType{} - u.getSingle(res) - - actual := res.JsonApiData[0] - assert.Equal(t, expectedJson.Type, actual.Type.entity()) - assert.Equal(t, expectedJson.Bundle, actual.Type.bundle()) - assert.Equal(t, expectedJson.Name, actual.JsonApiAttributes.Name) - assert.Equal(t, expectedJson.Description.Format, actual.JsonApiAttributes.Description.Format) - assert.Equal(t, expectedJson.Description.Value, actual.JsonApiAttributes.Description.Value) - assert.Equal(t, expectedJson.Description.Processed, actual.JsonApiAttributes.Description.Processed) - assert.Equal(t, len(expectedJson.Authority), len(actual.JsonApiAttributes.Authority)) - assert.Equal(t, 2, len(actual.JsonApiAttributes.Authority)) - for i, v := range actual.JsonApiAttributes.Authority { - assert.Equal(t, expectedJson.Authority[i].Source, v.Source) - assert.Equal(t, expectedJson.Authority[i].Uri, v.Uri) - } -} - func Test_VerifyTaxonomySubject(t *testing.T) { expectedJson := ExpectedSubject{} unmarshalJson(t, "taxonomy-subject.json", &expectedJson) @@ -564,7 +626,6 @@ func Test_VerifyCollection(t *testing.T) { assert.Equal(t, "taxonomy_term", relData.TitleLanguage.Data.Type.entity()) assert.Equal(t, "language", relData.TitleLanguage.Data.Type.bundle()) assert.Equal(t, expectedJson.TitleLangCode, relData.TitleLanguage.Data.langCode(t)) - // Resolve and verify alternate title values and languages assert.NotNil(t, relData.AltTitle.Data) assert.Equal(t, 2, len(relData.AltTitle.Data)) @@ -607,7 +668,28 @@ func Test_VerifyCollection(t *testing.T) { u.getSingle(&memberCol) assert.Equal(t, expectedJson.MemberOf[i], memberCol.JsonApiData[0].JsonApiAttributes.Title) + } + + // Resolve and verify access_terms values + assert.NotNil(t, relData.AccessTerms) + assert.Equal(t, 1, len(relData.AccessTerms.Data)) + assert.Equal(t, len(expectedJson.AccessTerms), len(relData.AccessTerms.Data)) + for i, accessTermsData := range relData.AccessTerms.Data { + assert.Equal(t, "taxonomy_term", accessTermsData.Type.entity()) + assert.Equal(t, "islandora_access", accessTermsData.Type.bundle()) + + u = &JsonApiUrl{ + t: t, + baseUrl: DrupalBaseurl, + drupalEntity: accessTermsData.Type.entity(), + drupalBundle: accessTermsData.Type.bundle(), + filter: "id", + value: accessTermsData.Id, + } + accessTerm := JsonApiIslandoraAccessTerms{} + u.get(&accessTerm) + assert.Equal(t, expectedJson.AccessTerms[i], accessTerm.JsonApiData[0].JsonApiAttributes.Name) } } @@ -720,6 +802,15 @@ func Test_VerifyRepositoryItem(t *testing.T) { assert.Equal(t, expectedJson.AccessRights[i], expectedAccessRights.JsonApiData[0].JsonApiAttributes.Name) } + // Access Terms + assert.Equal(t, 2, len(expectedJson.AccessTerms)) + assert.Equal(t, len(expectedJson.AccessTerms), len(relData.AccessTerms.Data)) + for i := range relData.AccessTerms.Data { + expectedAccessTerms := &JsonApiIslandoraAccessTerms{} + relData.AccessTerms.Data[i].resolve(t, expectedAccessTerms) + assert.Equal(t, expectedJson.AccessTerms[i], expectedAccessTerms.JsonApiData[0].JsonApiAttributes.Name) + } + // Alt title assert.Equal(t, 2, len(expectedJson.AltTitle)) assert.Equal(t, len(expectedJson.AltTitle), len(relData.AltTitle.Data))