diff --git a/.circleci/config.yml b/.circleci/config.yml index f2bcbb258..0d08b2527 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: name: Install DKTL command: | cd ~ - git clone --single-branch --depth 1 https://github.com/GetDKAN/dkan-tools.git + git clone --single-branch --depth 1 --branch 359-composer-merge https://github.com/GetDKAN/dkan-tools.git chmod 777 ./dkan-tools/bin/dktl export PATH=$PATH:~/dkan-tools/bin which dktl diff --git a/composer.json b/composer.json index 701b5d5fe..9bde4ea66 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "getdkan/dkan2", - "type": "drupal-profile", + "type": "drupal-module", "license": "GPL-2.0-or-later", "minimum-stability": "dev", "description": "DKAN Open Data Catalog", @@ -22,7 +22,6 @@ "getdkan/json-schema-provider": "^0.1.2", "getdkan/sae" : "^1.1.1", "getdkan/sql-parser": "^2.0.0", - "getdkan/lunr.php": "^1.0.0", "guzzlehttp/guzzle" : "^6.3", "ezyang/htmlpurifier" : "^4.11", "ramsey/uuid" : "^3.8.0", @@ -49,20 +48,8 @@ }, "authors": [ { - "name": "acouch", - "email": "acinternets@gmail.com" - }, - { - "name": "dafeder", - "email": "dafeder@gmail.com" - }, - { - "name": "fmizzell", - "email": "fmizzell.dev@gmail.com" - }, - { - "name": "Thierry Dallacroce", - "email": "thierry.dallacroce+dev@gmail.com" + "name": "CivicActions", + "email": "contact@civicactions.com" } ] } diff --git a/config/install/block.block.bartik_account_menu.yml b/config/install/block.block.bartik_account_menu.yml deleted file mode 100644 index 93cadc8ba..000000000 --- a/config/install/block.block.bartik_account_menu.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - system.menu.account - module: - - system - theme: - - bartik -id: bartik_account_menu -theme: bartik -region: secondary_menu -weight: 0 -provider: null -plugin: 'system_menu_block:account' -settings: - id: 'system_menu_block:account' - label: 'User account menu' - provider: system - label_display: '0' - level: 1 - depth: 1 -visibility: { } diff --git a/config/install/block.block.bartik_branding.yml b/config/install/block.block.bartik_branding.yml deleted file mode 100644 index 6cf70a77c..000000000 --- a/config/install/block.block.bartik_branding.yml +++ /dev/null @@ -1,22 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -id: bartik_branding -theme: bartik -region: header -weight: 0 -provider: null -plugin: system_branding_block -settings: - id: system_branding_block - label: 'Site branding' - provider: system - label_display: '0' - use_site_logo: true - use_site_name: true - use_site_slogan: true -visibility: { } diff --git a/config/install/block.block.bartik_breadcrumbs.yml b/config/install/block.block.bartik_breadcrumbs.yml deleted file mode 100644 index bce3d01ba..000000000 --- a/config/install/block.block.bartik_breadcrumbs.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -id: bartik_breadcrumbs -theme: bartik -region: breadcrumb -weight: 0 -provider: null -plugin: system_breadcrumb_block -settings: - id: system_breadcrumb_block - label: Breadcrumbs - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_content.yml b/config/install/block.block.bartik_content.yml deleted file mode 100644 index b1e0c801b..000000000 --- a/config/install/block.block.bartik_content.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -id: bartik_content -theme: bartik -region: content -weight: 0 -provider: null -plugin: system_main_block -settings: - id: system_main_block - label: 'Main page content' - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_footer.yml b/config/install/block.block.bartik_footer.yml deleted file mode 100644 index a8623d11e..000000000 --- a/config/install/block.block.bartik_footer.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - system.menu.footer - module: - - system - theme: - - bartik -id: bartik_footer -theme: bartik -region: footer_fifth -weight: 0 -provider: null -plugin: 'system_menu_block:footer' -settings: - id: 'system_menu_block:footer' - label: 'Footer menu' - provider: system - label_display: '0' - level: 1 - depth: 0 -visibility: { } diff --git a/config/install/block.block.bartik_local_actions.yml b/config/install/block.block.bartik_local_actions.yml deleted file mode 100644 index a58496db1..000000000 --- a/config/install/block.block.bartik_local_actions.yml +++ /dev/null @@ -1,17 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - bartik -id: bartik_local_actions -theme: bartik -region: content -weight: -20 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - provider: core - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_local_tasks.yml b/config/install/block.block.bartik_local_tasks.yml deleted file mode 100644 index 6b7c5d3a4..000000000 --- a/config/install/block.block.bartik_local_tasks.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - bartik -id: bartik_local_tasks -theme: bartik -region: content -weight: -40 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: Tabs - provider: core - label_display: '0' - primary: true - secondary: true -visibility: { } diff --git a/config/install/block.block.bartik_main_menu.yml b/config/install/block.block.bartik_main_menu.yml deleted file mode 100644 index dc7ebecb0..000000000 --- a/config/install/block.block.bartik_main_menu.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - system.menu.main - module: - - system - theme: - - bartik -id: bartik_main_menu -theme: bartik -region: primary_menu -weight: 0 -provider: null -plugin: 'system_menu_block:main' -settings: - id: 'system_menu_block:main' - label: 'Main navigation' - provider: system - label_display: '0' - level: 1 - depth: 1 -visibility: { } diff --git a/config/install/block.block.bartik_messages.yml b/config/install/block.block.bartik_messages.yml deleted file mode 100644 index e6bb7d766..000000000 --- a/config/install/block.block.bartik_messages.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -id: bartik_messages -theme: bartik -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_page_title.yml b/config/install/block.block.bartik_page_title.yml deleted file mode 100644 index 21cfb2f0e..000000000 --- a/config/install/block.block.bartik_page_title.yml +++ /dev/null @@ -1,17 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - bartik -id: bartik_page_title -theme: bartik -region: content -weight: -50 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - provider: core - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_powered.yml b/config/install/block.block.bartik_powered.yml deleted file mode 100644 index bb74cc80d..000000000 --- a/config/install/block.block.bartik_powered.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -id: bartik_powered -theme: bartik -region: footer_fifth -weight: 10 -provider: null -plugin: system_powered_by_block -settings: - id: system_powered_by_block - label: 'Powered by Drupal' - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.bartik_tools.yml b/config/install/block.block.bartik_tools.yml deleted file mode 100644 index 5a2aae5cb..000000000 --- a/config/install/block.block.bartik_tools.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - system.menu.tools - module: - - system - theme: - - bartik -id: bartik_tools -theme: bartik -region: sidebar_first -weight: 0 -provider: null -plugin: 'system_menu_block:tools' -settings: - id: 'system_menu_block:tools' - label: Tools - provider: system - label_display: visible - level: 1 - depth: 0 -visibility: { } diff --git a/config/install/block.block.seven_breadcrumbs.yml b/config/install/block.block.seven_breadcrumbs.yml deleted file mode 100644 index edbdfbd12..000000000 --- a/config/install/block.block.seven_breadcrumbs.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - seven -id: seven_breadcrumbs -theme: seven -region: breadcrumb -weight: 0 -provider: null -plugin: system_breadcrumb_block -settings: - id: system_breadcrumb_block - label: Breadcrumbs - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.seven_content.yml b/config/install/block.block.seven_content.yml deleted file mode 100644 index d92214c67..000000000 --- a/config/install/block.block.seven_content.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - seven -id: seven_content -theme: seven -region: content -weight: 0 -provider: null -plugin: system_main_block -settings: - id: system_main_block - label: 'Main page content' - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.seven_local_actions.yml b/config/install/block.block.seven_local_actions.yml deleted file mode 100644 index 61cdb177c..000000000 --- a/config/install/block.block.seven_local_actions.yml +++ /dev/null @@ -1,17 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - seven -id: seven_local_actions -theme: seven -region: content -weight: -10 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - provider: core - label_display: '0' -visibility: { } diff --git a/config/install/block.block.seven_login.yml b/config/install/block.block.seven_login.yml deleted file mode 100644 index 110e8fd80..000000000 --- a/config/install/block.block.seven_login.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - user - theme: - - seven -id: seven_login -theme: seven -region: content -weight: 10 -provider: null -plugin: user_login_block -settings: - id: user_login_block - label: 'User login' - provider: user - label_display: visible -visibility: { } diff --git a/config/install/block.block.seven_messages.yml b/config/install/block.block.seven_messages.yml deleted file mode 100644 index f7b6038b2..000000000 --- a/config/install/block.block.seven_messages.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - system - theme: - - seven -id: seven_messages -theme: seven -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - provider: system - label_display: '0' -visibility: { } diff --git a/config/install/block.block.seven_page_title.yml b/config/install/block.block.seven_page_title.yml deleted file mode 100644 index 56df293f3..000000000 --- a/config/install/block.block.seven_page_title.yml +++ /dev/null @@ -1,17 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - seven -id: seven_page_title -theme: seven -region: header -weight: -30 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - provider: core - label_display: '0' -visibility: { } diff --git a/config/install/block.block.seven_primary_local_tasks.yml b/config/install/block.block.seven_primary_local_tasks.yml deleted file mode 100644 index d0017c2c8..000000000 --- a/config/install/block.block.seven_primary_local_tasks.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - seven -id: seven_primary_local_tasks -theme: seven -region: header -weight: 0 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: 'Primary tabs' - provider: core - label_display: '0' - primary: true - secondary: false -visibility: { } diff --git a/config/install/block.block.seven_secondary_local_tasks.yml b/config/install/block.block.seven_secondary_local_tasks.yml deleted file mode 100644 index 33391991c..000000000 --- a/config/install/block.block.seven_secondary_local_tasks.yml +++ /dev/null @@ -1,19 +0,0 @@ -langcode: en -status: true -dependencies: - theme: - - seven -id: seven_secondary_local_tasks -theme: seven -region: pre_content -weight: 0 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: 'Secondary tabs' - provider: core - label_display: '0' - primary: false - secondary: true -visibility: { } diff --git a/config/install/node.settings.yml b/config/install/node.settings.yml deleted file mode 100644 index 6cb95cbc4..000000000 --- a/config/install/node.settings.yml +++ /dev/null @@ -1 +0,0 @@ -use_admin_theme: true diff --git a/config/install/system.site.yml b/config/install/system.site.yml deleted file mode 100644 index 48c74e4b5..000000000 --- a/config/install/system.site.yml +++ /dev/null @@ -1,2 +0,0 @@ -page: - front: //dkan/home diff --git a/config/install/system.theme.yml b/config/install/system.theme.yml deleted file mode 100644 index 57dadd47b..000000000 --- a/config/install/system.theme.yml +++ /dev/null @@ -1,2 +0,0 @@ -admin: seven -default: bartik diff --git a/config/install/user.role.alternate_api_user.yml b/config/install/user.role.alternate_api_user.yml new file mode 100644 index 000000000..21e5b3272 --- /dev/null +++ b/config/install/user.role.alternate_api_user.yml @@ -0,0 +1,10 @@ +langcode: en +status: true +dependencies: { } +id: alternate_api_user +label: 'Alternate API user' +weight: 3 +is_admin: false +permissions: + - 'get data through the alternate metastore api' + - 'query the alternate sql endpoint api' diff --git a/config/install/user.role.anonymous.yml b/config/install/user.role.anonymous.yml deleted file mode 100644 index d127516dd..000000000 --- a/config/install/user.role.anonymous.yml +++ /dev/null @@ -1,12 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: anonymous -label: 'Anonymous user' -weight: 0 -is_admin: false -permissions: - - 'access content' - - 'search content' - - 'access comments' - - 'access site-wide contact form' diff --git a/config/install/user.role.authenticated.yml b/config/install/user.role.authenticated.yml deleted file mode 100644 index e64d1b450..000000000 --- a/config/install/user.role.authenticated.yml +++ /dev/null @@ -1,15 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: authenticated -label: 'Authenticated user' -weight: 1 -is_admin: false -permissions: - - 'access content' - - 'search content' - - 'access comments' - - 'post comments' - - 'skip comment approval' - - 'access site-wide contact form' - - 'access shortcuts' diff --git a/config/install/user.settings.yml b/config/install/user.settings.yml deleted file mode 100644 index 0db56eecb..000000000 --- a/config/install/user.settings.yml +++ /dev/null @@ -1 +0,0 @@ -register: visitors_admin_approval diff --git a/dkan2.info.yml b/dkan2.info.yml index 04e27bf4c..68309cc52 100644 --- a/dkan2.info.yml +++ b/dkan2.info.yml @@ -1,22 +1,14 @@ name: DKAN description: 'DKAN Open Data Portal' -type: profile +type: module core: 8.x core_version_requirement: ^8 || ^9 dependencies: - - block - - block_content - - breakpoint - config - - config_update_ui - - contextual - - dblog - - dkan_admin - dkan_api - dkan_common - dkan_data - dkan_datastore - - dkan_dummy_content - dkan_metadata_form - dkan_metastore - dkan_search @@ -24,13 +16,5 @@ dependencies: - file - node - path - - system - - toolbar - user - - views -themes: - - bartik - - seven package: DKAN -distribution: - name: DKAN diff --git a/dkan.install b/dkan2.install similarity index 99% rename from dkan.install rename to dkan2.install index c0085680d..13eabb3fa 100644 --- a/dkan.install +++ b/dkan2.install @@ -39,6 +39,6 @@ function _dkan_uninstall_modules(array $modules, $uninstall_dependents = TRUE) { */ // function dkan_db_update_8001(&$sandbox) { // $messages = _dkan_db_uninstall_modules(['example']); - + // return $messages; -// } \ No newline at end of file +// } diff --git a/dkan.module b/dkan2.module similarity index 100% rename from dkan.module rename to dkan2.module diff --git a/dredd/dredd.yml b/dredd/dredd.yml index 31180a973..4925a5177 100644 --- a/dredd/dredd.yml +++ b/dredd/dredd.yml @@ -28,5 +28,5 @@ hooks-worker-term-retry: 500 hooks-worker-handler-host: 127.0.0.1 hooks-worker-handler-port: 61321 config: ./dredd.yml -blueprint: ../modules/custom/dkan_api/docs/dkan_api_openapi_spec.yml +blueprint: ../modules/dkan_api/docs/dkan_api_openapi_spec.yml endpoint: 'http://dkan' diff --git a/modules/custom/dkan_admin/config/install/views.view.content.yml b/modules/custom/dkan_admin/config/install/views.view.content.yml deleted file mode 100644 index 5e89f7af0..000000000 --- a/modules/custom/dkan_admin/config/install/views.view.content.yml +++ /dev/null @@ -1,607 +0,0 @@ -uuid: 512678ea-9d4d-41a5-928d-1d9d173511e5 -langcode: en -status: false -dependencies: - module: - - node - - user -_core: - default_config_hash: tS8PbpJX90aRFC3-UTgXzdqkq7_2frk2pz4TMijEebM -id: content -label: Content -module: node -description: 'Find and manage content.' -tag: default -base_table: node_field_data -base_field: nid -core: 8.x -display: - default: - display_options: - access: - type: perm - options: - perm: 'access content overview' - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: true - caption: '' - summary: '' - description: '' - columns: - node_bulk_form: node_bulk_form - title: title - type: type - name: name - status: status - changed: changed - edit_node: edit_node - delete_node: delete_node - dropbutton: dropbutton - timestamp: title - info: - node_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - title: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - edit_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - delete_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - dropbutton: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - timestamp: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields - fields: - node_bulk_form: - id: node_bulk_form - table: node - field: node_bulk_form - label: '' - exclude: false - alter: - alter_text: false - element_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - plugin_id: node_bulk_form - entity_type: node - title: - id: title - table: node_field_data - field: title - label: Title - exclude: false - alter: - alter_text: false - element_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - entity_type: node - entity_field: title - type: string - settings: - link_to_entity: true - plugin_id: field - type: - id: type - table: node_field_data - field: type - relationship: none - group_type: group - admin_label: '' - label: 'Content type' - 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: target_id - type: entity_reference_label - settings: - link: false - 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 - entity_type: node - entity_field: type - plugin_id: field - name: - id: name - table: users_field_data - field: name - relationship: uid - label: Author - exclude: false - alter: - alter_text: false - element_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - plugin_id: field - type: user_name - entity_type: user - entity_field: name - status: - id: status - table: node_field_data - field: status - label: Status - exclude: false - alter: - alter_text: false - element_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - type: boolean - settings: - format: custom - format_custom_true: Published - format_custom_false: Unpublished - plugin_id: field - entity_type: node - entity_field: status - changed: - id: changed - table: node_field_data - field: changed - label: Updated - exclude: false - alter: - alter_text: false - element_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - type: timestamp - settings: - date_format: short - custom_date_format: '' - timezone: '' - plugin_id: field - entity_type: node - entity_field: changed - operations: - id: operations - table: node - field: operations - relationship: none - group_type: group - admin_label: '' - label: Operations - 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 - destination: true - plugin_id: entity_operations - filters: - title: - id: title - table: node_field_data - field: title - relationship: none - group_type: group - admin_label: '' - operator: contains - value: '' - group: 1 - exposed: true - expose: - operator_id: title_op - label: Title - description: '' - use_operator: false - operator: title_op - identifier: title - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - plugin_id: string - entity_type: node - entity_field: title - type: - id: type - table: node_field_data - field: type - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: type_op - label: 'Content type' - description: '' - use_operator: false - operator: type_op - identifier: type - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - 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: { } - plugin_id: bundle - entity_type: node - entity_field: type - status: - id: status - table: node_field_data - field: status - relationship: none - group_type: group - admin_label: '' - operator: '=' - value: '1' - group: 1 - exposed: true - expose: - operator_id: '' - label: Status - description: '' - use_operator: false - operator: status_op - identifier: status - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - is_grouped: true - group_info: - label: 'Published status' - description: '' - identifier: status - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: - 1: - title: Published - operator: '=' - value: '1' - 2: - title: Unpublished - operator: '=' - value: '0' - plugin_id: boolean - entity_type: node - entity_field: status - langcode: - id: langcode - table: node_field_data - field: langcode - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: langcode_op - label: Language - description: '' - use_operator: false - operator: langcode_op - identifier: langcode - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - 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: { } - plugin_id: language - entity_type: node - entity_field: langcode - status_extra: - id: status_extra - table: node_field_data - field: status_extra - operator: '=' - value: false - plugin_id: node_status - group: 1 - entity_type: node - sorts: { } - title: Content - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - empty: true - content: 'No content available.' - plugin_id: text_custom - arguments: { } - relationships: - uid: - id: uid - table: node_field_data - field: uid - admin_label: author - required: true - plugin_id: standard - show_admin_links: false - filter_groups: - operator: AND - groups: - 1: AND - display_extenders: { } - display_plugin: default - display_title: Master - id: default - position: 0 - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user - - 'user.node_grants:view' - - user.permissions - max-age: 0 - tags: { } - page_1: - display_options: - path: admin/content/node - menu: - type: 'default tab' - title: Content - description: '' - menu_name: admin - weight: -10 - context: '' - tab_options: - type: normal - title: Content - description: 'Find and manage content' - menu_name: admin - weight: -10 - display_extenders: { } - display_plugin: page - display_title: Page - id: page_1 - position: 1 - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user - - 'user.node_grants:view' - - user.permissions - max-age: 0 - tags: { } diff --git a/modules/custom/dkan_metadata_form/js/app/build/asset-manifest.json b/modules/custom/dkan_metadata_form/js/app/build/asset-manifest.json deleted file mode 100644 index 96e5e4ea6..000000000 --- a/modules/custom/dkan_metadata_form/js/app/build/asset-manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "files": { - "main.css": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css", - "main.js": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js", - "main.js.map": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js.map", - "runtime-main.js": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js", - "runtime-main.js.map": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js.map", - "static/css/2.24eef765.chunk.css": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css", - "static/js/2.d28c8234.chunk.js": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js", - "static/js/2.d28c8234.chunk.js.map": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map", - "index.html": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/index.html", - "precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js", - "service-worker.js": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/service-worker.js", - "static/css/2.24eef765.chunk.css.map": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map", - "static/css/main.b9557a38.chunk.css.map": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map", - "static/js/2.d28c8234.chunk.js.LICENSE": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE" - }, - "entrypoints": [ - "static/js/runtime-main.67a0f164.js", - "static/css/2.24eef765.chunk.css", - "static/js/2.d28c8234.chunk.js", - "static/css/main.b9557a38.chunk.css", - "static/js/main.5a4d367b.chunk.js" - ] -} \ No newline at end of file diff --git a/modules/custom/dkan_metadata_form/js/app/build/index.html b/modules/custom/dkan_metadata_form/js/app/build/index.html deleted file mode 100644 index 7a9ec7f9b..000000000 --- a/modules/custom/dkan_metadata_form/js/app/build/index.html +++ /dev/null @@ -1 +0,0 @@ -React App
\ No newline at end of file diff --git a/modules/custom/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js b/modules/custom/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js deleted file mode 100644 index d3ab332a9..000000000 --- a/modules/custom/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js +++ /dev/null @@ -1,30 +0,0 @@ -self.__precacheManifest = (self.__precacheManifest || []).concat([ - { - "revision": "ee3775ce0282fcb5f62fa8d19b0da480", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/index.html" - }, - { - "revision": "041ee8621030ce85c2b1", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css" - }, - { - "revision": "b421fec198b88a69a95d", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css" - }, - { - "revision": "041ee8621030ce85c2b1", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js" - }, - { - "revision": "d00e1b64d711ccf9921453795a1c37b4", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE" - }, - { - "revision": "b421fec198b88a69a95d", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js" - }, - { - "revision": "9a52e5cd179c029f71a6", - "url": "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js" - } -]); \ No newline at end of file diff --git a/modules/custom/dkan_admin/config/install/views.view.dkan_content.yml b/modules/dkan_admin/config/install/views.view.dkan_content.yml similarity index 100% rename from modules/custom/dkan_admin/config/install/views.view.dkan_content.yml rename to modules/dkan_admin/config/install/views.view.dkan_content.yml diff --git a/modules/custom/dkan_admin/config/install/views.view.dkan_dataset_content.yml b/modules/dkan_admin/config/install/views.view.dkan_dataset_content.yml similarity index 100% rename from modules/custom/dkan_admin/config/install/views.view.dkan_dataset_content.yml rename to modules/dkan_admin/config/install/views.view.dkan_dataset_content.yml diff --git a/modules/custom/dkan_admin/dkan_admin.info.yml b/modules/dkan_admin/dkan_admin.info.yml similarity index 80% rename from modules/custom/dkan_admin/dkan_admin.info.yml rename to modules/dkan_admin/dkan_admin.info.yml index 2fa37f751..26f5902fd 100644 --- a/modules/custom/dkan_admin/dkan_admin.info.yml +++ b/modules/dkan_admin/dkan_admin.info.yml @@ -4,7 +4,11 @@ type: module core: 8.x dependencies: - admin_toolbar + - breakpoint - dkan_data + - system + - toolbar + - user - views - views_bulk_operations package: DKAN diff --git a/modules/dkan_admin/dkan_admin.install b/modules/dkan_admin/dkan_admin.install new file mode 100644 index 000000000..1f0526d32 --- /dev/null +++ b/modules/dkan_admin/dkan_admin.install @@ -0,0 +1,23 @@ +getEditable('views.view.content'); + $config->set('status', false); + $config->save(TRUE); + drupal_flush_all_caches(); +} + +/** + * Ensable standard content view. + */ +function dkan_admin_uninstall() { + $config_factory = \Drupal::configFactory(); + $config = $config_factory->getEditable('views.view.content'); + $config->set('status', true); + $config->save(TRUE); + drupal_flush_all_caches(); +} diff --git a/modules/custom/dkan_admin/dkan_admin.module b/modules/dkan_admin/dkan_admin.module similarity index 100% rename from modules/custom/dkan_admin/dkan_admin.module rename to modules/dkan_admin/dkan_admin.module diff --git a/modules/custom/dkan_alt_api/dkan_alt_api.info.yml b/modules/dkan_alt_api/dkan_alt_api.info.yml similarity index 100% rename from modules/custom/dkan_alt_api/dkan_alt_api.info.yml rename to modules/dkan_alt_api/dkan_alt_api.info.yml diff --git a/modules/custom/dkan_alt_api/dkan_alt_api.permissions.yml b/modules/dkan_alt_api/dkan_alt_api.permissions.yml similarity index 100% rename from modules/custom/dkan_alt_api/dkan_alt_api.permissions.yml rename to modules/dkan_alt_api/dkan_alt_api.permissions.yml diff --git a/modules/custom/dkan_alt_api/dkan_alt_api.routing.yml b/modules/dkan_alt_api/dkan_alt_api.routing.yml similarity index 100% rename from modules/custom/dkan_alt_api/dkan_alt_api.routing.yml rename to modules/dkan_alt_api/dkan_alt_api.routing.yml diff --git a/modules/custom/dkan_api/dkan_api.info.yml b/modules/dkan_api/dkan_api.info.yml similarity index 100% rename from modules/custom/dkan_api/dkan_api.info.yml rename to modules/dkan_api/dkan_api.info.yml diff --git a/modules/custom/dkan_api/dkan_api.routing.yml b/modules/dkan_api/dkan_api.routing.yml similarity index 100% rename from modules/custom/dkan_api/dkan_api.routing.yml rename to modules/dkan_api/dkan_api.routing.yml diff --git a/modules/custom/dkan_api/dkan_api.services.yml b/modules/dkan_api/dkan_api.services.yml similarity index 100% rename from modules/custom/dkan_api/dkan_api.services.yml rename to modules/dkan_api/dkan_api.services.yml diff --git a/modules/custom/dkan_api/docs/dkan_api_openapi_spec.yml b/modules/dkan_api/docs/dkan_api_openapi_spec.yml similarity index 100% rename from modules/custom/dkan_api/docs/dkan_api_openapi_spec.yml rename to modules/dkan_api/docs/dkan_api_openapi_spec.yml diff --git a/modules/custom/dkan_api/src/Controller/Docs.php b/modules/dkan_api/src/Controller/Docs.php similarity index 100% rename from modules/custom/dkan_api/src/Controller/Docs.php rename to modules/dkan_api/src/Controller/Docs.php diff --git a/modules/custom/dkan_api/tests/src/Unit/Controller/DocsTest.php b/modules/dkan_api/tests/src/Unit/Controller/DocsTest.php similarity index 100% rename from modules/custom/dkan_api/tests/src/Unit/Controller/DocsTest.php rename to modules/dkan_api/tests/src/Unit/Controller/DocsTest.php diff --git a/modules/custom/dkan_api/tests/src/Unit/Controller/docs/dkan_api_openapi_spec.yml b/modules/dkan_api/tests/src/Unit/Controller/docs/dkan_api_openapi_spec.yml similarity index 100% rename from modules/custom/dkan_api/tests/src/Unit/Controller/docs/dkan_api_openapi_spec.yml rename to modules/dkan_api/tests/src/Unit/Controller/docs/dkan_api_openapi_spec.yml diff --git a/modules/custom/dkan_common/dkan_common.info.yml b/modules/dkan_common/dkan_common.info.yml similarity index 100% rename from modules/custom/dkan_common/dkan_common.info.yml rename to modules/dkan_common/dkan_common.info.yml diff --git a/modules/custom/dkan_common/dkan_common.links.menu.yml b/modules/dkan_common/dkan_common.links.menu.yml similarity index 100% rename from modules/custom/dkan_common/dkan_common.links.menu.yml rename to modules/dkan_common/dkan_common.links.menu.yml diff --git a/modules/custom/dkan_common/dkan_common.routing.yml b/modules/dkan_common/dkan_common.routing.yml similarity index 100% rename from modules/custom/dkan_common/dkan_common.routing.yml rename to modules/dkan_common/dkan_common.routing.yml diff --git a/modules/custom/dkan_common/dkan_common.services.yml b/modules/dkan_common/dkan_common.services.yml similarity index 100% rename from modules/custom/dkan_common/dkan_common.services.yml rename to modules/dkan_common/dkan_common.services.yml diff --git a/modules/custom/dkan_common/src/AbstractDataNodeLifeCycle.php b/modules/dkan_common/src/AbstractDataNodeLifeCycle.php similarity index 100% rename from modules/custom/dkan_common/src/AbstractDataNodeLifeCycle.php rename to modules/dkan_common/src/AbstractDataNodeLifeCycle.php diff --git a/modules/custom/dkan_common/src/Annotation/DataModifier.php b/modules/dkan_common/src/Annotation/DataModifier.php similarity index 100% rename from modules/custom/dkan_common/src/Annotation/DataModifier.php rename to modules/dkan_common/src/Annotation/DataModifier.php diff --git a/modules/custom/dkan_common/src/DataModifierPluginTrait.php b/modules/dkan_common/src/DataModifierPluginTrait.php similarity index 100% rename from modules/custom/dkan_common/src/DataModifierPluginTrait.php rename to modules/dkan_common/src/DataModifierPluginTrait.php diff --git a/modules/custom/dkan_common/src/Exception/DataNodeLifeCycleEntityValidationException.php b/modules/dkan_common/src/Exception/DataNodeLifeCycleEntityValidationException.php similarity index 100% rename from modules/custom/dkan_common/src/Exception/DataNodeLifeCycleEntityValidationException.php rename to modules/dkan_common/src/Exception/DataNodeLifeCycleEntityValidationException.php diff --git a/modules/custom/dkan_common/src/JsonResponseTrait.php b/modules/dkan_common/src/JsonResponseTrait.php similarity index 100% rename from modules/custom/dkan_common/src/JsonResponseTrait.php rename to modules/dkan_common/src/JsonResponseTrait.php diff --git a/modules/custom/dkan_common/src/LoggerTrait.php b/modules/dkan_common/src/LoggerTrait.php similarity index 100% rename from modules/custom/dkan_common/src/LoggerTrait.php rename to modules/dkan_common/src/LoggerTrait.php diff --git a/modules/custom/dkan_common/src/Plugin/DataModifierBase.php b/modules/dkan_common/src/Plugin/DataModifierBase.php similarity index 100% rename from modules/custom/dkan_common/src/Plugin/DataModifierBase.php rename to modules/dkan_common/src/Plugin/DataModifierBase.php diff --git a/modules/custom/dkan_common/src/Plugin/DataModifierInterface.php b/modules/dkan_common/src/Plugin/DataModifierInterface.php similarity index 100% rename from modules/custom/dkan_common/src/Plugin/DataModifierInterface.php rename to modules/dkan_common/src/Plugin/DataModifierInterface.php diff --git a/modules/custom/dkan_common/src/Plugin/DataModifierManager.php b/modules/dkan_common/src/Plugin/DataModifierManager.php similarity index 100% rename from modules/custom/dkan_common/src/Plugin/DataModifierManager.php rename to modules/dkan_common/src/Plugin/DataModifierManager.php diff --git a/modules/custom/dkan_common/src/Service/Factory.php b/modules/dkan_common/src/Service/Factory.php similarity index 100% rename from modules/custom/dkan_common/src/Service/Factory.php rename to modules/dkan_common/src/Service/Factory.php diff --git a/modules/custom/dkan_common/src/Service/JsonUtil.php b/modules/dkan_common/src/Service/JsonUtil.php similarity index 100% rename from modules/custom/dkan_common/src/Service/JsonUtil.php rename to modules/dkan_common/src/Service/JsonUtil.php diff --git a/modules/custom/dkan_common/src/Storage/AbstractDatabaseTable.php b/modules/dkan_common/src/Storage/AbstractDatabaseTable.php similarity index 100% rename from modules/custom/dkan_common/src/Storage/AbstractDatabaseTable.php rename to modules/dkan_common/src/Storage/AbstractDatabaseTable.php diff --git a/modules/custom/dkan_common/src/Storage/QueryToQueryHelperTrait.php b/modules/dkan_common/src/Storage/QueryToQueryHelperTrait.php similarity index 100% rename from modules/custom/dkan_common/src/Storage/QueryToQueryHelperTrait.php rename to modules/dkan_common/src/Storage/QueryToQueryHelperTrait.php diff --git a/modules/custom/dkan_common/src/UrlHostTokenResolver.php b/modules/dkan_common/src/UrlHostTokenResolver.php similarity index 100% rename from modules/custom/dkan_common/src/UrlHostTokenResolver.php rename to modules/dkan_common/src/UrlHostTokenResolver.php diff --git a/modules/custom/dkan_common/src/Util/ParentCallTrait.php b/modules/dkan_common/src/Util/ParentCallTrait.php similarity index 100% rename from modules/custom/dkan_common/src/Util/ParentCallTrait.php rename to modules/dkan_common/src/Util/ParentCallTrait.php diff --git a/modules/custom/dkan_common/src/Util/RequestTrait.php b/modules/dkan_common/src/Util/RequestTrait.php similarity index 100% rename from modules/custom/dkan_common/src/Util/RequestTrait.php rename to modules/dkan_common/src/Util/RequestTrait.php diff --git a/modules/custom/dkan_common/tests/src/Unit/Plugin/DataModifierManagerTest.php b/modules/dkan_common/tests/src/Unit/Plugin/DataModifierManagerTest.php similarity index 100% rename from modules/custom/dkan_common/tests/src/Unit/Plugin/DataModifierManagerTest.php rename to modules/dkan_common/tests/src/Unit/Plugin/DataModifierManagerTest.php diff --git a/modules/custom/dkan_common/tests/src/Unit/UrlHostTokenResolverTest.php b/modules/dkan_common/tests/src/Unit/UrlHostTokenResolverTest.php similarity index 100% rename from modules/custom/dkan_common/tests/src/Unit/UrlHostTokenResolverTest.php rename to modules/dkan_common/tests/src/Unit/UrlHostTokenResolverTest.php diff --git a/modules/custom/dkan_data/config/install/core.entity_form_display.node.data.default.yml b/modules/dkan_data/config/install/core.entity_form_display.node.data.default.yml similarity index 100% rename from modules/custom/dkan_data/config/install/core.entity_form_display.node.data.default.yml rename to modules/dkan_data/config/install/core.entity_form_display.node.data.default.yml diff --git a/modules/custom/dkan_data/config/install/core.entity_view_display.node.data.default.yml b/modules/dkan_data/config/install/core.entity_view_display.node.data.default.yml similarity index 100% rename from modules/custom/dkan_data/config/install/core.entity_view_display.node.data.default.yml rename to modules/dkan_data/config/install/core.entity_view_display.node.data.default.yml diff --git a/modules/custom/dkan_data/config/install/core.entity_view_display.node.data.teaser.yml b/modules/dkan_data/config/install/core.entity_view_display.node.data.teaser.yml similarity index 100% rename from modules/custom/dkan_data/config/install/core.entity_view_display.node.data.teaser.yml rename to modules/dkan_data/config/install/core.entity_view_display.node.data.teaser.yml diff --git a/modules/custom/dkan_data/config/install/dkan_data.settings.yml b/modules/dkan_data/config/install/dkan_data.settings.yml similarity index 100% rename from modules/custom/dkan_data/config/install/dkan_data.settings.yml rename to modules/dkan_data/config/install/dkan_data.settings.yml diff --git a/modules/custom/dkan_data/config/install/field.field.node.data.field_data_type.yml b/modules/dkan_data/config/install/field.field.node.data.field_data_type.yml similarity index 100% rename from modules/custom/dkan_data/config/install/field.field.node.data.field_data_type.yml rename to modules/dkan_data/config/install/field.field.node.data.field_data_type.yml diff --git a/modules/custom/dkan_data/config/install/field.field.node.data.field_json_metadata.yml b/modules/dkan_data/config/install/field.field.node.data.field_json_metadata.yml similarity index 100% rename from modules/custom/dkan_data/config/install/field.field.node.data.field_json_metadata.yml rename to modules/dkan_data/config/install/field.field.node.data.field_json_metadata.yml diff --git a/modules/custom/dkan_data/config/install/field.storage.node.field_data_type.yml b/modules/dkan_data/config/install/field.storage.node.field_data_type.yml similarity index 100% rename from modules/custom/dkan_data/config/install/field.storage.node.field_data_type.yml rename to modules/dkan_data/config/install/field.storage.node.field_data_type.yml diff --git a/modules/custom/dkan_data/config/install/field.storage.node.field_json_metadata.yml b/modules/dkan_data/config/install/field.storage.node.field_json_metadata.yml similarity index 100% rename from modules/custom/dkan_data/config/install/field.storage.node.field_json_metadata.yml rename to modules/dkan_data/config/install/field.storage.node.field_json_metadata.yml diff --git a/modules/custom/dkan_data/config/install/node.type.data.yml b/modules/dkan_data/config/install/node.type.data.yml similarity index 100% rename from modules/custom/dkan_data/config/install/node.type.data.yml rename to modules/dkan_data/config/install/node.type.data.yml diff --git a/modules/custom/dkan_data/dkan_data.features.yml b/modules/dkan_data/dkan_data.features.yml similarity index 100% rename from modules/custom/dkan_data/dkan_data.features.yml rename to modules/dkan_data/dkan_data.features.yml diff --git a/modules/custom/dkan_data/dkan_data.info.yml b/modules/dkan_data/dkan_data.info.yml similarity index 100% rename from modules/custom/dkan_data/dkan_data.info.yml rename to modules/dkan_data/dkan_data.info.yml diff --git a/modules/custom/dkan_data/dkan_data.links.menu.yml b/modules/dkan_data/dkan_data.links.menu.yml similarity index 100% rename from modules/custom/dkan_data/dkan_data.links.menu.yml rename to modules/dkan_data/dkan_data.links.menu.yml diff --git a/modules/custom/dkan_data/dkan_data.module b/modules/dkan_data/dkan_data.module similarity index 100% rename from modules/custom/dkan_data/dkan_data.module rename to modules/dkan_data/dkan_data.module diff --git a/modules/custom/dkan_data/dkan_data.routing.yml b/modules/dkan_data/dkan_data.routing.yml similarity index 100% rename from modules/custom/dkan_data/dkan_data.routing.yml rename to modules/dkan_data/dkan_data.routing.yml diff --git a/modules/custom/dkan_data/dkan_data.services.yml b/modules/dkan_data/dkan_data.services.yml similarity index 100% rename from modules/custom/dkan_data/dkan_data.services.yml rename to modules/dkan_data/dkan_data.services.yml diff --git a/modules/custom/dkan_data/src/ConfigurationOverrider.php b/modules/dkan_data/src/ConfigurationOverrider.php similarity index 100% rename from modules/custom/dkan_data/src/ConfigurationOverrider.php rename to modules/dkan_data/src/ConfigurationOverrider.php diff --git a/modules/custom/dkan_data/src/DataNodeLifeCycle.php b/modules/dkan_data/src/DataNodeLifeCycle.php similarity index 100% rename from modules/custom/dkan_data/src/DataNodeLifeCycle.php rename to modules/dkan_data/src/DataNodeLifeCycle.php diff --git a/modules/custom/dkan_data/src/Form/DkanDataSettingsForm.php b/modules/dkan_data/src/Form/DkanDataSettingsForm.php similarity index 100% rename from modules/custom/dkan_data/src/Form/DkanDataSettingsForm.php rename to modules/dkan_data/src/Form/DkanDataSettingsForm.php diff --git a/modules/custom/dkan_data/src/Plugin/QueueWorker/OrphanReferenceProcessor.php b/modules/dkan_data/src/Plugin/QueueWorker/OrphanReferenceProcessor.php similarity index 100% rename from modules/custom/dkan_data/src/Plugin/QueueWorker/OrphanReferenceProcessor.php rename to modules/dkan_data/src/Plugin/QueueWorker/OrphanReferenceProcessor.php diff --git a/modules/custom/dkan_data/src/Plugin/Validation/Constraint/ProperJson.php b/modules/dkan_data/src/Plugin/Validation/Constraint/ProperJson.php similarity index 100% rename from modules/custom/dkan_data/src/Plugin/Validation/Constraint/ProperJson.php rename to modules/dkan_data/src/Plugin/Validation/Constraint/ProperJson.php diff --git a/modules/custom/dkan_data/src/Plugin/Validation/Constraint/ProperJsonValidator.php b/modules/dkan_data/src/Plugin/Validation/Constraint/ProperJsonValidator.php similarity index 100% rename from modules/custom/dkan_data/src/Plugin/Validation/Constraint/ProperJsonValidator.php rename to modules/dkan_data/src/Plugin/Validation/Constraint/ProperJsonValidator.php diff --git a/modules/custom/dkan_data/src/Reference/Dereferencer.php b/modules/dkan_data/src/Reference/Dereferencer.php similarity index 100% rename from modules/custom/dkan_data/src/Reference/Dereferencer.php rename to modules/dkan_data/src/Reference/Dereferencer.php diff --git a/modules/custom/dkan_data/src/Reference/HelperTrait.php b/modules/dkan_data/src/Reference/HelperTrait.php similarity index 100% rename from modules/custom/dkan_data/src/Reference/HelperTrait.php rename to modules/dkan_data/src/Reference/HelperTrait.php diff --git a/modules/custom/dkan_data/src/Reference/OrphanChecker.php b/modules/dkan_data/src/Reference/OrphanChecker.php similarity index 100% rename from modules/custom/dkan_data/src/Reference/OrphanChecker.php rename to modules/dkan_data/src/Reference/OrphanChecker.php diff --git a/modules/custom/dkan_data/src/Reference/Referencer.php b/modules/dkan_data/src/Reference/Referencer.php similarity index 100% rename from modules/custom/dkan_data/src/Reference/Referencer.php rename to modules/dkan_data/src/Reference/Referencer.php diff --git a/modules/custom/dkan_data/src/Service/Uuid5.php b/modules/dkan_data/src/Service/Uuid5.php similarity index 100% rename from modules/custom/dkan_data/src/Service/Uuid5.php rename to modules/dkan_data/src/Service/Uuid5.php diff --git a/modules/custom/dkan_data/src/Storage/Data.php b/modules/dkan_data/src/Storage/Data.php similarity index 100% rename from modules/custom/dkan_data/src/Storage/Data.php rename to modules/dkan_data/src/Storage/Data.php diff --git a/modules/custom/dkan_data/tests/src/Unit/ConfigurationOverriderTest.php b/modules/dkan_data/tests/src/Unit/ConfigurationOverriderTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/ConfigurationOverriderTest.php rename to modules/dkan_data/tests/src/Unit/ConfigurationOverriderTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/DataNodeLifeCycleTest.php b/modules/dkan_data/tests/src/Unit/DataNodeLifeCycleTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/DataNodeLifeCycleTest.php rename to modules/dkan_data/tests/src/Unit/DataNodeLifeCycleTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Plugin/Validation/Constraint/ProperJsonValidatorTest.php b/modules/dkan_data/tests/src/Unit/Plugin/Validation/Constraint/ProperJsonValidatorTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Plugin/Validation/Constraint/ProperJsonValidatorTest.php rename to modules/dkan_data/tests/src/Unit/Plugin/Validation/Constraint/ProperJsonValidatorTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Reference/DereferencerTest.php b/modules/dkan_data/tests/src/Unit/Reference/DereferencerTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Reference/DereferencerTest.php rename to modules/dkan_data/tests/src/Unit/Reference/DereferencerTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Reference/OrphanCheckerTest.php b/modules/dkan_data/tests/src/Unit/Reference/OrphanCheckerTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Reference/OrphanCheckerTest.php rename to modules/dkan_data/tests/src/Unit/Reference/OrphanCheckerTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Reference/ReferencerTest.php b/modules/dkan_data/tests/src/Unit/Reference/ReferencerTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Reference/ReferencerTest.php rename to modules/dkan_data/tests/src/Unit/Reference/ReferencerTest.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Service/Uuid5Test.php b/modules/dkan_data/tests/src/Unit/Service/Uuid5Test.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Service/Uuid5Test.php rename to modules/dkan_data/tests/src/Unit/Service/Uuid5Test.php diff --git a/modules/custom/dkan_data/tests/src/Unit/Storage/DataTest.php b/modules/dkan_data/tests/src/Unit/Storage/DataTest.php similarity index 100% rename from modules/custom/dkan_data/tests/src/Unit/Storage/DataTest.php rename to modules/dkan_data/tests/src/Unit/Storage/DataTest.php diff --git a/modules/custom/dkan_datastore/config/install/dkan_datastore.keyvalue.yml b/modules/dkan_datastore/config/install/dkan_datastore.keyvalue.yml similarity index 100% rename from modules/custom/dkan_datastore/config/install/dkan_datastore.keyvalue.yml rename to modules/dkan_datastore/config/install/dkan_datastore.keyvalue.yml diff --git a/modules/custom/dkan_datastore/config/schema/dkan_datastore.schema.yml b/modules/dkan_datastore/config/schema/dkan_datastore.schema.yml similarity index 100% rename from modules/custom/dkan_datastore/config/schema/dkan_datastore.schema.yml rename to modules/dkan_datastore/config/schema/dkan_datastore.schema.yml diff --git a/modules/custom/dkan_datastore/dkan_datastore.info.yml b/modules/dkan_datastore/dkan_datastore.info.yml similarity index 100% rename from modules/custom/dkan_datastore/dkan_datastore.info.yml rename to modules/dkan_datastore/dkan_datastore.info.yml diff --git a/modules/custom/dkan_datastore/dkan_datastore.module b/modules/dkan_datastore/dkan_datastore.module similarity index 100% rename from modules/custom/dkan_datastore/dkan_datastore.module rename to modules/dkan_datastore/dkan_datastore.module diff --git a/modules/custom/dkan_datastore/dkan_datastore.permissions.yml b/modules/dkan_datastore/dkan_datastore.permissions.yml similarity index 100% rename from modules/custom/dkan_datastore/dkan_datastore.permissions.yml rename to modules/dkan_datastore/dkan_datastore.permissions.yml diff --git a/modules/custom/dkan_datastore/dkan_datastore.routing.yml b/modules/dkan_datastore/dkan_datastore.routing.yml similarity index 100% rename from modules/custom/dkan_datastore/dkan_datastore.routing.yml rename to modules/dkan_datastore/dkan_datastore.routing.yml diff --git a/modules/custom/dkan_datastore/dkan_datastore.services.yml b/modules/dkan_datastore/dkan_datastore.services.yml similarity index 100% rename from modules/custom/dkan_datastore/dkan_datastore.services.yml rename to modules/dkan_datastore/dkan_datastore.services.yml diff --git a/modules/custom/dkan_datastore/drush.services.yml b/modules/dkan_datastore/drush.services.yml similarity index 100% rename from modules/custom/dkan_datastore/drush.services.yml rename to modules/dkan_datastore/drush.services.yml diff --git a/modules/custom/dkan_datastore/src/DataNodeLifeCycle.php b/modules/dkan_datastore/src/DataNodeLifeCycle.php similarity index 100% rename from modules/custom/dkan_datastore/src/DataNodeLifeCycle.php rename to modules/dkan_datastore/src/DataNodeLifeCycle.php diff --git a/modules/custom/dkan_datastore/src/Drush.php b/modules/dkan_datastore/src/Drush.php similarity index 100% rename from modules/custom/dkan_datastore/src/Drush.php rename to modules/dkan_datastore/src/Drush.php diff --git a/modules/custom/dkan_datastore/src/Plugin/QueueWorker/Import.php b/modules/dkan_datastore/src/Plugin/QueueWorker/Import.php similarity index 100% rename from modules/custom/dkan_datastore/src/Plugin/QueueWorker/Import.php rename to modules/dkan_datastore/src/Plugin/QueueWorker/Import.php diff --git a/modules/custom/dkan_datastore/src/Service.php b/modules/dkan_datastore/src/Service.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service.php rename to modules/dkan_datastore/src/Service.php diff --git a/modules/custom/dkan_datastore/src/Service/Factory/Import.php b/modules/dkan_datastore/src/Service/Factory/Import.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/Factory/Import.php rename to modules/dkan_datastore/src/Service/Factory/Import.php diff --git a/modules/custom/dkan_datastore/src/Service/Factory/Resource.php b/modules/dkan_datastore/src/Service/Factory/Resource.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/Factory/Resource.php rename to modules/dkan_datastore/src/Service/Factory/Resource.php diff --git a/modules/custom/dkan_datastore/src/Service/Import.php b/modules/dkan_datastore/src/Service/Import.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/Import.php rename to modules/dkan_datastore/src/Service/Import.php diff --git a/modules/custom/dkan_datastore/src/Service/ImporterList/ImporterList.php b/modules/dkan_datastore/src/Service/ImporterList/ImporterList.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/ImporterList/ImporterList.php rename to modules/dkan_datastore/src/Service/ImporterList/ImporterList.php diff --git a/modules/custom/dkan_datastore/src/Service/ImporterList/ImporterListItem.php b/modules/dkan_datastore/src/Service/ImporterList/ImporterListItem.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/ImporterList/ImporterListItem.php rename to modules/dkan_datastore/src/Service/ImporterList/ImporterListItem.php diff --git a/modules/custom/dkan_datastore/src/Service/Resource.php b/modules/dkan_datastore/src/Service/Resource.php similarity index 100% rename from modules/custom/dkan_datastore/src/Service/Resource.php rename to modules/dkan_datastore/src/Service/Resource.php diff --git a/modules/custom/dkan_datastore/src/Storage/DatabaseTable.php b/modules/dkan_datastore/src/Storage/DatabaseTable.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/DatabaseTable.php rename to modules/dkan_datastore/src/Storage/DatabaseTable.php diff --git a/modules/custom/dkan_datastore/src/Storage/DatabaseTableFactory.php b/modules/dkan_datastore/src/Storage/DatabaseTableFactory.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/DatabaseTableFactory.php rename to modules/dkan_datastore/src/Storage/DatabaseTableFactory.php diff --git a/modules/custom/dkan_datastore/src/Storage/JobStore.php b/modules/dkan_datastore/src/Storage/JobStore.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/JobStore.php rename to modules/dkan_datastore/src/Storage/JobStore.php diff --git a/modules/custom/dkan_datastore/src/Storage/JobStoreFactory.php b/modules/dkan_datastore/src/Storage/JobStoreFactory.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/JobStoreFactory.php rename to modules/dkan_datastore/src/Storage/JobStoreFactory.php diff --git a/modules/custom/dkan_datastore/src/Storage/Query.php b/modules/dkan_datastore/src/Storage/Query.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/Query.php rename to modules/dkan_datastore/src/Storage/Query.php diff --git a/modules/custom/dkan_datastore/src/Storage/TableSummary.php b/modules/dkan_datastore/src/Storage/TableSummary.php similarity index 100% rename from modules/custom/dkan_datastore/src/Storage/TableSummary.php rename to modules/dkan_datastore/src/Storage/TableSummary.php diff --git a/modules/custom/dkan_datastore/src/WebServiceApi.php b/modules/dkan_datastore/src/WebServiceApi.php similarity index 100% rename from modules/custom/dkan_datastore/src/WebServiceApi.php rename to modules/dkan_datastore/src/WebServiceApi.php diff --git a/modules/custom/dkan_datastore/tests/data/countries.csv b/modules/dkan_datastore/tests/data/countries.csv similarity index 100% rename from modules/custom/dkan_datastore/tests/data/countries.csv rename to modules/dkan_datastore/tests/data/countries.csv diff --git a/modules/custom/dkan_datastore/tests/data/filefetcher.json b/modules/dkan_datastore/tests/data/filefetcher.json similarity index 100% rename from modules/custom/dkan_datastore/tests/data/filefetcher.json rename to modules/dkan_datastore/tests/data/filefetcher.json diff --git a/modules/custom/dkan_datastore/tests/data/importer.json b/modules/dkan_datastore/tests/data/importer.json similarity index 100% rename from modules/custom/dkan_datastore/tests/data/importer.json rename to modules/dkan_datastore/tests/data/importer.json diff --git a/modules/custom/dkan_datastore/tests/src/Unit/DataNodeLifeCycle2Test.php b/modules/dkan_datastore/tests/src/Unit/DataNodeLifeCycle2Test.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/DataNodeLifeCycle2Test.php rename to modules/dkan_datastore/tests/src/Unit/DataNodeLifeCycle2Test.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Mock/Container.php b/modules/dkan_datastore/tests/src/Unit/Mock/Container.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Mock/Container.php rename to modules/dkan_datastore/tests/src/Unit/Mock/Container.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Plugin/QueueWorker/ImportTest.php b/modules/dkan_datastore/tests/src/Unit/Plugin/QueueWorker/ImportTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Plugin/QueueWorker/ImportTest.php rename to modules/dkan_datastore/tests/src/Unit/Plugin/QueueWorker/ImportTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Service/ImportTest.php b/modules/dkan_datastore/tests/src/Unit/Service/ImportTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Service/ImportTest.php rename to modules/dkan_datastore/tests/src/Unit/Service/ImportTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Service/ImporterList/ImporterListTest.php b/modules/dkan_datastore/tests/src/Unit/Service/ImporterList/ImporterListTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Service/ImporterList/ImporterListTest.php rename to modules/dkan_datastore/tests/src/Unit/Service/ImporterList/ImporterListTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Service/ResourceTest.php b/modules/dkan_datastore/tests/src/Unit/Service/ResourceTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Service/ResourceTest.php rename to modules/dkan_datastore/tests/src/Unit/Service/ResourceTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/ServiceTest.php b/modules/dkan_datastore/tests/src/Unit/ServiceTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/ServiceTest.php rename to modules/dkan_datastore/tests/src/Unit/ServiceTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Storage/DatabaseTableFactoryTest.php b/modules/dkan_datastore/tests/src/Unit/Storage/DatabaseTableFactoryTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Storage/DatabaseTableFactoryTest.php rename to modules/dkan_datastore/tests/src/Unit/Storage/DatabaseTableFactoryTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Storage/DatabaseTableTest.php b/modules/dkan_datastore/tests/src/Unit/Storage/DatabaseTableTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Storage/DatabaseTableTest.php rename to modules/dkan_datastore/tests/src/Unit/Storage/DatabaseTableTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/Storage/JobStoreTest.php b/modules/dkan_datastore/tests/src/Unit/Storage/JobStoreTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/Storage/JobStoreTest.php rename to modules/dkan_datastore/tests/src/Unit/Storage/JobStoreTest.php diff --git a/modules/custom/dkan_datastore/tests/src/Unit/WebServiceApiTest.php b/modules/dkan_datastore/tests/src/Unit/WebServiceApiTest.php similarity index 100% rename from modules/custom/dkan_datastore/tests/src/Unit/WebServiceApiTest.php rename to modules/dkan_datastore/tests/src/Unit/WebServiceApiTest.php diff --git a/modules/custom/dkan_dummy_content/dkan_dummy_content.info.yml b/modules/dkan_dummy_content/dkan_dummy_content.info.yml similarity index 100% rename from modules/custom/dkan_dummy_content/dkan_dummy_content.info.yml rename to modules/dkan_dummy_content/dkan_dummy_content.info.yml diff --git a/modules/custom/dkan_dummy_content/drush.services.yml b/modules/dkan_dummy_content/drush.services.yml similarity index 100% rename from modules/custom/dkan_dummy_content/drush.services.yml rename to modules/dkan_dummy_content/drush.services.yml diff --git a/modules/custom/dkan_dummy_content/dummy.json b/modules/dkan_dummy_content/dummy.json similarity index 91% rename from modules/custom/dkan_dummy_content/dummy.json rename to modules/dkan_dummy_content/dummy.json index 314525af5..c1ca44502 100644 --- a/modules/custom/dkan_dummy_content/dummy.json +++ b/modules/dkan_dummy_content/dummy.json @@ -16,7 +16,7 @@ "distribution": [ { "@type": "dcat:Distribution", - "downloadURL": "file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/Bike_Lane.csv", + "downloadURL": "file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/Bike_Lane.csv", "mediaType": "text\/csv", "format": "csv", "title": "Florida Bike Lanes" @@ -44,7 +44,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/IMD-MAPS.zip", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/IMD-MAPS.zip", "mediaType":"application\/zip", "format":"zip", "title":"English Indices of Deprivation 2010"} @@ -71,7 +71,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/ViolentCrimeRates.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/ViolentCrimeRates.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: FBI Uniform Crime Report, 2014 (\u003Ca href=\u0022https:\/\/www.fbi.gov\/about-us\/cjis\/ucr\/ucr\u0022\u003Ehttps:\/\/www.fbi.gov\/about-us\/cjis\/ucr\/ucr\u003C\/a\u003E)\u003C\/p\u003E\n\u003Cp\u003EIncludes information on the frequency of violent crimes in general, murder and non-negligent manslaughter, aggravated assault, rape and robbery. All crime rates are per 100,000 people.\u003C\/p\u003E\n", @@ -79,13 +79,13 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/PropertyCrimesByCity_3.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/PropertyCrimesByCity_3.csv", "mediaType":"text\/csv", "format":"csv", "title":"Property Crime Statistics by City" }, {"@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/PropertyCrimeRates_1.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/PropertyCrimeRates_1.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: FBI Uniform Crime Report, 2014 (\u003Ca href=\u0022https:\/\/www.fbi.gov\/about-us\/cjis\/ucr\/ucr\u0022\u003Ehttps:\/\/www.fbi.gov\/about-us\/cjis\/ucr\/ucr\u003C\/a\u003E)\u003C\/p\u003E\n", @@ -93,7 +93,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/NumbersByCity.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/NumbersByCity.csv", "mediaType":"text\/csv", "format":"csv", "title":"Violent Crime Statistics by City " @@ -120,7 +120,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/GenChart_0_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/GenChart_0_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003EPopulation of state employees broken down into Gen X, Gen Y, Baby Boomers and Over 65+.\u003C\/p\u003E\n", @@ -128,7 +128,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/retirements_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/retirements_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ETotal number of employees who retired from the state workforce, 2011-2015.\u003C\/p\u003E\n", @@ -136,7 +136,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/2015EligibleVsActual.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/2015EligibleVsActual.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003EThis data, ranging from fiscal year 2011 to fiscal year 2015, depicts the percentage of the workforce that is eligible to retire compared to the percentage of the workforce who actually retired.\u003C\/p\u003E\n", @@ -163,7 +163,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/TobaccoTaxes2016_2_1.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/TobaccoTaxes2016_2_1.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: The Campaign for Tobacco-Free Kids, April 2016: \u003Ca href=\u0022https:\/\/www.tobaccofreekids.org\/research\/factsheets\/pdf\/0097.pdf\u0022\u003Ehttps:\/\/www.tobaccofreekids.org\/research\/factsheets\/pdf\/0097.pdf\u003C\/a\u003E\u003C\/p\u003E\n", @@ -171,7 +171,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/CDCSmokingRates.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/CDCSmokingRates.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: Centers for Disease Control and Prevention, 2015\u003C\/p\u003E\n", @@ -198,7 +198,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/postvaccinedeaths_0_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/postvaccinedeaths_0_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: \u0022Near elimination of varicella deaths in the US after implementation of the vaccination program.\u0022 published in the American Journal of Pediatrics in August 2011.\u003C\/p\u003E\n", @@ -206,7 +206,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/varicelladeaths1970_1994.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/varicelladeaths1970_1994.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: Centers for Disease Control and Prevention in Atlanta, Georgia. \u201cVaricella Mortality: Trends before Vaccine Licensure in the United States, 1970\u20131994\u201d published August 2000 in the Journal of Infectious Diseases.\u003C\/p\u003E\n", @@ -214,7 +214,7 @@ }, { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/varicellaincidencerates_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/varicellaincidencerates_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ESource: \u0022Impact of Vaccination on the Epidemiology of Varicella: 1995\u20132009\u0022 published in the journal Pediatrics in August 2011.\u003C\/p\u003E\n", @@ -266,7 +266,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/us_foreclosures_jan_2012_by_state_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/us_foreclosures_jan_2012_by_state_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003EUS National Foreclosure Statistics - By State - January 2012\u003C\/p\u003E\n", @@ -294,7 +294,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/data_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/data_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003ECSV file extracted and cleaned from source excel.\u003C\/p\u003E\n\u003Cp\u003EClick on Graph button under Preview and plot date (x-axis) against price (y-axis) to see a line graph. Hovering over a point gives you the value of that data entry.\u003C\/p\u003E\n", @@ -323,7 +323,7 @@ "distribution":[ { "@type":"dcat:Distribution", - "downloadURL":"file:\/\//var/www/docroot/profiles/contrib/dkan2/modules/custom/dkan_dummy_content/files\/district_centerpoints_0.csv", + "downloadURL":"file:\/\//var/www/docroot/modules/contrib/dkan2/modules/dkan_dummy_content/files\/district_centerpoints_0.csv", "mediaType":"text\/csv", "format":"csv", "description":"\u003Cp\u003EYou can see this data plotted on a map, by clicking on \u0027Map\u0027 below. Individual data records can be seen by clicking on each point.\u003C\/p\u003E\n", diff --git a/modules/custom/dkan_dummy_content/dummy.template.json b/modules/dkan_dummy_content/dummy.template.json similarity index 100% rename from modules/custom/dkan_dummy_content/dummy.template.json rename to modules/dkan_dummy_content/dummy.template.json diff --git a/modules/custom/dkan_dummy_content/files/2015EligibleVsActual.csv b/modules/dkan_dummy_content/files/2015EligibleVsActual.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/2015EligibleVsActual.csv rename to modules/dkan_dummy_content/files/2015EligibleVsActual.csv diff --git a/modules/custom/dkan_dummy_content/files/Bike_Lane.csv b/modules/dkan_dummy_content/files/Bike_Lane.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/Bike_Lane.csv rename to modules/dkan_dummy_content/files/Bike_Lane.csv diff --git a/modules/custom/dkan_dummy_content/files/CDCSmokingRates.csv b/modules/dkan_dummy_content/files/CDCSmokingRates.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/CDCSmokingRates.csv rename to modules/dkan_dummy_content/files/CDCSmokingRates.csv diff --git a/modules/custom/dkan_dummy_content/files/GenChart_0_0.csv b/modules/dkan_dummy_content/files/GenChart_0_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/GenChart_0_0.csv rename to modules/dkan_dummy_content/files/GenChart_0_0.csv diff --git a/modules/custom/dkan_dummy_content/files/IMD-MAPS.zip b/modules/dkan_dummy_content/files/IMD-MAPS.zip similarity index 100% rename from modules/custom/dkan_dummy_content/files/IMD-MAPS.zip rename to modules/dkan_dummy_content/files/IMD-MAPS.zip diff --git a/modules/custom/dkan_dummy_content/files/NumbersByCity.csv b/modules/dkan_dummy_content/files/NumbersByCity.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/NumbersByCity.csv rename to modules/dkan_dummy_content/files/NumbersByCity.csv diff --git a/modules/custom/dkan_dummy_content/files/PropertyCrimeRates_1.csv b/modules/dkan_dummy_content/files/PropertyCrimeRates_1.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/PropertyCrimeRates_1.csv rename to modules/dkan_dummy_content/files/PropertyCrimeRates_1.csv diff --git a/modules/custom/dkan_dummy_content/files/PropertyCrimesByCity_3.csv b/modules/dkan_dummy_content/files/PropertyCrimesByCity_3.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/PropertyCrimesByCity_3.csv rename to modules/dkan_dummy_content/files/PropertyCrimesByCity_3.csv diff --git a/modules/custom/dkan_dummy_content/files/TobaccoTaxes2016_2_1.csv b/modules/dkan_dummy_content/files/TobaccoTaxes2016_2_1.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/TobaccoTaxes2016_2_1.csv rename to modules/dkan_dummy_content/files/TobaccoTaxes2016_2_1.csv diff --git a/modules/custom/dkan_dummy_content/files/ViolentCrimeRates.csv b/modules/dkan_dummy_content/files/ViolentCrimeRates.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/ViolentCrimeRates.csv rename to modules/dkan_dummy_content/files/ViolentCrimeRates.csv diff --git a/modules/custom/dkan_dummy_content/files/data_0.csv b/modules/dkan_dummy_content/files/data_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/data_0.csv rename to modules/dkan_dummy_content/files/data_0.csv diff --git a/modules/custom/dkan_dummy_content/files/district_centerpoints_0.csv b/modules/dkan_dummy_content/files/district_centerpoints_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/district_centerpoints_0.csv rename to modules/dkan_dummy_content/files/district_centerpoints_0.csv diff --git a/modules/custom/dkan_dummy_content/files/postvaccinedeaths_0_0.csv b/modules/dkan_dummy_content/files/postvaccinedeaths_0_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/postvaccinedeaths_0_0.csv rename to modules/dkan_dummy_content/files/postvaccinedeaths_0_0.csv diff --git a/modules/custom/dkan_dummy_content/files/retirements_0.csv b/modules/dkan_dummy_content/files/retirements_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/retirements_0.csv rename to modules/dkan_dummy_content/files/retirements_0.csv diff --git a/modules/custom/dkan_dummy_content/files/us_foreclosures_jan_2012_by_state_0.csv b/modules/dkan_dummy_content/files/us_foreclosures_jan_2012_by_state_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/us_foreclosures_jan_2012_by_state_0.csv rename to modules/dkan_dummy_content/files/us_foreclosures_jan_2012_by_state_0.csv diff --git a/modules/custom/dkan_dummy_content/files/varicelladeaths1970_1994.csv b/modules/dkan_dummy_content/files/varicelladeaths1970_1994.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/varicelladeaths1970_1994.csv rename to modules/dkan_dummy_content/files/varicelladeaths1970_1994.csv diff --git a/modules/custom/dkan_dummy_content/files/varicellaincidencerates_0.csv b/modules/dkan_dummy_content/files/varicellaincidencerates_0.csv similarity index 100% rename from modules/custom/dkan_dummy_content/files/varicellaincidencerates_0.csv rename to modules/dkan_dummy_content/files/varicellaincidencerates_0.csv diff --git a/modules/custom/dkan_dummy_content/harvest_plan.json b/modules/dkan_dummy_content/harvest_plan.json similarity index 100% rename from modules/custom/dkan_dummy_content/harvest_plan.json rename to modules/dkan_dummy_content/harvest_plan.json diff --git a/modules/custom/dkan_dummy_content/src/Drush/Commands.php b/modules/dkan_dummy_content/src/Drush/Commands.php similarity index 100% rename from modules/custom/dkan_dummy_content/src/Drush/Commands.php rename to modules/dkan_dummy_content/src/Drush/Commands.php diff --git a/modules/custom/dkan_frontend/config/system.site.yml b/modules/dkan_frontend/config/system.site.yml similarity index 100% rename from modules/custom/dkan_frontend/config/system.site.yml rename to modules/dkan_frontend/config/system.site.yml diff --git a/modules/custom/dkan_frontend/dkan_frontend.info.yml b/modules/dkan_frontend/dkan_frontend.info.yml similarity index 100% rename from modules/custom/dkan_frontend/dkan_frontend.info.yml rename to modules/dkan_frontend/dkan_frontend.info.yml diff --git a/modules/custom/dkan_frontend/dkan_frontend.routing.yml b/modules/dkan_frontend/dkan_frontend.routing.yml similarity index 100% rename from modules/custom/dkan_frontend/dkan_frontend.routing.yml rename to modules/dkan_frontend/dkan_frontend.routing.yml diff --git a/modules/custom/dkan_frontend/dkan_frontend.services.yml b/modules/dkan_frontend/dkan_frontend.services.yml similarity index 100% rename from modules/custom/dkan_frontend/dkan_frontend.services.yml rename to modules/dkan_frontend/dkan_frontend.services.yml diff --git a/modules/custom/dkan_frontend/src/Controller/Page.php b/modules/dkan_frontend/src/Controller/Page.php similarity index 100% rename from modules/custom/dkan_frontend/src/Controller/Page.php rename to modules/dkan_frontend/src/Controller/Page.php diff --git a/modules/custom/dkan_frontend/src/Page.php b/modules/dkan_frontend/src/Page.php similarity index 100% rename from modules/custom/dkan_frontend/src/Page.php rename to modules/dkan_frontend/src/Page.php diff --git a/modules/custom/dkan_frontend/src/Routing/RouteProvider.php b/modules/dkan_frontend/src/Routing/RouteProvider.php similarity index 100% rename from modules/custom/dkan_frontend/src/Routing/RouteProvider.php rename to modules/dkan_frontend/src/Routing/RouteProvider.php diff --git a/modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/about/index.html b/modules/dkan_frontend/tests/app/data-catalog-frontend/public/about/index.html similarity index 100% rename from modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/about/index.html rename to modules/dkan_frontend/tests/app/data-catalog-frontend/public/about/index.html diff --git a/modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/123/index.html b/modules/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/123/index.html similarity index 100% rename from modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/123/index.html rename to modules/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/123/index.html diff --git a/modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/index.html b/modules/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/index.html similarity index 100% rename from modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/index.html rename to modules/dkan_frontend/tests/app/data-catalog-frontend/public/dataset/index.html diff --git a/modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/index.html b/modules/dkan_frontend/tests/app/data-catalog-frontend/public/index.html similarity index 100% rename from modules/custom/dkan_frontend/tests/app/data-catalog-frontend/public/index.html rename to modules/dkan_frontend/tests/app/data-catalog-frontend/public/index.html diff --git a/modules/custom/dkan_frontend/tests/src/Unit/Controller/PageTest.php b/modules/dkan_frontend/tests/src/Unit/Controller/PageTest.php similarity index 100% rename from modules/custom/dkan_frontend/tests/src/Unit/Controller/PageTest.php rename to modules/dkan_frontend/tests/src/Unit/Controller/PageTest.php diff --git a/modules/custom/dkan_frontend/tests/src/Unit/PageTest.php b/modules/dkan_frontend/tests/src/Unit/PageTest.php similarity index 100% rename from modules/custom/dkan_frontend/tests/src/Unit/PageTest.php rename to modules/dkan_frontend/tests/src/Unit/PageTest.php diff --git a/modules/custom/dkan_frontend/tests/src/Unit/Routing/RouteProvider2Test.php b/modules/dkan_frontend/tests/src/Unit/Routing/RouteProvider2Test.php similarity index 100% rename from modules/custom/dkan_frontend/tests/src/Unit/Routing/RouteProvider2Test.php rename to modules/dkan_frontend/tests/src/Unit/Routing/RouteProvider2Test.php diff --git a/modules/custom/dkan_harvest/config/samples/harvest-plan-example.json b/modules/dkan_harvest/config/samples/harvest-plan-example.json similarity index 100% rename from modules/custom/dkan_harvest/config/samples/harvest-plan-example.json rename to modules/dkan_harvest/config/samples/harvest-plan-example.json diff --git a/modules/custom/dkan_harvest/dkan_harvest.info.yml b/modules/dkan_harvest/dkan_harvest.info.yml similarity index 100% rename from modules/custom/dkan_harvest/dkan_harvest.info.yml rename to modules/dkan_harvest/dkan_harvest.info.yml diff --git a/modules/custom/dkan_harvest/dkan_harvest.install b/modules/dkan_harvest/dkan_harvest.install similarity index 100% rename from modules/custom/dkan_harvest/dkan_harvest.install rename to modules/dkan_harvest/dkan_harvest.install diff --git a/modules/custom/dkan_harvest/dkan_harvest.permissions.yml b/modules/dkan_harvest/dkan_harvest.permissions.yml similarity index 100% rename from modules/custom/dkan_harvest/dkan_harvest.permissions.yml rename to modules/dkan_harvest/dkan_harvest.permissions.yml diff --git a/modules/custom/dkan_harvest/dkan_harvest.routing.yml b/modules/dkan_harvest/dkan_harvest.routing.yml similarity index 100% rename from modules/custom/dkan_harvest/dkan_harvest.routing.yml rename to modules/dkan_harvest/dkan_harvest.routing.yml diff --git a/modules/custom/dkan_harvest/dkan_harvest.services.yml b/modules/dkan_harvest/dkan_harvest.services.yml similarity index 100% rename from modules/custom/dkan_harvest/dkan_harvest.services.yml rename to modules/dkan_harvest/dkan_harvest.services.yml diff --git a/modules/custom/dkan_harvest/drush.services.yml b/modules/dkan_harvest/drush.services.yml similarity index 100% rename from modules/custom/dkan_harvest/drush.services.yml rename to modules/dkan_harvest/drush.services.yml diff --git a/modules/custom/dkan_harvest/src/Controller/Api.php b/modules/dkan_harvest/src/Controller/Api.php similarity index 100% rename from modules/custom/dkan_harvest/src/Controller/Api.php rename to modules/dkan_harvest/src/Controller/Api.php diff --git a/modules/custom/dkan_harvest/src/Drush/Commands.php b/modules/dkan_harvest/src/Drush/Commands.php similarity index 100% rename from modules/custom/dkan_harvest/src/Drush/Commands.php rename to modules/dkan_harvest/src/Drush/Commands.php diff --git a/modules/custom/dkan_harvest/src/Drush/Helper.php b/modules/dkan_harvest/src/Drush/Helper.php similarity index 100% rename from modules/custom/dkan_harvest/src/Drush/Helper.php rename to modules/dkan_harvest/src/Drush/Helper.php diff --git a/modules/custom/dkan_harvest/src/Harvester.php b/modules/dkan_harvest/src/Harvester.php similarity index 100% rename from modules/custom/dkan_harvest/src/Harvester.php rename to modules/dkan_harvest/src/Harvester.php diff --git a/modules/custom/dkan_harvest/src/Load/Dataset.php b/modules/dkan_harvest/src/Load/Dataset.php similarity index 100% rename from modules/custom/dkan_harvest/src/Load/Dataset.php rename to modules/dkan_harvest/src/Load/Dataset.php diff --git a/modules/custom/dkan_harvest/src/Load/FileHelper.php b/modules/dkan_harvest/src/Load/FileHelper.php similarity index 100% rename from modules/custom/dkan_harvest/src/Load/FileHelper.php rename to modules/dkan_harvest/src/Load/FileHelper.php diff --git a/modules/custom/dkan_harvest/src/Load/FileHelperTrait.php b/modules/dkan_harvest/src/Load/FileHelperTrait.php similarity index 100% rename from modules/custom/dkan_harvest/src/Load/FileHelperTrait.php rename to modules/dkan_harvest/src/Load/FileHelperTrait.php diff --git a/modules/custom/dkan_harvest/src/Load/IFileHelper.php b/modules/dkan_harvest/src/Load/IFileHelper.php similarity index 100% rename from modules/custom/dkan_harvest/src/Load/IFileHelper.php rename to modules/dkan_harvest/src/Load/IFileHelper.php diff --git a/modules/custom/dkan_harvest/src/Storage/DatabaseTable.php b/modules/dkan_harvest/src/Storage/DatabaseTable.php similarity index 100% rename from modules/custom/dkan_harvest/src/Storage/DatabaseTable.php rename to modules/dkan_harvest/src/Storage/DatabaseTable.php diff --git a/modules/custom/dkan_harvest/src/Storage/DatabaseTableFactory.php b/modules/dkan_harvest/src/Storage/DatabaseTableFactory.php similarity index 100% rename from modules/custom/dkan_harvest/src/Storage/DatabaseTableFactory.php rename to modules/dkan_harvest/src/Storage/DatabaseTableFactory.php diff --git a/modules/custom/dkan_harvest/src/Storage/IdGenerator.php b/modules/dkan_harvest/src/Storage/IdGenerator.php similarity index 100% rename from modules/custom/dkan_harvest/src/Storage/IdGenerator.php rename to modules/dkan_harvest/src/Storage/IdGenerator.php diff --git a/modules/custom/dkan_harvest/src/Transform/ResourceImporter.php b/modules/dkan_harvest/src/Transform/ResourceImporter.php similarity index 100% rename from modules/custom/dkan_harvest/src/Transform/ResourceImporter.php rename to modules/dkan_harvest/src/Transform/ResourceImporter.php diff --git a/modules/custom/dkan_harvest/test/files/data.json b/modules/dkan_harvest/test/files/data.json similarity index 100% rename from modules/custom/dkan_harvest/test/files/data.json rename to modules/dkan_harvest/test/files/data.json diff --git a/modules/custom/dkan_harvest/test/files/data2.json b/modules/dkan_harvest/test/files/data2.json similarity index 100% rename from modules/custom/dkan_harvest/test/files/data2.json rename to modules/dkan_harvest/test/files/data2.json diff --git a/modules/custom/dkan_harvest/test/src/Unit/Controller/ApiTest.php b/modules/dkan_harvest/test/src/Unit/Controller/ApiTest.php similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/Controller/ApiTest.php rename to modules/dkan_harvest/test/src/Unit/Controller/ApiTest.php diff --git a/modules/custom/dkan_harvest/test/src/Unit/Controller/data.json b/modules/dkan_harvest/test/src/Unit/Controller/data.json similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/Controller/data.json rename to modules/dkan_harvest/test/src/Unit/Controller/data.json diff --git a/modules/custom/dkan_harvest/test/src/Unit/HarvesterTest.php b/modules/dkan_harvest/test/src/Unit/HarvesterTest.php similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/HarvesterTest.php rename to modules/dkan_harvest/test/src/Unit/HarvesterTest.php diff --git a/modules/custom/dkan_harvest/test/src/Unit/Load/DatasetTest.php b/modules/dkan_harvest/test/src/Unit/Load/DatasetTest.php similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/Load/DatasetTest.php rename to modules/dkan_harvest/test/src/Unit/Load/DatasetTest.php diff --git a/modules/custom/dkan_harvest/test/src/Unit/Storage/DatabaseTableFactoryTest.php b/modules/dkan_harvest/test/src/Unit/Storage/DatabaseTableFactoryTest.php similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/Storage/DatabaseTableFactoryTest.php rename to modules/dkan_harvest/test/src/Unit/Storage/DatabaseTableFactoryTest.php diff --git a/modules/custom/dkan_harvest/test/src/Unit/Storage/DatabaseTableTest.php b/modules/dkan_harvest/test/src/Unit/Storage/DatabaseTableTest.php similarity index 100% rename from modules/custom/dkan_harvest/test/src/Unit/Storage/DatabaseTableTest.php rename to modules/dkan_harvest/test/src/Unit/Storage/DatabaseTableTest.php diff --git a/modules/custom/dkan_metadata_form/dkan_metadata_form.info.yml b/modules/dkan_metadata_form/dkan_metadata_form.info.yml similarity index 82% rename from modules/custom/dkan_metadata_form/dkan_metadata_form.info.yml rename to modules/dkan_metadata_form/dkan_metadata_form.info.yml index e87559ba6..4d832887e 100644 --- a/modules/custom/dkan_metadata_form/dkan_metadata_form.info.yml +++ b/modules/dkan_metadata_form/dkan_metadata_form.info.yml @@ -2,6 +2,7 @@ name: Metadata Form description: Adds a React form for creating and editing dataset metadata. package: DKAN - type: module core: 8.x +dependencies: + - dkan_data diff --git a/modules/custom/dkan_metadata_form/dkan_metadata_form.libraries.yml b/modules/dkan_metadata_form/dkan_metadata_form.libraries.yml similarity index 100% rename from modules/custom/dkan_metadata_form/dkan_metadata_form.libraries.yml rename to modules/dkan_metadata_form/dkan_metadata_form.libraries.yml diff --git a/modules/custom/dkan_metadata_form/dkan_metadata_form.link_attributes.yml b/modules/dkan_metadata_form/dkan_metadata_form.link_attributes.yml similarity index 100% rename from modules/custom/dkan_metadata_form/dkan_metadata_form.link_attributes.yml rename to modules/dkan_metadata_form/dkan_metadata_form.link_attributes.yml diff --git a/modules/custom/dkan_metadata_form/dkan_metadata_form.module b/modules/dkan_metadata_form/dkan_metadata_form.module similarity index 100% rename from modules/custom/dkan_metadata_form/dkan_metadata_form.module rename to modules/dkan_metadata_form/dkan_metadata_form.module diff --git a/modules/custom/dkan_metadata_form/dkan_metadata_form.routing.yml b/modules/dkan_metadata_form/dkan_metadata_form.routing.yml similarity index 100% rename from modules/custom/dkan_metadata_form/dkan_metadata_form.routing.yml rename to modules/dkan_metadata_form/dkan_metadata_form.routing.yml diff --git a/modules/custom/dkan_metadata_form/drush.services.yml b/modules/dkan_metadata_form/drush.services.yml similarity index 100% rename from modules/custom/dkan_metadata_form/drush.services.yml rename to modules/dkan_metadata_form/drush.services.yml diff --git a/modules/custom/dkan_metadata_form/js/app/.gitignore b/modules/dkan_metadata_form/js/app/.gitignore similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/.gitignore rename to modules/dkan_metadata_form/js/app/.gitignore diff --git a/modules/custom/dkan_metadata_form/js/app/README.md b/modules/dkan_metadata_form/js/app/README.md similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/README.md rename to modules/dkan_metadata_form/js/app/README.md diff --git a/modules/dkan_metadata_form/js/app/build/asset-manifest.json b/modules/dkan_metadata_form/js/app/build/asset-manifest.json new file mode 100644 index 000000000..2aa1f84ac --- /dev/null +++ b/modules/dkan_metadata_form/js/app/build/asset-manifest.json @@ -0,0 +1,25 @@ +{ + "files": { + "main.css": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css", + "main.js": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js", + "main.js.map": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js.map", + "runtime-main.js": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js", + "runtime-main.js.map": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js.map", + "static/css/2.24eef765.chunk.css": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css", + "static/js/2.d28c8234.chunk.js": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js", + "static/js/2.d28c8234.chunk.js.map": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map", + "index.html": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/index.html", + "precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js", + "service-worker.js": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/service-worker.js", + "static/css/2.24eef765.chunk.css.map": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map", + "static/css/main.b9557a38.chunk.css.map": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map", + "static/js/2.d28c8234.chunk.js.LICENSE": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE" + }, + "entrypoints": [ + "static/js/runtime-main.67a0f164.js", + "static/css/2.24eef765.chunk.css", + "static/js/2.d28c8234.chunk.js", + "static/css/main.b9557a38.chunk.css", + "static/js/main.5a4d367b.chunk.js" + ] +} diff --git a/modules/custom/dkan_metadata_form/js/app/build/favicon.ico b/modules/dkan_metadata_form/js/app/build/favicon.ico similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/favicon.ico rename to modules/dkan_metadata_form/js/app/build/favicon.ico diff --git a/modules/dkan_metadata_form/js/app/build/index.html b/modules/dkan_metadata_form/js/app/build/index.html new file mode 100644 index 000000000..df6b2901d --- /dev/null +++ b/modules/dkan_metadata_form/js/app/build/index.html @@ -0,0 +1 @@ +React App
diff --git a/modules/custom/dkan_metadata_form/js/app/build/logo192.png b/modules/dkan_metadata_form/js/app/build/logo192.png similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/logo192.png rename to modules/dkan_metadata_form/js/app/build/logo192.png diff --git a/modules/custom/dkan_metadata_form/js/app/build/logo512.png b/modules/dkan_metadata_form/js/app/build/logo512.png similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/logo512.png rename to modules/dkan_metadata_form/js/app/build/logo512.png diff --git a/modules/custom/dkan_metadata_form/js/app/build/manifest.json b/modules/dkan_metadata_form/js/app/build/manifest.json similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/manifest.json rename to modules/dkan_metadata_form/js/app/build/manifest.json diff --git a/modules/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js b/modules/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js new file mode 100644 index 000000000..5a416239e --- /dev/null +++ b/modules/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js @@ -0,0 +1,30 @@ +self.__precacheManifest = (self.__precacheManifest || []).concat([ + { + "revision": "ee3775ce0282fcb5f62fa8d19b0da480", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/index.html" + }, + { + "revision": "041ee8621030ce85c2b1", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css" + }, + { + "revision": "b421fec198b88a69a95d", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css" + }, + { + "revision": "041ee8621030ce85c2b1", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js" + }, + { + "revision": "d00e1b64d711ccf9921453795a1c37b4", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE" + }, + { + "revision": "b421fec198b88a69a95d", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/main.5a4d367b.chunk.js" + }, + { + "revision": "9a52e5cd179c029f71a6", + "url": "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/static/js/runtime-main.67a0f164.js" + } +]); diff --git a/modules/custom/dkan_metadata_form/js/app/build/robots.txt b/modules/dkan_metadata_form/js/app/build/robots.txt similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/robots.txt rename to modules/dkan_metadata_form/js/app/build/robots.txt diff --git a/modules/custom/dkan_metadata_form/js/app/build/service-worker.js b/modules/dkan_metadata_form/js/app/build/service-worker.js similarity index 82% rename from modules/custom/dkan_metadata_form/js/app/build/service-worker.js rename to modules/dkan_metadata_form/js/app/build/service-worker.js index 33f00bb1c..f23835d46 100644 --- a/modules/custom/dkan_metadata_form/js/app/build/service-worker.js +++ b/modules/dkan_metadata_form/js/app/build/service-worker.js @@ -14,7 +14,7 @@ importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js"); importScripts( - "/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js" + "/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/precache-manifest.d28792acf8a35b22d2fc367b8bfff7a3.js" ); self.addEventListener('message', (event) => { @@ -33,7 +33,7 @@ workbox.core.clientsClaim(); self.__precacheManifest = [].concat(self.__precacheManifest || []); workbox.precaching.precacheAndRoute(self.__precacheManifest, {}); -workbox.routing.registerNavigationRoute(workbox.precaching.getCacheKeyForURL("/profiles/contrib/dkan2/modules/custom/dkan_metadata_form/js/app/build/index.html"), { - +workbox.routing.registerNavigationRoute(workbox.precaching.getCacheKeyForURL("/modules/contrib/dkan2/modules/dkan_metadata_form/js/app/build/index.html"), { + blacklist: [/^\/_/,/\/[^/?]+\.[^/]+$/], }); diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css b/modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css rename to modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map b/modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map rename to modules/dkan_metadata_form/js/app/build/static/css/2.24eef765.chunk.css.map diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css b/modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css rename to modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map b/modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map rename to modules/dkan_metadata_form/js/app/build/static/css/main.b9557a38.chunk.css.map diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js b/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js rename to modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE b/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE rename to modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.LICENSE diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map b/modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map similarity index 100% rename from modules/custom/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map rename to modules/dkan_metadata_form/js/app/build/static/js/2.d28c8234.chunk.js.map diff --git a/modules/custom/dkan_metadata_form/js/app/build/static/js/loadme.js b/modules/dkan_metadata_form/js/app/build/static/js/loadme.js similarity index 85% rename from modules/custom/dkan_metadata_form/js/app/build/static/js/loadme.js rename to modules/dkan_metadata_form/js/app/build/static/js/loadme.js index 251e33ba6..682b56fbc 100644 --- a/modules/custom/dkan_metadata_form/js/app/build/static/js/loadme.js +++ b/modules/dkan_metadata_form/js/app/build/static/js/loadme.js @@ -1 +1 @@ -!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],a=0,p=[];afindSchemaDirectory($appRoot, $profileExtensionList); + public function __construct($appRoot, ExtensionList $extensionList) { + $this->findSchemaDirectory($appRoot, $extensionList); } /** @@ -60,14 +60,14 @@ public function retrieve(string $id): ?string { /** * Private. */ - protected function findSchemaDirectory($appRoot, $profileExtensionList) { + protected function findSchemaDirectory($appRoot, $extensionList) { $drupalRoot = $appRoot; if (is_dir($drupalRoot . "/schema")) { $this->directory = $drupalRoot . "/schema"; } - elseif (($directory = $this->getDefaultSchemaDirectory($profileExtensionList)) + elseif (($directory = $this->getDefaultSchemaDirectory($extensionList)) && is_dir($directory) ) { $this->directory = $directory; @@ -78,16 +78,16 @@ protected function findSchemaDirectory($appRoot, $profileExtensionList) { } /** - * Determine default location of schema folder for dkan2 profile. + * Determine default location of schema folder for dkan2. * * @todo There may be easier way to do this and without hardcoding paths. * * @return string * Path. */ - protected function getDefaultSchemaDirectory($profileExtensionList) { + protected function getDefaultSchemaDirectory($extensionList) { /** @var \Drupal\Core\Extension\ExtensionList $extensionList */ - $extensionList = $profileExtensionList; + $extensionList = $extensionList; $infoFile = $extensionList->getPathname('dkan2'); return dirname($infoFile) . '/schema'; diff --git a/modules/custom/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php b/modules/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php similarity index 66% rename from modules/custom/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php rename to modules/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php index cb6c5e58a..ee801402f 100644 --- a/modules/custom/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php +++ b/modules/dkan_schema/tests/src/Unit/SchemaRetrieverTest.php @@ -18,14 +18,14 @@ class SchemaRetrieverTest extends TestCase { * */ public function testSchemaDirectory() { - $profile = $this->getMockBuilder(ExtensionList::class) + $module = $this->getMockBuilder(ExtensionList::class) ->setMethods(['getPathname']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $profile->method("getPathname")->willReturn("./tmp"); + $module->method("getPathname")->willReturn("./tmp"); - $retriever = new SchemaRetriever("/tmp", $profile); + $retriever = new SchemaRetriever("/tmp", $module); $dir = $retriever->getSchemaDirectory(); $this->assertEquals($dir, './schema'); } @@ -34,14 +34,14 @@ public function testSchemaDirectory() { * */ public function testGetAllIds() { - $profile = $this->getMockBuilder(ExtensionList::class) + $module = $this->getMockBuilder(ExtensionList::class) ->setMethods(['getPathname']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $profile->method("getPathname")->willReturn("./tmp"); + $module->method("getPathname")->willReturn("./tmp"); - $retriever = new SchemaRetriever("/tmp", $profile); + $retriever = new SchemaRetriever("/tmp", $module); $ids = $retriever->getAllIds(); $this->assertEquals(['catalog', 'dataset', 'dataset.ui'], $ids); } @@ -50,14 +50,14 @@ public function testGetAllIds() { * */ public function testGet() { - $profile = $this->getMockBuilder(ExtensionList::class) + $module = $this->getMockBuilder(ExtensionList::class) ->setMethods(['getPathname']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $profile->method("getPathname")->willReturn("./tmp"); + $module->method("getPathname")->willReturn("./tmp"); - $retriever = new SchemaRetriever("/tmp", $profile); + $retriever = new SchemaRetriever("/tmp", $module); $schema = $retriever->retrieve('dataset'); $json = json_decode($schema); $this->assertNotFalse($json); @@ -68,14 +68,14 @@ public function testGet() { */ public function testError() { $this->expectExceptionMessage("Schema blah not found."); - $profile = $this->getMockBuilder(ExtensionList::class) + $module = $this->getMockBuilder(ExtensionList::class) ->setMethods(['getPathname']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $profile->method("getPathname")->willReturn("./tmp"); + $module->method("getPathname")->willReturn("./tmp"); - $retriever = new SchemaRetriever("/tmp", $profile); + $retriever = new SchemaRetriever("/tmp", $module); $retriever->retrieve('blah'); } @@ -84,14 +84,14 @@ public function testError() { */ public function testNoDirectory() { $this->expectExceptionMessage("No schema directory found."); - $profile = $this->getMockBuilder(ExtensionList::class) + $module = $this->getMockBuilder(ExtensionList::class) ->setMethods(['getPathname']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $profile->method("getPathname")->willReturn("/abcd"); + $module->method("getPathname")->willReturn("/abcd"); - $retriever = new SchemaRetriever("/abcd", $profile); + $retriever = new SchemaRetriever("/abcd", $module); $retriever->retrieve('dataset'); } diff --git a/modules/custom/dkan_search/README.md b/modules/dkan_search/README.md similarity index 100% rename from modules/custom/dkan_search/README.md rename to modules/dkan_search/README.md diff --git a/modules/custom/dkan_search/config/install/search_api.index.dkan.yml b/modules/dkan_search/config/install/search_api.index.dkan.yml similarity index 100% rename from modules/custom/dkan_search/config/install/search_api.index.dkan.yml rename to modules/dkan_search/config/install/search_api.index.dkan.yml diff --git a/modules/custom/dkan_search/config/install/search_api.server.dkan.yml b/modules/dkan_search/config/install/search_api.server.dkan.yml similarity index 100% rename from modules/custom/dkan_search/config/install/search_api.server.dkan.yml rename to modules/dkan_search/config/install/search_api.server.dkan.yml diff --git a/modules/custom/dkan_search/dkan_search.info.yml b/modules/dkan_search/dkan_search.info.yml similarity index 100% rename from modules/custom/dkan_search/dkan_search.info.yml rename to modules/dkan_search/dkan_search.info.yml diff --git a/modules/custom/dkan_search/dkan_search.routing.yml b/modules/dkan_search/dkan_search.routing.yml similarity index 100% rename from modules/custom/dkan_search/dkan_search.routing.yml rename to modules/dkan_search/dkan_search.routing.yml diff --git a/modules/custom/dkan_search/drush.services.yml b/modules/dkan_search/drush.services.yml similarity index 100% rename from modules/custom/dkan_search/drush.services.yml rename to modules/dkan_search/drush.services.yml diff --git a/modules/custom/dkan_search/src/ComplexData/Dataset.php b/modules/dkan_search/src/ComplexData/Dataset.php similarity index 100% rename from modules/custom/dkan_search/src/ComplexData/Dataset.php rename to modules/dkan_search/src/ComplexData/Dataset.php diff --git a/modules/custom/dkan_search/src/Drush/DkanSearchCommands.php b/modules/dkan_search/src/Drush/DkanSearchCommands.php similarity index 100% rename from modules/custom/dkan_search/src/Drush/DkanSearchCommands.php rename to modules/dkan_search/src/Drush/DkanSearchCommands.php diff --git a/modules/custom/dkan_search/src/Facade/ComplexDataFacade.php b/modules/dkan_search/src/Facade/ComplexDataFacade.php similarity index 100% rename from modules/custom/dkan_search/src/Facade/ComplexDataFacade.php rename to modules/dkan_search/src/Facade/ComplexDataFacade.php diff --git a/modules/custom/dkan_search/src/Plugin/search_api/datasource/DkanDataset.php b/modules/dkan_search/src/Plugin/search_api/datasource/DkanDataset.php similarity index 100% rename from modules/custom/dkan_search/src/Plugin/search_api/datasource/DkanDataset.php rename to modules/dkan_search/src/Plugin/search_api/datasource/DkanDataset.php diff --git a/modules/custom/dkan_search/src/WebServiceApi.php b/modules/dkan_search/src/WebServiceApi.php similarity index 100% rename from modules/custom/dkan_search/src/WebServiceApi.php rename to modules/dkan_search/src/WebServiceApi.php diff --git a/modules/custom/dkan_search/tests/src/Unit/ComplexData/DatasetTest.php b/modules/dkan_search/tests/src/Unit/ComplexData/DatasetTest.php similarity index 100% rename from modules/custom/dkan_search/tests/src/Unit/ComplexData/DatasetTest.php rename to modules/dkan_search/tests/src/Unit/ComplexData/DatasetTest.php diff --git a/modules/custom/dkan_search/tests/src/Unit/Plugin/search_api/datasource/DkanDatasetTest.php b/modules/dkan_search/tests/src/Unit/Plugin/search_api/datasource/DkanDatasetTest.php similarity index 100% rename from modules/custom/dkan_search/tests/src/Unit/Plugin/search_api/datasource/DkanDatasetTest.php rename to modules/dkan_search/tests/src/Unit/Plugin/search_api/datasource/DkanDatasetTest.php diff --git a/modules/custom/dkan_search/tests/src/Unit/WebServiceApi2Test.php b/modules/dkan_search/tests/src/Unit/WebServiceApi2Test.php similarity index 100% rename from modules/custom/dkan_search/tests/src/Unit/WebServiceApi2Test.php rename to modules/dkan_search/tests/src/Unit/WebServiceApi2Test.php diff --git a/modules/custom/dkan_sql_endpoint/config/install/dkan_sql_endpoint.settings.yml b/modules/dkan_sql_endpoint/config/install/dkan_sql_endpoint.settings.yml similarity index 100% rename from modules/custom/dkan_sql_endpoint/config/install/dkan_sql_endpoint.settings.yml rename to modules/dkan_sql_endpoint/config/install/dkan_sql_endpoint.settings.yml diff --git a/modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.info.yml b/modules/dkan_sql_endpoint/dkan_sql_endpoint.info.yml similarity index 100% rename from modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.info.yml rename to modules/dkan_sql_endpoint/dkan_sql_endpoint.info.yml diff --git a/modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.links.menu.yml b/modules/dkan_sql_endpoint/dkan_sql_endpoint.links.menu.yml similarity index 100% rename from modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.links.menu.yml rename to modules/dkan_sql_endpoint/dkan_sql_endpoint.links.menu.yml diff --git a/modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.routing.yml b/modules/dkan_sql_endpoint/dkan_sql_endpoint.routing.yml similarity index 100% rename from modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.routing.yml rename to modules/dkan_sql_endpoint/dkan_sql_endpoint.routing.yml diff --git a/modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.services.yml b/modules/dkan_sql_endpoint/dkan_sql_endpoint.services.yml similarity index 100% rename from modules/custom/dkan_sql_endpoint/dkan_sql_endpoint.services.yml rename to modules/dkan_sql_endpoint/dkan_sql_endpoint.services.yml diff --git a/modules/custom/dkan_sql_endpoint/src/Controller/Api.php b/modules/dkan_sql_endpoint/src/Controller/Api.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/src/Controller/Api.php rename to modules/dkan_sql_endpoint/src/Controller/Api.php diff --git a/modules/custom/dkan_sql_endpoint/src/Form/DkanSqlEndpointSettingsForm.php b/modules/dkan_sql_endpoint/src/Form/DkanSqlEndpointSettingsForm.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/src/Form/DkanSqlEndpointSettingsForm.php rename to modules/dkan_sql_endpoint/src/Form/DkanSqlEndpointSettingsForm.php diff --git a/modules/custom/dkan_sql_endpoint/src/Helper/GetStringsFromStateMachineExecution.php b/modules/dkan_sql_endpoint/src/Helper/GetStringsFromStateMachineExecution.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/src/Helper/GetStringsFromStateMachineExecution.php rename to modules/dkan_sql_endpoint/src/Helper/GetStringsFromStateMachineExecution.php diff --git a/modules/custom/dkan_sql_endpoint/src/Service.php b/modules/dkan_sql_endpoint/src/Service.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/src/Service.php rename to modules/dkan_sql_endpoint/src/Service.php diff --git a/modules/custom/dkan_sql_endpoint/tests/src/Unit/Controller/ApiTest.php b/modules/dkan_sql_endpoint/tests/src/Unit/Controller/ApiTest.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/tests/src/Unit/Controller/ApiTest.php rename to modules/dkan_sql_endpoint/tests/src/Unit/Controller/ApiTest.php diff --git a/modules/custom/dkan_sql_endpoint/tests/src/Unit/ServiceTest.php b/modules/dkan_sql_endpoint/tests/src/Unit/ServiceTest.php similarity index 100% rename from modules/custom/dkan_sql_endpoint/tests/src/Unit/ServiceTest.php rename to modules/dkan_sql_endpoint/tests/src/Unit/ServiceTest.php diff --git a/modules/custom/json_schema_field/json_schema_field.info.yml b/modules/json_schema_field/json_schema_field.info.yml similarity index 100% rename from modules/custom/json_schema_field/json_schema_field.info.yml rename to modules/json_schema_field/json_schema_field.info.yml diff --git a/modules/custom/json_schema_field/json_schema_field.module b/modules/json_schema_field/json_schema_field.module similarity index 100% rename from modules/custom/json_schema_field/json_schema_field.module rename to modules/json_schema_field/json_schema_field.module diff --git a/modules/custom/json_schema_field/src/Plugin/Field/FieldFormatter/JsonTableFormatter.php b/modules/json_schema_field/src/Plugin/Field/FieldFormatter/JsonTableFormatter.php similarity index 100% rename from modules/custom/json_schema_field/src/Plugin/Field/FieldFormatter/JsonTableFormatter.php rename to modules/json_schema_field/src/Plugin/Field/FieldFormatter/JsonTableFormatter.php diff --git a/modules/custom/json_schema_field/src/Plugin/Field/FieldType/JsonSchemaItem.php b/modules/json_schema_field/src/Plugin/Field/FieldType/JsonSchemaItem.php similarity index 100% rename from modules/custom/json_schema_field/src/Plugin/Field/FieldType/JsonSchemaItem.php rename to modules/json_schema_field/src/Plugin/Field/FieldType/JsonSchemaItem.php diff --git a/modules/custom/json_schema_field/src/Plugin/Field/FieldWidget/JsonSchemaFormWidget.php b/modules/json_schema_field/src/Plugin/Field/FieldWidget/JsonSchemaFormWidget.php similarity index 100% rename from modules/custom/json_schema_field/src/Plugin/Field/FieldWidget/JsonSchemaFormWidget.php rename to modules/json_schema_field/src/Plugin/Field/FieldWidget/JsonSchemaFormWidget.php diff --git a/phpunit.xml b/phpunit.xml index d2f90cf16..daac8c3ca 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -9,17 +9,17 @@ - modules/custom/dkan_api/tests/src/Unit - modules/custom/dkan_common/tests/src/Unit - modules/custom/dkan_data/tests/src/Unit - modules/custom/dkan_datastore/tests/src/Unit - modules/custom/dkan_frontend/tests/src/Unit - modules/custom/dkan_harvest/test/src/Unit - modules/custom/dkan_metastore/tests/src/Unit - modules/custom/dkan_non_public/tests/src/Unit - modules/custom/dkan_schema/tests/src/Unit - modules/custom/dkan_search/tests/src/Unit - modules/custom/dkan_sql_endpoint/tests/src/Unit + modules/dkan_api/tests/src/Unit + modules/dkan_common/tests/src/Unit + modules/dkan_data/tests/src/Unit + modules/dkan_datastore/tests/src/Unit + modules/dkan_frontend/tests/src/Unit + modules/dkan_harvest/test/src/Unit + modules/dkan_metastore/tests/src/Unit + modules/dkan_non_public/tests/src/Unit + modules/dkan_schema/tests/src/Unit + modules/dkan_search/tests/src/Unit + modules/dkan_sql_endpoint/tests/src/Unit @@ -38,21 +38,21 @@ - modules/custom/dkan_api/src - modules/custom/dkan_common/src - modules/custom/dkan_data/src - modules/custom/dkan_datastore/src - modules/custom/dkan_frontend/src - modules/custom/dkan_harvest/src - modules/custom/dkan_lunr/src - modules/custom/dkan_metastore/src - modules/custom/dkan_non_public/src - modules/custom/dkan_schema/src - modules/custom/dkan_search/src - modules/custom/dkan_sql_endpoint/src + modules/dkan_api/src + modules/dkan_common/src + modules/dkan_data/src + modules/dkan_datastore/src + modules/dkan_frontend/src + modules/dkan_harvest/src + modules/dkan_lunr/src + modules/dkan_metastore/src + modules/dkan_non_public/src + modules/dkan_schema/src + modules/dkan_search/src + modules/dkan_sql_endpoint/src - modules/custom/dkan_common/src/Tests + modules/dkan_common/src/Tests ./ ./