From 74aca0711556410b6f30aaff12ff4503fbbae6e7 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Tue, 19 Jun 2018 17:25:02 +0100
Subject: [PATCH] upgrade to latest ADF alpha (#436)

---
 package-lock.json                             | 34 ++++---------------
 package.json                                  |  4 +--
 src/app.config.json                           |  3 +-
 .../info-drawer/info-drawer.component.html    |  6 +++-
 .../components/preview/preview.component.html |  6 +++-
 .../node-versions/node-versions.dialog.html   |  7 +++-
 6 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4aaf70d36..436e6b991 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,11 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-052668fddc2827b87055e37b43516500a348f9d8.tgz",
-      "integrity": "sha512-wAIxDwNWZWAhkJ5lQKUkEISlIUA/8YTVuVx8DlMmGQYp9xTK4xqAVVV/eQ0AV9xsfxK23driAlzk6HageZYhHQ==",
+      "version": "2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae.tgz",
+      "integrity": "sha512-ncSys7iQejfoGXDjZa/sFCue0mE4hT8K1qyPITMk5qeSjpqq2mvu8NZvTLYOh9H9tXoYF8349o6WrHOFopRf0w==",
       "requires": {
-        "@alfresco/adf-core": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8",
+        "@alfresco/adf-core": "2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae",
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
         "@angular/common": "5.1.1",
@@ -40,16 +40,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f.tgz",
-          "integrity": "sha512-6H80RmDIOV2DrWz/n7t4jzpdQm79rPpWolsV8tRuyJW3U08Nj4WSB8cQ7VYe19sLEZbKtRG3K/DE8xpYZzU1uA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "jsrsasign": "^8.0.12",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
@@ -71,9 +61,9 @@
       }
     },
     "@alfresco/adf-core": {
-      "version": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-052668fddc2827b87055e37b43516500a348f9d8.tgz",
-      "integrity": "sha512-GJ4+c6NzVa/tfYQFlyP2QG2EjaqY9DyktQt9F9GApMaa0p3aJIvGjcf7+BpyIasWXD63uNCdmmoIOd2pggtubQ==",
+      "version": "2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae.tgz",
+      "integrity": "sha512-+ihUJ9UtdRrGaQrxE/I6CbURh+SGINV9fAO4clCKIHdy4s6i1RVEeLyCTN/dzn5yD2NtzVoSRf+Dz1uS0UZhZQ==",
       "requires": {
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
@@ -105,16 +95,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f.tgz",
-          "integrity": "sha512-6H80RmDIOV2DrWz/n7t4jzpdQm79rPpWolsV8tRuyJW3U08Nj4WSB8cQ7VYe19sLEZbKtRG3K/DE8xpYZzU1uA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "jsrsasign": "^8.0.12",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
diff --git a/package.json b/package.json
index 880fa9e42..19638586c 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8",
-    "@alfresco/adf-core": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8",
+    "@alfresco/adf-content-services": "2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae",
+    "@alfresco/adf-core": "2.4.0-ea4c9fe9aa56612fde3969d570ed50f36f0f63ae",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
diff --git a/src/app.config.json b/src/app.config.json
index 2d87d408c..c9e6c692e 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -19,8 +19,7 @@
     },
     "adf-version-manager": {
         "allowComments": true,
-        "allowDownload": true,
-        "allowDelete": true
+        "allowDownload": true
     },
     "sideNav": {
         "preserveState": true,
diff --git a/src/app/components/info-drawer/info-drawer.component.html b/src/app/components/info-drawer/info-drawer.component.html
index f6f75fe03..985ebec34 100644
--- a/src/app/components/info-drawer/info-drawer.component.html
+++ b/src/app/components/info-drawer/info-drawer.component.html
@@ -14,7 +14,11 @@
 
         <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.VERSIONS' | translate">
             <ng-container *ngIf="isFileSelected;else empty">
-                <adf-version-manager [node]="displayNode"></adf-version-manager>
+                <adf-version-manager
+                    [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
+                    [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
+                    [node]="displayNode">
+                </adf-version-manager>
             </ng-container>
 
             <ng-template #empty>
diff --git a/src/app/components/preview/preview.component.html b/src/app/components/preview/preview.component.html
index 8a19b3151..4807b59a9 100644
--- a/src/app/components/preview/preview.component.html
+++ b/src/app/components/preview/preview.component.html
@@ -13,7 +13,11 @@
 
             <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.VERSIONS' | translate">
                 <ng-container>
-                    <adf-version-manager [node]="node"></adf-version-manager>
+                    <adf-version-manager
+                        [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
+                        [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
+                        [node]="node">
+                    </adf-version-manager>
                 </ng-container>
             </adf-info-drawer-tab>
         </adf-info-drawer>
diff --git a/src/app/dialogs/node-versions/node-versions.dialog.html b/src/app/dialogs/node-versions/node-versions.dialog.html
index 4a0dc8e72..829ea13b1 100644
--- a/src/app/dialogs/node-versions/node-versions.dialog.html
+++ b/src/app/dialogs/node-versions/node-versions.dialog.html
@@ -1,6 +1,11 @@
 <header mat-dialog-title>{{'VERSION.DIALOG.TITLE' | translate}}</header>
 <section mat-dialog-content>
-    <adf-version-manager [node]="node" (uploadError)="uploadError($event)"></adf-version-manager>
+    <adf-version-manager
+        [node]="node"
+        [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
+        [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
+        (uploadError)="uploadError($event)">
+    </adf-version-manager>
 </section>
 <footer mat-dialog-actions>
     <button mat-button [mat-dialog-close]="true">{{'VERSION.DIALOG.CLOSE' | translate}}</button>