Skip to content

Commit

Permalink
Merge branch 'develop' into DDFBRA-96-extend-graphql-schema-with-go-c…
Browse files Browse the repository at this point in the history
…onfig
  • Loading branch information
Dresse committed Oct 30, 2024
2 parents 6b82f9d + 3c2a851 commit 56f7d60
Show file tree
Hide file tree
Showing 37 changed files with 1,848 additions and 2,584 deletions.
2 changes: 1 addition & 1 deletion .lagoon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ environments:
schedule: "M/30 * * * *"
command: drush dpl_po:import-remote-config-po da https://danskernesdigitalebibliotek.github.io/dpl-cms/translations/da.config.po
service: cli
pr-1219:
pr-1501:
cronjobs:
- name: drush cron
schedule: "M/15 * * * *"
Expand Down
6 changes: 4 additions & 2 deletions assets/all.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
// Set service base urls for the react apps.
$config['dpl_react_apps.settings']['services'] = [
'cover' => ['base_url' => 'https://cover.dandigbib.org'],
'fbi' => ['base_url' => 'https://fbi-api.dbc.dk/[profile]/graphql'],
// @todo This should be updated to use the correct URL when available.
'fbi' => ['base_url' => 'https://temp.fbi-api.dbc.dk/[profile]/graphql'],
'material-list' => ['base_url' => 'https://prod.materiallist.dandigbib.org'],
];

Expand Down Expand Up @@ -95,7 +96,8 @@
// We need http domains for testing in CI context.
$config['dpl_react_apps.settings']['services'] = [
'cover' => ['base_url' => 'http://cover.dandigbib.org'],
'fbi' => ['base_url' => 'http://fbi-api.dbc.dk/[profile]/graphql'],
// @todo This should be updated to use the correct URL when available.
'fbi' => ['base_url' => 'http://temp.fbi-api.dbc.dk/[profile]/graphql'],
'material-list' => ['base_url' => 'http://prod.materiallist.dandigbib.org'],
];

Expand Down
25 changes: 10 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"type": "package",
"package": {
"name": "danskernesdigitalebibliotek/dpl-react",
"version": "2024.41.0",
"version": "2024.44.0",
"type": "drupal-library",
"dist": {
"url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.41.0/dist-2024-41-0-52df86a22125c52c6de84e6c5e237d608e279b00.zip",
"url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.44.0/dist-2024-44-0-569a1656d740c639d78cac425fac380e774cae75.zip",
"type": "zip"
},
"require": {
Expand All @@ -56,9 +56,9 @@
"package": {
"name": "danskernesdigitalebibliotek/dpl-design-system",
"type": "drupal-library",
"version": "2024.41.0",
"version": "2024.44.0",
"dist": {
"url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.41.0/dist-2024-41-0-1ca7f9197d2f2f7a2865e34173fba6eca7f50edc.zip",
"url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.44.0/dist-2024-44-0-34305e57a86041624c7b762d10fa91f044842144.zip",
"type": "zip"
}
}
Expand Down Expand Up @@ -90,12 +90,12 @@
"composer/installers": "1.12.0",
"cweagans/composer-patches": "1.7.3",
"danskernesdigitalebibliotek/cms-api": "*",
"danskernesdigitalebibliotek/dpl-design-system": "^2024.41",
"danskernesdigitalebibliotek/dpl-react": "^2024.41",
"danskernesdigitalebibliotek/dpl-design-system": "^2024.44",
"danskernesdigitalebibliotek/dpl-react": "^2024.44",
"danskernesdigitalebibliotek/fbs-client": "*",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"deoliveiralucas/array-keys-case-transform": "^1.1",
"drupal/address": "^1.0",
"drupal/address": "^2.0",
"drupal/admin_toolbar": "^3.4",
"drupal/admin_user_language": "^1.1",
"drupal/administerusersbyrole": "^3.4",
Expand All @@ -107,6 +107,7 @@
"drupal/config_ignore_auto": "^3",
"drupal/config_perms": "^2.1",
"drupal/config_translation_po": "^1.0",
"drupal/consumers": "^1.19",
"drupal/content_lock": "^2.3",
"drupal/cookieinformation": "^2.1",
"drupal/core-composer-scaffold": "^10.3",
Expand Down Expand Up @@ -143,7 +144,6 @@
"drupal/metatag": "^2.0",
"drupal/multiple_fields_remove_button": "^2.2",
"drupal/multivalue_form_element": "^1.0@beta",
"drupal/next": "^1.6",
"drupal/openapi": "^2.1",
"drupal/openapi_rest": "^2.0@RC",
"drupal/openapi_ui_swagger": "^1.0",
Expand Down Expand Up @@ -338,16 +338,10 @@
"drupal/jsonlog": {
"3251587: Change logging from stdout to stderr": "https://www.drupal.org/files/issues/2021-11-29/jsonlog-change-stdout-to-stderr-3251587-3.patch"
},
"drupal/openapi": {
"3313521: OpenAPI security field does not validate": "https://git.drupalcode.org/project/openapi/-/commit/4964cf725242040ddfb0c591b6044ee1fa5912ef.patch"
},
"drupal/openapi_rest": {
"3171530 + 3116760: Add support for parameter and response descriptions": "patches/openapi-parameter-response-descriptions-14-3.patch",
"3343816: Specification includes disabled resources": "https://git.drupalcode.org/project/openapi_rest/-/commit/6618157334feca93fad1041583375eed660b9085.patch"
},
"drupal/paragraphs": {
"3027525: Show the paragraph and field label of fields that fail validation": "https://www.drupal.org/files/issues/2023-10-03/3027525_22.patch"
},
"drupal/paragraphs_ee": {
"3106254: Sorting paragraph list alphabetically in modal": "https://www.drupal.org/files/issues/2023-03-30/paragraphs_ee_sort.patch",
"3246408: Arrow buttons instead of drag n drop": "https://git.drupalcode.org/project/paragraphs_ee/-/commit/4e16e0d79386dcf13db901f5634f2e30f0814137.patch"
Expand All @@ -370,7 +364,8 @@
"3468521: (1/4) When changing recurrance, identical date combinations should not be deleted and recreated": "https://git.drupalcode.org/project/recurring_events/-/commit/67261f4ac34546f2c9514199d9febb6dcce6fd10.patch",
"3468521: (2/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/603d34936b97535f66e11429dcc9a2c61fc7cb40.patch",
"3468521: (3/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/ad8a4294b1ffb754a338bb2cfa0146f203aa6fc1.patch",
"3468521: (4/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/ad99ae79f5c55fc2db17427e9936ab141314609d.patch"
"3468521: (4/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/ad99ae79f5c55fc2db17427e9936ab141314609d.patch",
"3468300: Update EventSeriesSettings to use datetime form element.": "https://git.drupalcode.org/project/recurring_events/-/commit/5d9bc3b1cf7c00972f053f3d14873012b1ad7140.patch"
},
"drupal/theme_permission": {
"3105637: Edit, install and uninstall permission": "https://www.drupal.org/files/issues/2024-02-01/theme-permission-edit-install-uninstall-3105637-7.patch",
Expand Down
Loading

0 comments on commit 56f7d60

Please sign in to comment.