From 67749457e045b2383ac7a361f5dc87699a8e1ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 2 Dec 2024 13:41:58 +0200 Subject: [PATCH 1/3] Switch metadataflyout implementation to React-based --- applications/embedded/main.js | 2 +- applications/geoportal/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/embedded/main.js b/applications/embedded/main.js index 28518d8..1f9b811 100644 --- a/applications/embedded/main.js +++ b/applications/embedded/main.js @@ -23,7 +23,7 @@ import 'oskari-lazy-loader?routingService!oskari-frontend/packages/framework/bun import 'oskari-lazy-loader?maprotator!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; import 'oskari-lazy-loader?timeseries!oskari-frontend/packages/framework/bundle/timeseries/bundle.js'; -import 'oskari-lazy-loader?metadataflyout!oskari-frontend/packages/catalogue/bundle/metadataflyout/bundle.js'; +import 'oskari-lazy-loader?metadataflyout!oskari-frontend/bundles/catalogue/metadata/bundle.js' import 'oskari-lazy-loader?metadatasearch!oskari-frontend/packages/catalogue/metadatasearch/bundle.js'; import 'oskari-lazy-loader?announcements!oskari-frontend/packages/framework/bundle/announcements/bundle.js'; diff --git a/applications/geoportal/main.js b/applications/geoportal/main.js index 428a18d..828a1b1 100644 --- a/applications/geoportal/main.js +++ b/applications/geoportal/main.js @@ -18,7 +18,7 @@ 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?metadatasearch!oskari-frontend/packages/catalogue/metadatasearch/bundle.js'; -import 'oskari-lazy-loader?metadataflyout!oskari-frontend/packages/catalogue/bundle/metadataflyout/bundle.js'; +import 'oskari-lazy-loader?metadataflyout!oskari-frontend/bundles/catalogue/metadata/bundle.js' import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/guidedtour/bundle.js'; From 177baf6cad7ea18e33b7a5e757aa512be0532a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 2 Dec 2024 13:49:36 +0200 Subject: [PATCH 2/3] Disable stories, see oskari-frontend --- bundles/sample/sample-info/example.stories.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/sample/sample-info/example.stories.js b/bundles/sample/sample-info/example.stories.js index 9835ae3..6e13aeb 100644 --- a/bundles/sample/sample-info/example.stories.js +++ b/bundles/sample/sample-info/example.stories.js @@ -1,5 +1,6 @@ import React from 'react'; -import { storiesOf } from '@storybook/react'; +// https://github.com/oskariorg/oskari-frontend/pull/2662 +//import { storiesOf } from '@storybook/react'; import { Button } from 'oskari-ui'; storiesOf('Sample Application', module) From 8712dd55045a4956cc847287b5ac3ffcce7da088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 2 Dec 2024 13:57:23 +0200 Subject: [PATCH 3/3] Comment out the whole stories.js file --- bundles/sample/sample-info/example.stories.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bundles/sample/sample-info/example.stories.js b/bundles/sample/sample-info/example.stories.js index 6e13aeb..12be148 100644 --- a/bundles/sample/sample-info/example.stories.js +++ b/bundles/sample/sample-info/example.stories.js @@ -1,9 +1,10 @@ +/* import React from 'react'; // https://github.com/oskariorg/oskari-frontend/pull/2662 -//import { storiesOf } from '@storybook/react'; +// import { storiesOf } from '@storybook/react'; import { Button } from 'oskari-ui'; - storiesOf('Sample Application', module) .add('with text', () => ( )); +*/