Skip to content

Commit

Permalink
Merge pull request #36 from ZakarFin/switch-metadata
Browse files Browse the repository at this point in the history
Switch metadataflyout implementation to React-based
  • Loading branch information
ZakarFin authored Dec 2, 2024
2 parents 1bf4adf + 8712dd5 commit 4301688
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion applications/embedded/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion applications/geoportal/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 4 additions & 2 deletions bundles/sample/sample-info/example.stories.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
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)
.add('with text', () => (
<Button>Hello from sample application</Button>
));
*/

0 comments on commit 4301688

Please sign in to comment.