Merge branch 'dev'

dhis2adapter/pom.xml

@@ -15,7 +15,7 @@
     GNU Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses />.
+    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- Copyright (c) 2019 TerraFrame, Inc. All rights reserved. This file is part of Geoprism Registry(tm). Geoprism Registry(tm) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Geoprism Registry(tm) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with Geoprism Registry(tm). If not, see <http://www.gnu.org/licenses />. -->

georegistry-server/pom.xml

@@ -15,7 +15,7 @@
     GNU Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses />.
+    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -34,7 +34,7 @@
 
 	<properties>
 		<!-- We need this property because it facilitates replacement via the Jenkins formal release job. -->
-		<cgr.adapter.version>0.14.6</cgr.adapter.version>
+		<cgr.adapter.version>0.14.7</cgr.adapter.version>
 	</properties>
 
 

georegistry-server/src/main/resources/domain/(0001619800880288)NoRolesError.xml

@@ -0,0 +1,38 @@
+<!--
+
+    Copyright (c) 2019 TerraFrame, Inc. All rights reserved.
+
+    This file is part of Geoprism Registry(tm).
+
+    Geoprism Registry(tm) is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    Geoprism Registry(tm) is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<version xsi:noNamespaceSchemaLocation="classpath:com/runwaysdk/resources/xsd/version.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <doIt>
+    <createOrUpdate>
+      <object type="com.runwaysdk.localization.LocalizedValueStore" key="hub.no-valid-roles">
+        <attribute name="storeTag" value="UIText" />
+        <attribute name="storeKey" value="hub.no-valid-roles" />
+        <attributeStruct name="storeValue">
+          <attribute name="defaultLocale" value="You do not have any valid roles. Contact your administrator and request that he look at your permissions." />
+        </attributeStruct>
+      </object>
+    </createOrUpdate>
+    <create></create>
+    <update></update>
+  </doIt>
+  <undoIt>
+    <delete></delete>
+  </undoIt>
+</version>

georegistry-test/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>net.geoprism</groupId>
     <artifactId>georegistry</artifactId>
-    <version>0.14.6-SNAPSHOT</version>
+    <version>0.14.7-SNAPSHOT</version>
   </parent>
   <artifactId>georegistry-test</artifactId>
   <packaging>war</packaging>

georegistry-web/pom.xml

@@ -15,7 +15,7 @@
     GNU Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses />.
+    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

georegistry-web/src/main/ng2/src/app/core/component/hub/hub.component.html

@@ -3,10 +3,18 @@
         <cgr-header></cgr-header>
         <loading-bar></loading-bar>
 
-        <div id="app-container" class="container-fluid">
-            <div class="nav-icon-container">
-
-                <div *ngIf="applications?.length > 0" class="row vertical-center-row">
+        <div id="app-container" class="container-fluid" style="height:100%">
+            <div class="nav-icon-container" >
+                <div *ngIf="applications?.length == 0" style="display: flex; justify-content: center; align-items: center; height:100%">
+			            <div *ngIf="!loading && authService.getRoles().length == 0" class="error-message" style="font-size:1.5em;">
+			              <localize key="hub.no-valid-roles"></localize>
+			            </div>
+			            <div *ngIf="loading" class="fa fa-spinner fa-spin" style="font-size:4em; color:black;">
+
+			            </div>
+			          </div>
+
+                <div *ngIf="applications?.length > 0 && !loading" class="row vertical-center-row">
                     <div class="col-md-3 col-sm-4 col-xs-2"></div>
                     <div class="col-md-6 col-sm-4 col-xs-8">
                         <div *ngFor="let app of applications; let i = index;">

georegistry-web/src/main/ng2/src/app/core/component/hub/hub.component.ts

@@ -42,6 +42,7 @@ export class HubComponent implements OnInit {
     isAdmin: boolean = false;
     buckets: string = 'col-sm-6';
     bsModalRef: BsModalRef;
+    loading: boolean = true;
 
     constructor(
         private service: HubService,
@@ -55,6 +56,7 @@ export class HubComponent implements OnInit {
 
     ngOnInit(): void {
       this.service.applications().then( applications => {
+          this.loading = false;
           this.applications = applications;
       } );
 

pom.xml

@@ -15,7 +15,7 @@
     GNU Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses />.
+    License along with Geoprism Registry(tm).  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- Copyright (c) 2019 TerraFrame, Inc. All rights reserved. This file is part of Geoprism Registry(tm). Geoprism Registry(tm) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Geoprism Registry(tm) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with Geoprism Registry(tm). If not, see <http://www.gnu.org/licenses />. -->
@@ -37,7 +37,7 @@
   </modules>
 
   <properties>
-    <geoprism.version>0.9.27</geoprism.version>
+    <geoprism.version>0.9.28</geoprism.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>