EOX GitLab Instance

Commit a4b98409 authored by Nikola Jankovic's avatar Nikola Jankovic 💻
Browse files

Merge branch 'main' of gitlab.eox.at:vs/client into main

parents 20c07805 d9ebc420
Pipeline #18716 passed with stage
in 2 minutes and 5 seconds
[bumpversion]
current_version = 2.0.0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
serialize =
{major}.{minor}.{patch}-{release}.{build}
{major}.{minor}.{patch}
tag_name = release-{new_version}
[bumpversion:part:release]
optional_value = final
first_value = alpha
values =
alpha
beta
rc
final
[bumpversion:file:.bumpversion.cfg]
search = current_version = {current_version}
[bumpversion:glob:Dockerfile*]
search = version="{current_version}"
replace = version="{new_version}"
[bumpversion:glob:chart/Chart.yaml]
search = appVersion: "{current_version}"
replace = appVersion: "{new_version}"
......@@ -5,3 +5,10 @@ The client service of the view server
## Tagging
**Before tagging remember to increment the chart version (`.chart/Chart.yaml`) manually!**
Because package-lock.json version also needs to be updated and we are using bump2version to increase versions which does not work well with multi-line search inside package-lock.json for unknown reason, a two commit procedure to bump the version is needed.
```bash
npm version --no-git-tag-version <version> # via a postversion command does 'git add' and 'git commit'
bump2version patch --new-version <version> # a proper bumpversion
```
......@@ -259,12 +259,6 @@
"download": {
"protocol": "EO-WCS",
"url": baseUrl + "ows",
// "method": "GET",
"rewrite": {
// add __coverage to the coverageId
"from": "({{ "{{" }}id}})",
"to": "$1__coverage"
}
}
}
{{- end }}
......
{
"name": "VSClient",
"version": "1.5.2",
"version": "2.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
......@@ -5,7 +5,8 @@
"scripts": {
"build": "webpack -p",
"dev-server": "webpack-dev-server -d --content-base / --port ${PORT:-80}",
"lint": "./node_modules/.bin/eslint src"
"lint": "./node_modules/.bin/eslint src",
"postversion": "git add package.json package-lock.json && git commit -mv$npm_package_version"
},
"repository": {
"type": "git",
......
......@@ -25,7 +25,7 @@
"advancedfilter_warning": "Search results may differ from products shown on map because of using additional filters",
"toomanyresults_warning": "Search results may differ from products shown on map because search results are too big",
"dynamic-histogram-title": "If enabled, time distributions are shown for current spatial filter.\nIf disabled, they are shown globally.",
"tutorial1": "<p><b>Welcome to the Catalog Client</b></p><p>Let's briefly walk through the main functionalities. Hit <i>Next</i> to start.</p><p>Feel free to <i>Skip</i> any time and to resume later using the <i class='fa fa-book'/> button at the bottom right.</p><p>You can also find detailed information about the Client and referenced services here: <a href='https://esa.pages.eox.at/prism/vs/user/master/' target='_blank'>User guide document HTML</a> or <a href='https://esa.pages.eox.at/prism/vs/user/View-Server_-_User-Guide.pdf' target='_blank'>PDF</a></p>.",
"tutorial1": "<p><b>Welcome to the Catalog Client</b></p><p>Let's briefly walk through the main functionalities. Hit <i>Next</i> to start.</p><p>Feel free to <i>Skip</i> any time and to resume later using the <i class='fa fa-book'/> button at the bottom right.</p><p>You can also find detailed information about the Client and referenced services here: <a href='https://vs.pages.eox.at/documentation/user/main' target='_blank'>User guide document HTML</a> or <a href='https://vs.pages.eox.at/documentation/user/View-Server_-_User-Guide.pdf' target='_blank'>PDF</a></p>.",
"tutorial2": "<p><b>The Map</b></p><p>Noticed the map in the back? It displays available satellite data.</p><p>Navigate to your area of interest by panning and zooming, either using <i>left click + drag</i> and <i>mouse wheel scroll</i> or <i>one finger drag</i> and <i>two finger pinch</i>.</p><p>Satisfied with the displayed data? Not yet? Let's change the time of interest <i>Next</i>.</p>",
"tutorial3": "<p><b>The Timeslider</b></p><p>The timeslider displays the distribution of data over time. The gray area shows the currently selected time interval.</p><p>Navigate to your time of interest again by panning (only in the bottom area) and zooming. Change the time interval selection by using <i>left click + drag</i> in the top area.</p><p>Did you notice how the data displayed on the map and the search results changed?</p>",
"tutorial4": "<p><b>Search Results</b></p><p>The satellite data within the current area and time of interest is listed here.</p><p>Inspect details by hovering over an item and hitting <button class='btn btn-default btn-xs btn-disabled'><i class='fa fa-info-circle'/></button> or select items for download.</p><p>Your result list is too long? Let's apply more filters <i>Next</i>.</p>",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment