From d2a4da13eaf4f9657b1e6bfb72ca3269b076f1b2 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 17 Nov 2023 15:30:17 +0000 Subject: [PATCH 1/2] update to latest ADF (#3524) * update to latest ADF * bpm aca-shared/content dependencies --- app/src/app.config.json | 6 ++-- package-lock.json | 52 +++++++++++++++---------------- package.json | 13 ++++---- projects/aca-content/package.json | 8 ++--- projects/aca-shared/package.json | 8 ++--- 5 files changed, 44 insertions(+), 43 deletions(-) diff --git a/app/src/app.config.json b/app/src/app.config.json index bc1e33acea..6fbceff50a 100644 --- a/app/src/app.config.json +++ b/app/src/app.config.json @@ -1,5 +1,5 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "$schema": "../../node_modules/@alfresco/adf-core/app.config.schema.json", "ecmHost": "{protocol}//{hostname}{:port}", "aosHost": "{protocol}//{hostname}{:port}/alfresco/aos", "baseShareUrl": "{protocol}//{hostname}{:port}/#/preview/s", @@ -24,7 +24,9 @@ "publicUrls": ["**/preview/s/*", "**/settings", "**/blank"], "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", "redirectUri": "/", - "redirectUriLogout": "/" + "redirectUriLogout": "/", + "skipIssuerCheck": true, + "strictDiscoveryDocumentValidation": false }, "locale": "en", "application": { diff --git a/package-lock.json b/package-lock.json index 5cc4414b68..2667d2678e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,10 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": ">=6.6.0-6880328396", - "@alfresco/adf-core": ">=6.6.0-6880328396", - "@alfresco/adf-extensions": ">=6.6.0-6880328396", - "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6880328396", + "@alfresco/adf-content-services": ">=6.6.0-6904949573", + "@alfresco/adf-core": ">=6.6.0-6904949573", + "@alfresco/adf-extensions": ">=6.6.0-6904949573", + "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6904949573", "@alfresco/js-api": "7.2.0", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", @@ -42,8 +42,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": ">=6.6.0-6880328396", - "@alfresco/adf-testing": ">=6.6.0-6880328396", + "@alfresco/adf-cli": ">=6.6.0-6904949573", + "@alfresco/adf-testing": ">=6.6.0-6904949573", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -116,9 +116,9 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.6.0-6880328396.tgz", - "integrity": "sha512-l+PlRNKyyiKc73JyvCkYsa0nN8bUbnkn/PNZetGZeL3+Zsh8jNNyzxIi2Rl8QaisOl5hTD8sLBUipxNl6pY51A==", + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.6.0-6904949573.tgz", + "integrity": "sha512-we5DkUUoL0MUYHn/Z4YIztVZExkgDesp0kLUAaPaBWxYbc4Dde1yfXGmDlIZbM3T1U0Resdo9IJ+BhsX9T602Q==", "dev": true, "dependencies": { "@alfresco/js-api": ">=7.2.0", @@ -136,14 +136,14 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.6.0-6880328396.tgz", - "integrity": "sha512-GE8Kt5PqSUjBohJ/TwQtG0o/1EW5xTI2LApLTLX3GxUiDGjoJPfoyNgGgmBrKU6S1L7dZLyOtjrSQ+Ob0bFERA==", + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.6.0-6904949573.tgz", + "integrity": "sha512-saV1lbUru+0/I7m7gIEtCrL1h/Zl/PDFtLOTw9av0XHTmb5VthnYahldW2isv1guhw05o156nsJd1TDhkIO0eQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.6.0-6880328396", + "@alfresco/adf-core": ">=6.6.0-6904949573", "@alfresco/js-api": ">=7.2.0", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", @@ -159,9 +159,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.6.0-6880328396.tgz", - "integrity": "sha512-/UF8NAvrFHN8Uq6Mv6LbWp6pRYtLL1VUDXMtdX2Z5uVawRuVPbAUumMbl3E8sAI3PDjmP8rlHn2VJHhDvylnvA==", + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.6.0-6904949573.tgz", + "integrity": "sha512-69oPZZOyfQzuNHCS6PyEosC9GmZR9OTfWJBP6xu5uixMVMG+ami0jbYVAoLwnuu8EeoZM8Tsd629FT8Lr5tK9A==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -169,7 +169,7 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.6.0-6880328396", + "@alfresco/adf-extensions": ">=6.6.0-6904949573", "@alfresco/js-api": ">=7.2.0", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", @@ -185,9 +185,9 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.6.0-6880328396.tgz", - "integrity": "sha512-3xpGQDyKzkxx2RKbmpPw6F+dOX9ZaX2mJeFes2GoPBJzxOvuu2w0vnwdqAyQjHxqgQtG9pNlmlkMiMCl+GZTFg==", + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.6.0-6904949573.tgz", + "integrity": "sha512-Va04hh9OdYeTkJmKsiP+0De9zvuu33XMLvXNUCndLWYX9936twDiVsRZX7pK59f6lxR5yf8pfU+SwUMMsJ3gGg==", "dependencies": { "tslib": "^2.3.0" }, @@ -198,9 +198,9 @@ } }, "node_modules/@alfresco/adf-testing": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.6.0-6880328396.tgz", - "integrity": "sha512-PObnqRZ+mIRFhKzwUnpCTUHrXVYttBKoMgF+3Yjz25L058zj1KL85mZIwtVUQcOkzmDEMW7bpZuCq6eWXMddTg==", + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.6.0-6904949573.tgz", + "integrity": "sha512-encRjYI1+4iEdTV/2Kj3c/U2qyKMGG4vB/b+4dE/wSo4yvXtjkB/UlEPFdmLMNo4lArsqlTM8dMvr/oWnL6wVw==", "dev": true, "dependencies": { "@alfresco/js-api": ">=7.2.0", @@ -216,9 +216,9 @@ } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.6.0-6880328396", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.6.0-6880328396.tgz", - "integrity": "sha512-R8zI6NpTNMudqwLIQykjiB1RVWWZxrpH+xnJYzyHjb7EBwae5H9jsginSep3kxoiDk+0xALFy3EgbV3udC+7zw==" + "version": "6.6.0-6904949573", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.6.0-6904949573.tgz", + "integrity": "sha512-Ux0j11RwB0sQJhP9k0YwhVr//CT9IjC6N9IcOw8Y8hi+vEUeh3n0pGkI6eq9UWDiMutTZLKKu5hbChh80X9IJA==" }, "node_modules/@alfresco/js-api": { "version": "7.2.0", diff --git a/package.json b/package.json index 449cdfc56e..630acb4840 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": ">=6.6.0-6880328396", - "@alfresco/adf-core": ">=6.6.0-6880328396", - "@alfresco/adf-extensions": ">=6.6.0-6880328396", - "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6880328396", + "@alfresco/adf-content-services": ">=6.6.0-6904949573", + "@alfresco/adf-core": ">=6.6.0-6904949573", + "@alfresco/adf-extensions": ">=6.6.0-6904949573", + "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6904949573", "@alfresco/js-api": "7.2.0", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", @@ -65,8 +65,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": ">=6.6.0-6880328396", - "@alfresco/adf-testing": ">=6.6.0-6880328396", + "@alfresco/adf-cli": ">=6.6.0-6904949573", + "@alfresco/adf-testing": ">=6.6.0-6904949573", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -132,4 +132,3 @@ "webdriver-manager": "12.1.8" } } - diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index bfd804f4ab..af78d1bd9f 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -5,10 +5,10 @@ "peerDependencies": { "@angular/common": ">=14.1.0", "@angular/core": ">=14.1.0", - "@alfresco/adf-core": ">=6.4.0", - "@alfresco/adf-content-services": ">=6.4.0", - "@alfresco/adf-extensions": ">=6.4.0", - "@alfresco/js-api": ">=7.1.0", + "@alfresco/adf-core": ">=6.6.0", + "@alfresco/adf-content-services": ">=6.6.0", + "@alfresco/adf-extensions": ">=6.6.0", + "@alfresco/js-api": ">=7.2.0", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.3", "@angular/forms": ">=14.1.3", diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json index cd2ea31fdb..250c6a7f1a 100644 --- a/projects/aca-shared/package.json +++ b/projects/aca-shared/package.json @@ -5,10 +5,10 @@ "license": "LGPL-3.0", "scripts": {}, "peerDependencies": { - "@alfresco/adf-content-services": ">=6.4.0", - "@alfresco/adf-core": ">=6.4.0", - "@alfresco/adf-extensions": ">=6.4.0", - "@alfresco/js-api": ">=7.1.0", + "@alfresco/adf-content-services": ">=6.6.0", + "@alfresco/adf-core": ">=6.6.0", + "@alfresco/adf-extensions": ">=6.6.0", + "@alfresco/js-api": ">=7.2.0", "@angular/animations": ">=14.1.3", "@angular/common": ">=14.1.3", "@angular/compiler": ">=14.1.3", From 7f256b228414bc27916af3d200ba4a8d168cf09c Mon Sep 17 00:00:00 2001 From: pkunduGL <142476714+pkunduGL@users.noreply.github.com> Date: Fri, 17 Nov 2023 23:37:24 +0530 Subject: [PATCH 2/2] [ACS-6031] Css classes added for maintaining minimum width in column header (#3523) --- projects/aca-content/assets/app.extensions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json index 69c671f146..2046ea4c98 100644 --- a/projects/aca-content/assets/app.extensions.json +++ b/projects/aca-content/assets/app.extensions.json @@ -2135,7 +2135,7 @@ "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "type": "date", "format": "timeAgo", - "class": "adf-ellipsis-cell", + "class": "adf-ellipsis-cell adf-no-grow-cell", "sortable": true, "desktopOnly": true, "order": 40 @@ -2320,7 +2320,7 @@ "sortingKey": "modifiedAt", "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "type": "date", - "class": "adf-ellipsis-cell", + "class": "adf-ellipsis-cell adf-no-grow-cell", "format": "timeAgo", "sortable": true, "desktopOnly": true, @@ -2408,7 +2408,7 @@ "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "type": "date", "format": "timeAgo", - "class": "adf-ellipsis-cell", + "class": "adf-ellipsis-cell adf-no-grow-cell", "sortable": true, "desktopOnly": true, "order": 50 @@ -2472,7 +2472,7 @@ "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "type": "date", "format": "timeAgo", - "class": "adf-ellipsis-cell", + "class": "adf-ellipsis-cell adf-no-grow-cell", "sortable": true, "desktopOnly": true, "order": 50