From a4351e87e3dc218a1aed37d0e9a5a57c7f4ebd7e Mon Sep 17 00:00:00 2001
From: jirik <jirik@users.noreply.github.com>
Date: Wed, 15 Apr 2020 08:52:57 +0200
Subject: [PATCH] Upgrade Layman test client to version 1.1.2

Fix reaching  without authentication
---
 .env.demo                  | 2 +-
 .env.dev                   | 2 +-
 .env.test                  | 2 +-
 .gitignore                 | 1 -
 CHANGELOG.md               | 9 +++++++++
 README.md                  | 1 -
 src/layman/static/.gitkeep | 0
 src/wait_for_deps.py       | 2 +-
 8 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 100644 src/layman/static/.gitkeep

diff --git a/.env.demo b/.env.demo
index 4cde4c2ab..43502d4f0 100644
--- a/.env.demo
+++ b/.env.demo
@@ -46,7 +46,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/
 
 # client
 LAYMAN_CLIENT_PUBLIC_URL=http://localhost/client/
-LAYMAN_CLIENT_VERSION=v1.1.1
+LAYMAN_CLIENT_VERSION=v1.1.2
 
 # extra hosts to be added to /etc/hosts
 EXTRA_HOST1=1.2.3.4:1.2.3.4
diff --git a/.env.dev b/.env.dev
index 01f3655ad..fdd470812 100644
--- a/.env.dev
+++ b/.env.dev
@@ -47,7 +47,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/
 
 # client
 LAYMAN_CLIENT_PUBLIC_URL=http://localhost:3000/client/
-LAYMAN_CLIENT_VERSION=v1.1.1
+LAYMAN_CLIENT_VERSION=v1.1.2
 
 
 ##############################################################################
diff --git a/.env.test b/.env.test
index 302aa5f73..23940a2f4 100644
--- a/.env.test
+++ b/.env.test
@@ -46,7 +46,7 @@ LAYMAN_TIMGEN_URL=http://timgen:8080/
 LAYMAN_CLIENT_URL=http://layman_client_test:3000/client/
 
 # client
-LAYMAN_CLIENT_VERSION=v1.1.1
+LAYMAN_CLIENT_VERSION=v1.1.2
 
 
 ##############################################################################
diff --git a/.gitignore b/.gitignore
index 95e3f862f..9d8aba5e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 **/.pytest_cache
 
 src/layman_settings.py
-src/layman/static/test-client
 
 /deps/*/data
 /deps/*/tmp
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe004a7ae..a15077290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 
 
+## v1.3.3
+2020-04-15
+### Upgrade requirements
+- Change [LAYMAN_CLIENT_VERSION](doc/env-settings.md#LAYMAN_CLIENT_VERSION) from `v1.1.1` to `v1.1.2`
+### Changes
+- Upgrade Layman test client to version 1.1.2, fixing reaching `static.css` without authentication
+- Extend map JSON schema with ArcGIS REST API layers and static image layers
+
+
 ## v1.3.2
 2020-04-09
 - Request Geoserver through http instead of public scheme, fix #57
diff --git a/README.md b/README.md
index c82aca2dc..c54b62e19 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,6 @@ sudo chown -R 1000:1000 layman_data/
 sudo chown -R 1000:1000 layman_data_test/
 sudo chown -R 1000:1000 src/
 sudo chown -R 1000:1000 tmp/
-sudo chown -R 1000:1000 src/layman/static/test-client/
 ```
 and restart layman
 ```bash
diff --git a/src/layman/static/.gitkeep b/src/layman/static/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/wait_for_deps.py b/src/wait_for_deps.py
index 36a13bf81..269405138 100644
--- a/src/wait_for_deps.py
+++ b/src/wait_for_deps.py
@@ -76,7 +76,7 @@ def main():
     print()
 
     # Layman Test Client
-    ltc_url = f"{settings.LAYMAN_CLIENT_URL}test-client/global.css"
+    ltc_url = f"{settings.LAYMAN_CLIENT_URL}static/global.css"
     wait_for_msg = f"Layman Test Client, url={ltc_url}"
     print(f"Waiting for {wait_for_msg}")
     while True: