Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/1.27 #13

Merged
merged 8 commits into from
Mar 25, 2024
Merged

Release/1.27 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61c14b1
Next dev version
ZakarFin Aug 14, 2023
7944eac
Add theme provider to projection change.
Sep 1, 2023
69b0bac
Merge pull request #10 from Creaticide/feature/OS-2405
ZakarFin Sep 1, 2023
750ea20
reactify guided tour for asdi-login bundle
DenverCoder544 Dec 8, 2023
644e3b8
Merge pull request #11 from DenverCoder544/guidedtour_bugfix
ZakarFin Dec 11, 2023
71dc322
add layerswipe bundle to embedded map
DenverCoder544 Jan 15, 2024
ea3366c
Merge pull request #12 from DenverCoder544/embedded-map-layerswipe
ZakarFin Jan 15, 2024
c608b9d
Switch statsgrid and featuredata
ZakarFin Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/embedded/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.j

import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/publishedstatehandler/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/featuredata2/bundle.js';
import 'oskari-lazy-loader?featuredata!oskari-frontend/packages/framework/featuredata/bundle.js';
import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js';
import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/timeseries/bundle.js';
import 'oskari-lazy-loader?maplegend!oskari-frontend/packages/framework/bundle/maplegend/bundle.js';
import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js';
import 'oskari-lazy-loader?statsgrid!oskari-frontend/bundles/statistics/statsgrid/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js';
import 'oskari-lazy-loader?layerswipe!oskari-frontend/packages/mapping/ol/layerswipe/bundle.js';
// So someone could potentially query metadata through RPC and an embedded map:
// import 'oskari-lazy-loader?metadatasearch!oskari-frontend/packages/catalogue/metadatasearch/bundle.js';

import './css/overwritten.css';
6 changes: 4 additions & 2 deletions apps/geoportal/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js';
import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/search/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/layerlist/bundle.js';
// After improving the advanced options UI
// import 'oskari-loader!oskari-frontend/packages/catalogue/metadatasearch/bundle.js';
import 'oskari-loader!oskari-frontend/packages/catalogue/metadatacatalogue/bundle.js';
import 'oskari-loader!oskari-frontend/packages/catalogue/bundle/metadataflyout/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/coordinatetool/bundle.js';
Expand All @@ -37,7 +39,7 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/guidedtour/bundl
import 'oskari-loader!../../bundles/asdi-login/bundle.js';
import 'oskari-loader!../../bundles/asdi-projection-change/bundle.js';

import 'oskari-loader!oskari-frontend/packages/framework/featuredata2/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/featuredata/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/userguide/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/language-selector/bundle.js';
import 'oskari-loader!oskari-frontend/packages/framework/bundle/printout/bundle.js';
Expand All @@ -49,7 +51,7 @@ import 'oskari-lazy-loader?admin-layereditor!oskari-frontend/packages/admin/bund
import 'oskari-lazy-loader?admin-layerrights!oskari-frontend/packages/framework/bundle/admin-layerrights/bundle.js';
import 'oskari-lazy-loader?admin-users!oskari-frontend/packages/framework/bundle/admin-users/bundle.js';
import 'oskari-lazy-loader?admin!oskari-frontend/packages/admin/bundle/admin/bundle.js';
import 'oskari-lazy-loader?statsgrid!oskari-frontend/packages/statistics/statsgrid/bundle.js';
import 'oskari-lazy-loader?statsgrid!oskari-frontend/bundles/statistics/statsgrid/bundle.js';
import 'oskari-lazy-loader?admin-layeranalytics!oskari-frontend/bundles/admin/admin-layeranalytics/bundle.js';

import './css/overwritten.css';
7 changes: 4 additions & 3 deletions bundles/asdi-login/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import React from 'react';
import { Message } from 'oskari-ui';

/**
* @class Oskari.asdi.login.BundleInstance
*/
Expand Down Expand Up @@ -58,9 +61,7 @@ Oskari.clazz.define('Oskari.asdi.login.BundleInstance',
return this.locale.guidedTour.title;
},
getContent: function () {
var content = jQuery('<div></div>');
content.append(this.locale.guidedTour.message);
return content;
return <Message bundleKey={this.getName()} messageKey='guidedTour.message' allowHTML />;
},
getLinks: function () {
// No links to show
Expand Down
71 changes: 37 additions & 34 deletions bundles/asdi-projection-change/plugin/ProjectionChangePopup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { showPopup } from 'oskari-ui/components/window';
import styled from 'styled-components';
import { Message, Confirm } from 'oskari-ui';
import { InfoIcon } from 'oskari-ui/components/icons';
import { WarningIcon } from 'oskari-ui'
import { WarningIcon } from 'oskari-ui';
import { ThemeProvider } from 'oskari-ui/util';

const BUNDLE_KEY = 'projection-change';

Expand Down Expand Up @@ -58,40 +59,42 @@ const checkSupported = (srsName) => {

const PopupContent = ({ views, changeView, currentView, showDescription }) => {
return (
<ViewsContainer>
{views?.map(view => (
<View key={view.srsName}>
<ViewImage onClick={() => changeView(view.uuid, view.srsName)} src={getImageUrl(view.srsName)} active={currentView === view.srsName} />
<ViewText>
<Message bundleKey={BUNDLE_KEY} messageKey={`projectionCode.${view.srsName}.displayName`} />
<Info
onClick={() => showDescription(getImageUrl(view.srsName), view.srsName)}
>
<InfoIcon title={<Message bundleKey={BUNDLE_KEY} messageKey='infoPopup.title'/>} />
</Info>
{checkSupported(view.srsName)?.length > 0 && (
<Confirm
title={
<div>
<Message bundleKey={BUNDLE_KEY} messageKey='error.desc'/>
<ul className="projection-errorlist">
{checkSupported(view.srsName)?.map((unsupported, index) => (
<li key={index}>{unsupported.getName()}</li>
))}
</ul>
</div>
}
showCancel={false}
<ThemeProvider>
<ViewsContainer>
{views?.map(view => (
<View key={view.srsName}>
<ViewImage onClick={() => changeView(view.uuid, view.srsName)} src={getImageUrl(view.srsName)} active={currentView === view.srsName} />
<ViewText>
<Message bundleKey={BUNDLE_KEY} messageKey={`projectionCode.${view.srsName}.displayName`} />
<Info
onClick={() => showDescription(getImageUrl(view.srsName), view.srsName)}
>
<Warning>
<WarningIcon title={Oskari.getMsg(BUNDLE_KEY, 'error.hover.icon')} />
</Warning>
</Confirm>
)}
</ViewText>
</View>
))}
</ViewsContainer>
<InfoIcon title={<Message bundleKey={BUNDLE_KEY} messageKey='infoPopup.title'/>} />
</Info>
{checkSupported(view.srsName)?.length > 0 && (
<Confirm
title={
<div>
<Message bundleKey={BUNDLE_KEY} messageKey='error.desc'/>
<ul className="projection-errorlist">
{checkSupported(view.srsName)?.map((unsupported, index) => (
<li key={index}>{unsupported.getName()}</li>
))}
</ul>
</div>
}
showCancel={false}
>
<Warning>
<WarningIcon title={Oskari.getMsg(BUNDLE_KEY, 'error.hover.icon')} />
</Warning>
</Confirm>
)}
</ViewText>
</View>
))}
</ViewsContainer>
</ThemeProvider>
);
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "asdi-frontend",
"version": "1.26.0",
"version": "1.27.0",
"description": "Frontend for Arctic-SDI geoportal based on Oskari. Site visible in geoportal.arctic-sdi.org.",
"keywords": [
"Oskari"
],
"dependencies": {
"oskari-frontend": "https://github.com/oskariorg/oskari-frontend.git#2.11.1"
"oskari-frontend": "https://github.com/oskariorg/oskari-frontend.git#2.13.0"
},
"scripts": {
"build": "webpack --config ./node_modules/oskari-frontend/webpack.config.js --mode production --progress --env.appdef=apps",
Expand Down
Loading