Merged upstream master branch to resolve conflicts

README.md

@@ -1,7 +1,7 @@
 # Wegue (WebGIS with OpenLayers and Vue.js)
 Template and re-usable components for webmapping applications with OpenLayers and Vue.js
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wegue-oss/wegue/ci-tests?label=Tests)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wegue-oss/wegue/ci-tests.yml?branch=master)
 [![Known Vulnerabilities](https://snyk.io/test/github/wegue-oss/wegue/badge.svg)](https://snyk.io/test/github/wegue-oss/wegue)
 [![license: 2-Clause BSD](https://img.shields.io/badge/license-2--Clause%20BSD-brightgreen.svg)](https://opensource.org/licenses/BSD-2-Clause)
 [![Join the chat at https://gitter.im/wegue/community](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/wegue/community)

app-starter/components/AppSidebar.vue

@@ -57,8 +57,13 @@ export default {
     WguEventBus.$on('sidebar-scroll', comp => {
       this.scrollTo(comp);
     });
-    WguEventBus.$on('sidebar-toggle', () => {
-      this.sidebarOpen = !this.sidebarOpen;
+    WguEventBus.$on('sidebar-toggle', (open) => {
+      // toggle or force a opening state of the sidebar
+      if (typeof open === 'boolean') {
+        this.sidebarOpen = open;
+      } else {
+        this.sidebarOpen = !this.sidebarOpen;
+      }
     });
   },
   methods: {

app-starter/static/app-conf-sidebar.json

@@ -223,7 +223,8 @@
       "win": "sidebar",
       "icon": "layers",
       "visible": true,
-      "minimizable": true
+      "minimizable": true,
+      "closable": false
     },
     "wgu-measuretool": {
       "target": "menu",

app-starter/static/app-conf.json

@@ -181,7 +181,7 @@
       "format": "MVT",
       "attribution": "Kindly provided by @ahocevar",
       "visible": false,
-      "opacityControl": true,  
+      "opacityControl": true,
       "style": {
         "strokeColor": "gray",
         "strokeWidth": 1,
@@ -287,7 +287,8 @@
     "sample-module": {
       "target": "toolbar",
       "win": "floating",
-      "icon": "star"
+      "icon": "star",
+      "closable": false
     }
   }
 }

docs/_coverpage.md

@@ -1,4 +1,4 @@
-# Wegue <small>1.1.0</small>
+# Wegue <small>1.2.0</small>
 
 > Simple Webmapping with OpenLayers and Vue.js
 

docs/module-configuration.md

@@ -22,6 +22,7 @@ The following properties can be applied to all module types:
 | **win**            | Value to mark if the module has a window as sub component and where to show the module UI elements. Valid options are `floating` and `sidebar`. If the value is omitted, then the module is not associated with a window.  | `"win": "floating"` |
 | icon               | Provide a customized icon for the module. | `"icon": "info"` |
 | minimizable        | Indicates whether the module window can be minimized. Only applies if a module window is present as indicated by the `win` parameter. | `"minimizable": true` |
+| closable           | Indicates whether the module window can be closed by a "X" icon in the window's header bar. Only applies if a module window is present as indicated by the `win` parameter. | `"closable": false` |
 | backgroundImage    | Optional background image for the window header. Only applies if a module window is present as indicated by the `win` parameter. | `"backgroundImage": "static/icon/myImage.png"}` |
 | visible            | Configures the initial visiblity of a module window on application start. Only applies if a module window is present as indicated by the `win` parameter.  | `"visible": true` |
 

docs/workshop.md

@@ -1,6 +1,6 @@
 # Workshop
 
-This workshop uses Wegue version [`v1.1.0`](https://github.com/wegue-oss/wegue/releases/tag/v1.1.0) but works for higher versions with no or little adaptation.
+This workshop uses Wegue version [`v1.2.0`](https://github.com/wegue-oss/wegue/releases/tag/v1.2.0) but works for higher versions with no or little adaptation.
 
 ## Prerequisites
 
@@ -12,7 +12,7 @@ You should have basic knowledge of using a commandline and a basic understanding
 
 For this workshop or to quickly try something, you can use the online-environment Gitpod. For this you need a browser and you need to register at Gitpod. That can be done with an existing GitHub account.
 
-To get started navigate to [**gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.1.0**](https://gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.1.0). Ideally, you will see a terminal running commands to set up Wegue. After some moments (~1 minute) you should see a running Wegue instance in one of the editor's panes like in this screenshot.
+To get started navigate to [**gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.0**](https://gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.0). Ideally, you will see a terminal running commands to set up Wegue. After some moments (~1 minute) you should see a running Wegue instance in one of the editor's panes like in this screenshot.
 
 ![Wegue running in Gitpod](_media/workshop/gitpod-wegue.png)
 
@@ -37,10 +37,10 @@ We need to download Wegue. This can be done in two ways:
     cd wegue
 
     # checkout the version of the Workshop
-    git checkout v1.1.0
+    git checkout v1.2.0
     ```
 
-- Alternatively download a zip-archive of Wegue via GitHub using this [link](https://github.com/wegue-oss/wegue/archive/refs/tags/v1.1.0.zip) and extract it.
+- Alternatively download a zip-archive of Wegue via GitHub using this [link](https://github.com/wegue-oss/wegue/archive/refs/tags/v1.2.0.zip) and extract it.
 
 ## Start Wegue
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wegue",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Template project for a WebGIS client with OpenLayers and Vue.js",
   "author": "Christian Mayer <[email protected]>",
   "contributors": [

src/components/modulecore/ModuleCard.vue

@@ -21,7 +21,7 @@
           <v-icon v-if="minimized">web_asset</v-icon>
           <v-icon v-else>remove</v-icon>
         </v-btn>
-        <v-btn color="onprimary" icon small class="mr-0"
+        <v-btn color="onprimary" v-if="closable" icon small class="mr-0"
           @click="toggleUi">
           <v-icon>close</v-icon>
         </v-btn>
@@ -51,6 +51,7 @@ export default {
     icon: { type: String, required: true },
     win: { type: String, required: false, default: 'floating' },
     minimizable: { type: Boolean, required: false, default: false },
+    closable: { type: Boolean, required: false, default: true },
     backgroundImage: { type: String, required: false, default: undefined },
     visible: { type: Boolean, required: false, default: false },
     // Positioning / sizing properties will be ignored for sidebar cards.

tests/unit/specs/components/AppSidebar.spec.js

@@ -0,0 +1,36 @@
+import AppSidebar from 'APP/components/AppSidebar';
+import { WguEventBus } from '@/WguEventBus';
+import { shallowMount } from '@vue/test-utils';
+
+describe('AppSidebar.vue', () => {
+  describe('data', () => {
+    let comp;
+    let vm;
+    beforeEach(() => {
+      comp = shallowMount(AppSidebar);
+      vm = comp.vm;
+    });
+
+    it('has correct default data', () => {
+      expect(vm.sidebarOpen).to.equal(true);
+    });
+  });
+
+  describe('events', () => {
+    let comp;
+    let vm;
+    beforeEach(() => {
+      comp = shallowMount(AppSidebar);
+      vm = comp.vm;
+    });
+
+    it('event "sidebar-toggle" forces correct open state', () => {
+      // force closing sidebar by adding 'false' parameter
+      WguEventBus.$emit('sidebar-toggle', false);
+      expect(vm.sidebarOpen).to.equal(false);
+      // toggle sidebar open state by skipping parameter
+      WguEventBus.$emit('sidebar-toggle');
+      expect(vm.sidebarOpen).to.equal(true);
+    });
+  });
+});