Merge pull request #359 from OS2mo/release/0.18.0

Release/0.18.0

NEWS.rst

@@ -7,14 +7,14 @@ Internal changes
 * #28686, #28687: Add Dockerfile for both production and development.
 
 
-Version 0.18.0, in development
-==============================
-
+Version 0.18.0, 2019-05-22
+==========================
 
 New features
 ------------
 
 * #29234: AD integration cookbook added to documentation
+* #26857: Removed manager address for create employee and employee and organisation tabs.
 
 Bug fixes
 ---------
@@ -24,6 +24,7 @@ Bug fixes
 * #29200: We now properly clear the store when switching org units/employees
   to prevent 'old data' from showing.
 * #29200: Fixed spinners when loading table data.
+* #29603: Spinner is now shown when tree view is loading
 
 Internal changes
 ----------------
@@ -38,7 +39,6 @@ New features
 
 * #25411: organisation units can show managers by inheritance from parent
 * #28323: Added 'fraction' field to engagements
-* #26857: Removed manager address for create employee and employee and organisation tabs.
 * #28563: Added feature for generating 'thin' responses when reading details,
   where only the UUIDs of relations are returned as opposed to deep lookups
   being performed.

backend/setup.py

@@ -19,7 +19,7 @@
     author_email='info@magenta.dk',
     description='OS2mo - Medarbejder og Organisation',
     license='MPL 2.0',
-    version='0.17.0',
+    version='0.18.0',
     url="https://os2mo.readthedocs.io/",
     packages=setuptools.find_packages(where=BACKEND_DIR, exclude=['tests']),
     package_data={

docs/vuedoc/EmployeeDetail.md

@@ -16,3 +16,5 @@ A employee detail component.
 
 - `loadContent(event)` 
 
+- `listener()` 
+

docs/vuedoc/MoManagerEntry.md

@@ -20,10 +20,4 @@ A manager entry component.
 
    **dependencies:** `value`, `$emit` 
 
-- `managerAddressEntry` 
-
-  Adds the managerAddressEntry template to the add many component. 
-
-   **dependencies:** `value` 
-
 

docs/vuedoc/MoTable.md

@@ -18,10 +18,6 @@ A table component.
 
   Defines columns. 
 
-- `is-loading` ***Boolean*** (*optional*) 
-
-  True during rendering or loading of the component. 
-
 - `edit-component` ***Object*** (*optional*) 
 
   Defines the editComponent. 
@@ -59,6 +55,10 @@ A table component.
 
 **initial value:** `null` 
 
+- `isLoading` 
+
+**initial value:** `true` 
+
 ## computed properties 
 
 - `contentAvailable` 

docs/vuedoc/MoTreeView.md

@@ -22,6 +22,12 @@
 
   Select more than one node 
 
+## data 
+
+- `isLoading` 
+
+**initial value:** `true` 
+
 ## computed properties 
 
 - `contents` 

docs/vuedoc/OrganisationDetail.md

@@ -12,3 +12,5 @@ A organisation detail component.
 
 - `loadContent(event)` 
 
+- `listener()` 
+

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mora",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "OS2 Mennesker + Organisation 2.0",
   "author": "Magenta ApS <info@magenta.dk>",
   "private": true,

frontend/src/components/MoTreeView/MoTreeView.vue

@@ -1,24 +1,27 @@
 <template>
   <div class="orgunit-tree">
-    <liquor-tree
-      :ref="_nameId"
-      :data="treeData"
-      :options="treeOptions"
-      @node:selected="onNodeSelected"
-      @node:checked="onNodeCheckedChanged"
-      @node:unchecked="onNodeCheckedChanged"
-    >
-
-      <div class="tree-scope" slot-scope="{ node }">
-        <template>
-          <icon name="users"/>
-
-          <span class="text">
-            {{ node.text }}
-          </span>
-        </template>
-      </div>
-    </liquor-tree>
+    <mo-loader v-show="isLoading"/>
+    <div v-show="!isLoading" class="scroll">
+      <liquor-tree
+        :ref="_nameId"
+        :data="treeData"
+        :options="treeOptions"
+        @node:selected="onNodeSelected"
+        @node:checked="onNodeCheckedChanged"
+        @node:unchecked="onNodeCheckedChanged"
+      >
+
+        <div class="tree-scope" slot-scope="{ node }">
+          <template>
+            <icon name="users"/>
+
+            <span class="text">
+                {{ node.text }}
+              </span>
+          </template>
+        </div>
+      </liquor-tree>
+    </div>
   </div>
 </template>
 
@@ -27,11 +30,13 @@ import { EventBus, Events } from '@/EventBus'
 import { mapGetters } from 'vuex'
 import Organisation from '@/api/Organisation'
 import OrganisationUnit from '@/api/OrganisationUnit'
+import MoLoader from '@/components/atoms/MoLoader'
 import LiquorTree from 'liquor-tree'
 import { Organisation as OrgStore } from '@/store/actions/organisation'
 
 export default {
   components: {
+    MoLoader,
     LiquorTree
   },
 
@@ -162,7 +167,8 @@ export default {
         fetchData (node) {
           return vm.fetch(node)
         }
-      }
+      },
+      isLoading: true
     }
   },
 
@@ -321,6 +327,7 @@ export default {
 
       this.tree.sort()
       this.setSelection(this.value)
+      this.isLoading = false
     },
 
     /**
@@ -369,6 +376,7 @@ export default {
      * Reset and re-fetch the tree.
      */
     updateTree (force) {
+      this.isLoading = true
       if (force) {
         this.tree.remove({}, true)
       }

frontend/src/views/employee/EmployeeDetail.vue

@@ -72,15 +72,19 @@ export default {
     this.$store.dispatch(Employee.actions.SET_EMPLOYEE, this.$route.params.uuid)
   },
   mounted () {
-    EventBus.$on(Events.EMPLOYEE_CHANGED, () => {
-      this.loadContent(this.latestEvent)
-    })
+    EventBus.$on(Events.EMPLOYEE_CHANGED, this.listener)
+  },
+  beforeDestroy () {
+    EventBus.$off(Events.EMPLOYEE_CHANGED, this.listener)
   },
   methods: {
     loadContent (event) {
       this.latestEvent = event
-      this.$store.dispatch(Employee.actions.SET_EMPLOYEE, this.$route.params.uuid)
       this.$store.dispatch(Employee.actions.SET_DETAIL, event)
+    },
+    listener () {
+      this.$store.dispatch(Employee.actions.SET_EMPLOYEE, this.$route.params.uuid)
+      this.loadContent(this.latestEvent)
     }
   }
 

frontend/src/views/organisation/OrganisationDetail.vue

@@ -78,15 +78,19 @@ export default {
     this.$store.dispatch(OrganisationUnit.actions.SET_ORG_UNIT, this.route.params.uuid)
   },
   mounted () {
-    EventBus.$on(Events.ORGANISATION_UNIT_CHANGED, () => {
-      this.loadContent(this.latestEvent)
-    })
+    EventBus.$on(Events.ORGANISATION_UNIT_CHANGED, this.listener)
+  },
+  beforeDestroy () {
+    EventBus.$off(Events.ORGANISATION_UNIT_CHANGED, this.listener)
   },
   methods: {
     loadContent (event) {
       this.latestEvent = event
-      this.$store.dispatch(OrganisationUnit.actions.SET_ORG_UNIT, this.route.params.uuid)
       this.$store.dispatch(OrganisationUnit.actions.SET_DETAIL, event)
+    },
+    listener () {
+      this.$store.dispatch(OrganisationUnit.actions.SET_ORG_UNIT, this.route.params.uuid)
+      this.loadContent(this.latestEvent)
     }
   }
 }