From 24217dc05007ba4d5d9f11b480e38ab6179a7db7 Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Sat, 8 Jun 2019 17:01:24 +0300 Subject: [PATCH] upgrade ADF 3.3.0 alpha (#1123) * update to alpha * remove locale --- package-lock.json | 59 +++++++------------ package.json | 6 +- src/app.config.json | 1 - src/app/ui/custom-theme.scss | 1 - .../overrides/adf-layout-container.theme.scss | 10 ---- 5 files changed, 23 insertions(+), 54 deletions(-) delete mode 100644 src/app/ui/overrides/adf-layout-container.theme.scss diff --git a/package-lock.json b/package-lock.json index fea178305..a92e48b4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,25 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", - "integrity": "sha512-tc7uNSbzWimRqRb6dbUMZ+tIWsD4yRs/FHNYUzR5JBs+PNX6zcLytl3cj68C4qbo95hAb1svYJt8vJ1h1Tv8IA==", + "version": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203.tgz", + "integrity": "sha512-QPbvSfCG/rOLVcwzAw2IWDrGe8fgzK209zgQwgOiGzmHhtY2Ru3GF2in+rlG+VK/qZvErv9x6nT0BVEmlc2SoQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", - "integrity": "sha512-uVCzyoRwX0Oha8qifVpjxExNuY1mBEAkgpgDh/rRZshtsJQ3r2iSkx6o9JV9ZACRP1i5ct0KHJkcOxB0o+f36A==", + "version": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203.tgz", + "integrity": "sha512-BMqpwOyBAXKL9atGa4oNM+8KsQ/twiFiSJFTvi0tKbd+EhxaKINMv9/smnIE1D54hGzBHca/dBua4kT1FWbQwg==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", - "integrity": "sha512-8dAUsEfENFQsDRlFveuvw6XsfxTCX8aYPlvE1Mo24HjFvc6wRU98+m1hso4aJWZo194W4otjtj7IEvRWnTovwA==", + "version": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203.tgz", + "integrity": "sha512-iEABQcxgUxlh7/qhbUprgL+zxLue/NSPIAs5rxuBAsGbPusIPh15cvJmo1YUnm0cbjxLs5CMUGurenfeh7afEQ==", "requires": { "tslib": "^1.9.0" } @@ -5113,8 +5113,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5135,14 +5134,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5157,20 +5154,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5287,8 +5281,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5300,7 +5293,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5315,7 +5307,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5323,14 +5314,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5349,7 +5338,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5430,8 +5418,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5443,7 +5430,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5529,8 +5515,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5566,7 +5551,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5586,7 +5570,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5630,14 +5613,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index 84a3abedf..b71d9a13c 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", - "@alfresco/adf-core": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", - "@alfresco/adf-extensions": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "@alfresco/adf-content-services": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", + "@alfresco/adf-core": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", + "@alfresco/adf-extensions": "3.3.0-8a2a71d60be3f2b3dd0173f6a51d8075241e7203", "@alfresco/js-api": "3.2.1", "@angular/animations": "7.2.15", "@angular/cdk": "^7.3.7", diff --git a/src/app.config.json b/src/app.config.json index 8178a9137..3edf0a43a 100644 --- a/src/app.config.json +++ b/src/app.config.json @@ -15,7 +15,6 @@ "redirectUri": "/", "redirectUriLogout": "/logout" }, - "locale": "en", "application": { "name": "Alfresco Content Application", "logo": "assets/images/alfresco-logo-flower.svg", diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 4dba63a3d..73c51d437 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -11,7 +11,6 @@ @import '../components/create-menu/create-menu.component.scss'; @import '../components/layout/layout.theme.scss'; -@import 'overrides/adf-layout-container.theme'; @import './overrides/adf-document-list.theme'; @import 'snackbar'; diff --git a/src/app/ui/overrides/adf-layout-container.theme.scss b/src/app/ui/overrides/adf-layout-container.theme.scss deleted file mode 100644 index d40af3d35..000000000 --- a/src/app/ui/overrides/adf-layout-container.theme.scss +++ /dev/null @@ -1,10 +0,0 @@ -@mixin adf-layout-container-theme($theme) { - $adf-layout-container-height: 100% !default; - - adf-layout-container { - .mat-drawer-content > div, - .mat-drawer-content > div > div { - height: $adf-layout-container-height; - } - } -}