From 7e64d100b5d6519a7e5149908d427713537487b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 25 Sep 2023 15:21:05 +0300 Subject: [PATCH] Replace metadata search and featuredata --- applications/embedded-3d/main.js | 2 +- applications/embedded/main.js | 2 +- applications/geoportal-3d/main.js | 2 +- applications/geoportal/main.js | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/applications/embedded-3d/main.js b/applications/embedded-3d/main.js index 46f84b3..873c7f0 100644 --- a/applications/embedded-3d/main.js +++ b/applications/embedded-3d/main.js @@ -22,7 +22,7 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/publishedstateha import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/maplegend/bundle.js'; -import 'oskari-lazy-loader?featuredata2!oskari-frontend/packages/framework/featuredata2/bundle.js'; +import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js'; import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js'; import 'oskari-lazy-loader?routingService!oskari-frontend/packages/framework/bundle/routingService/bundle.js'; import 'oskari-lazy-loader?maprotator!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; diff --git a/applications/embedded/main.js b/applications/embedded/main.js index fdbcdd1..09fb950 100644 --- a/applications/embedded/main.js +++ b/applications/embedded/main.js @@ -17,7 +17,7 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/publishedstateha import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/maplegend/bundle.js'; -import 'oskari-lazy-loader?featuredata2!oskari-frontend/packages/framework/featuredata2/bundle.js'; +import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js'; import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js'; import 'oskari-lazy-loader?routingService!oskari-frontend/packages/framework/bundle/routingService/bundle.js'; import 'oskari-lazy-loader?maprotator!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; diff --git a/applications/geoportal-3d/main.js b/applications/geoportal-3d/main.js index 0266342..ff192d6 100644 --- a/applications/geoportal-3d/main.js +++ b/applications/geoportal-3d/main.js @@ -39,7 +39,7 @@ import 'oskari-lazy-loader?myplacesimport!oskari-frontend/packages/framework/bun import 'oskari-lazy-loader?mydata!oskari-frontend/bundles/framework/mydata/bundle.js'; import 'oskari-lazy-loader?publisher2!oskari-frontend/packages/framework/bundle/publisher2/bundle.js'; import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js'; -import 'oskari-lazy-loader?featuredata2!oskari-frontend/packages/framework/featuredata2/bundle.js'; +import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js'; // end mobile tuning import 'oskari-lazy-loader?printout!oskari-frontend/packages/framework/bundle/printout/bundle.js'; diff --git a/applications/geoportal/main.js b/applications/geoportal/main.js index 104236e..e73f154 100644 --- a/applications/geoportal/main.js +++ b/applications/geoportal/main.js @@ -17,7 +17,7 @@ import 'oskari-loader!oskari-frontend/packages/mapping/ol/heatmap/bundle.js'; import 'oskari-loader!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; import 'oskari-loader!oskari-frontend/packages/mapping/ol/userstyle/bundle.js'; -import 'oskari-lazy-loader?metadatacatalogue!oskari-frontend/packages/catalogue/metadatacatalogue/bundle.js'; +import 'oskari-lazy-loader?metadatasearch!oskari-frontend/packages/catalogue/metadatasearch/bundle.js'; import 'oskari-lazy-loader?metadataflyout!oskari-frontend/packages/catalogue/bundle/metadataflyout/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js'; @@ -29,9 +29,7 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/statehandler/bun import 'oskari-lazy-loader?search!oskari-frontend/packages/framework/bundle/search/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/timeseries/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/userguide/bundle.js'; -// featuredata2 is jQuery impl, featuredata is React impl (React version is used on 3067 app while others still use the old one) -import 'oskari-lazy-loader?featuredata2!oskari-frontend/packages/framework/featuredata2/bundle.js'; -import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/bundle/featuredata/bundle.js'; +import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js'; import 'oskari-lazy-loader?language-selector!oskari-frontend/packages/framework/bundle/language-selector/bundle.js'; // 3D support