correct admin tools API double slash in prod properties, add prepare deploy script, use the same property for communities API in app component, remove dashboard menu item, comment title & message for dashboard stats

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@52160 d315682c-612b-4755-9ff5-7f18f6832af3

connect-production-properties.json

@@ -47,7 +47,7 @@
 
   "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
 
-  "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
+  "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools",
 
   "adminToolsCommunity" :"openaire",
 

prepareDeploy.sh

@@ -0,0 +1,7 @@
+cp connect-production-properties.json src/assets/env-properties.json;
+rm -rf src/assets/common-assets/.svn/;
+rm -rf src/app/openaireLibrary/.svn/;
+npm run build:dynamic;
+rm -rf src node_modules  .idea/ connect-production-properties.json installOpenaireLib.sh;
+echo 'Ready!';
+echo 'Now copy dist to the server!'

src/app/app.component.ts

@@ -68,7 +68,7 @@ export class AppComponent {
        this.community = null;
        this.showMenu = false;
 
-       this._communitiesService.getCommunities(this.properties, this.properties.communityAPI+"communities").subscribe (
+       this._communitiesService.getCommunities(this.properties, this.properties.communitiesAPI).subscribe (
          communities => {
                this.userMenuItems =[ new MenuItem("","My profile","","",false,[],[],{}),
                   new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}),
@@ -79,9 +79,9 @@ export class AppComponent {
                     community = com;
                     this.community = {id: community.communityId, name: (community.shortTitle)?community.shortTitle:community.title, logoUrl:community.logoUrl};
                     this.menuItems= [
-                      {rootItem: new MenuItem("dashboard","Dashboard","","/",false,[],[],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId}),
-                      items: []
-                      },
+                      // {rootItem: new MenuItem("dashboard","Dashboard","","/",false,[],[],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId}),
+                      // items: []
+                      // },
                       {rootItem: new MenuItem("search","Search","","",false,[],[],{}),
                         items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId}),
                         new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId}),

src/app/statistics/statistics-for-dashboard.component.html

@@ -1,12 +1,12 @@
 <div>
-    <div class="uk-margin-large-top">
+    <!--div class="uk-margin-large-top">
         <h2 class="uk-h3 uk-text-primary uk-heading-line">
             <span>Most recent statistics</span>
         </h2>
     </div>
     <div *ngIf="!statisticsSum || (statisticsSum.total_projects==0) || (allowedEntities.length == 0)" class="uk-alert uk-alert-info" style="margin-top:40px;">
         No statistics are available for {{ communityId.toUpperCase() }}
-    </div>
+    </div-->
     <div>
         <div *ngFor="let entity of allowedEntities">
             <div *ngIf="statisticsSum[entity].total>0 && allowedCharts[entity].length>0">
@@ -21,4 +21,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

src/app/statistics/statistics.component.html

@@ -34,13 +34,12 @@
                                         <span *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][currentMode]">
                                             {{statisticsSum[entity].total|number}} {{ entity + ( (entity == 'software' || statisticsSum[entity].total == 1) ? '' : 's') }}
                                         </span>
-                                        <span *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][currentMode] &&
-                                                     statisticsDisplay.entities[entity].numbers.map['project'][currentMode] &&
-                                                     statisticsSum[entity].project>0">
-                                             from
-                                        </span>
+
                                         <span *ngIf="statisticsDisplay.entities[entity].numbers.map['project'][currentMode] &&
                                                      statisticsSum[entity].projects>0">
+                                                     <span *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][currentMode]">
+                                                          linked to
+                                                     </span>
                                             {{statisticsSum[entity].projects|number}} project{{ statisticsSum[entity].projects == 1 ? '' : 's' }}.
                                         </span><br>
                                         <span *ngIf="statisticsDisplay.entities[entity].numbers.map['open'][currentMode] &&

src/assets/connect-custom.css

@@ -14,11 +14,6 @@
   .custom-connect-toolbar{
     border-top-color:#FFC700 !important;
   }
-.custom-footer{
- position:relative;
- bottom:0;
- left:0;
-}
 .uk-button-default:hover,.uk-button-default:focus,.btn:hover,.btn:focus {
   background-color:#fff !important;
   color:#5b5b5b !important;