From 9547f4ce4603584d4b56eebcf6cc78d8329c8b14 Mon Sep 17 00:00:00 2001 From: rnsrk Date: Mon, 22 Jul 2024 14:57:27 +0200 Subject: [PATCH] fix configs for adapt display and views --- .../wisski/ingredient/barrel/manager/apply.go | 19 ++++++++++++++++++- .../ingredient/barrel/manager/manager.go | 2 ++ .../wisski/ingredient/php/extras/adapters.php | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/internal/wisski/ingredient/barrel/manager/apply.go b/internal/wisski/ingredient/barrel/manager/apply.go index 71ec6ce..68866e1 100644 --- a/internal/wisski/ingredient/barrel/manager/apply.go +++ b/internal/wisski/ingredient/barrel/manager/apply.go @@ -174,7 +174,7 @@ func (manager *Manager) applyWissKI(ctx context.Context, progress io.Writer, wis logging.LogMessage(progress, "Enable Wisski modules") { if err := manager.dependencies.Drush.Enable(ctx, progress, - "colorbox", "devel", "ds", "ds_extras", "ds_switch_view_mode", "file_mdm_exif", "file_mdm_font", "file_mdm", "geofield", "geofield_map", "imce", "leaflet", "leaflet_markercluster", "leaflet_views", "sophron", "sophron_guesser", "wisski", "wisski_linkblock", + "colorbox", "conditional_fields", "devel", "ds", "ds_extras", "ds_switch_view_mode", "field_group", "file_mdm_exif", "file_mdm_font", "file_mdm", "geofield", "geofield_map", "imce", "leaflet", "leaflet_markercluster", "leaflet_views", "sophron", "sophron_guesser", "wisski", "wisski_linkblock", ); err != nil { return err } @@ -184,6 +184,16 @@ func (manager *Manager) applyWissKI(ctx context.Context, progress io.Writer, wis } } + logging.LogMessage(progress, "Use main bundles for display, views for navigation") + { + if err := manager.dependencies.Drush.Exec(ctx, progress, "config:set", "wisski_core.settings", "wisski_use_only_main_bundles", "1", "--yes"); err != nil { + return err + } + if err := manager.dependencies.Drush.Exec(ctx, progress, "config:set", "wisski_core.settings", "wisski_use_views_for_navigate", "1", "--yes"); err != nil { + return err + } + + } logging.LogMessage(progress, "Performing database updates (if any)") { if err := manager.dependencies.Drush.Exec(ctx, progress, "updatedb", "--yes"); err != nil { @@ -191,6 +201,13 @@ func (manager *Manager) applyWissKI(ctx context.Context, progress io.Writer, wis } } + logging.LogMessage(progress, "Clearing cache") + { + if err := manager.dependencies.Drush.Exec(ctx, progress, "cr", "--yes"); err != nil { + return err + } + } + return nil }, progress, "Installing WissKI version %q", wisski) } diff --git a/internal/wisski/ingredient/barrel/manager/manager.go b/internal/wisski/ingredient/barrel/manager/manager.go index fcea8ea..5cb6135 100644 --- a/internal/wisski/ingredient/barrel/manager/manager.go +++ b/internal/wisski/ingredient/barrel/manager/manager.go @@ -60,8 +60,10 @@ var ( WissKI: "", InstallModules: []string{ "drupal/colorbox", + "drupal/conditional_fields:4.x-dev@dev", "drupal/devel:^5.0", "drupal/ds:^3.22", + "drupal/field_group:3.x-dev@dev", "drupal/geofield:^1.56", "drupal/geofield_map:^3.0", "kint-php/kint:^5", diff --git a/internal/wisski/ingredient/php/extras/adapters.php b/internal/wisski/ingredient/php/extras/adapters.php index 563be69..fcb89e2 100644 --- a/internal/wisski/ingredient/php/extras/adapters.php +++ b/internal/wisski/ingredient/php/extras/adapters.php @@ -18,7 +18,7 @@ function create_distillery_adapter(string $LABEL, string $MACHINE_NAME, string $ $is_preferred_local_store = TRUE; // is_preferred_local_store $read_url = 'http://triplestore:7200/repositories/' . $GRAPHDB_REPO; // read_url $write_url = 'http://triplestore:7200/repositories/' . $GRAPHDB_REPO . '/statements'; // write_url - $is_federatable = TRUE; // is_federatable + $is_federatable = 0; // is_federatable $default_graph_uri = 'https://' . $INSTANCE_DOMAIN . '/'; $same_as_properties = ['http://www.w3.org/2002/07/owl#sameAs']; // same_as_properties $ontology_graphs = []; // ontology_graphs