From 13566d4f28200bd3718b25a98f657402683fbb78 Mon Sep 17 00:00:00 2001 From: Akash Rathod <41251473+akashrathod28@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:41:17 +0530 Subject: [PATCH] [ACS-6732] Manual upstream changes (#3632) * upstream changes * upstream changes * upstream changes * ACS-6710 failing e2e on gha --- e2e/playwright/list-views/exclude.tests.json | 5 +- package-lock.json | 60 ++++++++++---------- package.json | 12 ++-- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/e2e/playwright/list-views/exclude.tests.json b/e2e/playwright/list-views/exclude.tests.json index 7489df2787..cbf1aa46ea 100644 --- a/e2e/playwright/list-views/exclude.tests.json +++ b/e2e/playwright/list-views/exclude.tests.json @@ -19,5 +19,8 @@ "C280490": "https://alfresco.atlassian.net/browse/ACS-6688", "C280491": "https://alfresco.atlassian.net/browse/ACS-6688", "C213217": "https://alfresco.atlassian.net/browse/ACS-6710", - "C213245": "https://alfresco.atlassian.net/browse/ACS-6717" + "C213245": "https://alfresco.atlassian.net/browse/ACS-6717", + "C261153": "https://alfresco.atlassian.net/browse/AAE-7517", + "C589205": "https://alfresco.atlassian.net/browse/ACS-6710", + "C261150": "https://alfresco.atlassian.net/browse/ACS-6710" } diff --git a/package-lock.json b/package-lock.json index 852db36aa6..383b7cacf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.7.0-7675089335", - "@alfresco/adf-core": "6.7.0-7675089335", - "@alfresco/adf-extensions": "6.7.0-7675089335", - "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7675089335", - "@alfresco/js-api": "7.6.0-7675089335", + "@alfresco/adf-content-services": "6.7.0-7787171278", + "@alfresco/adf-core": "6.7.0-7787171278", + "@alfresco/adf-extensions": "6.7.0-7787171278", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7787171278", + "@alfresco/js-api": "7.6.0-7787171278", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -42,7 +42,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.7.0-7675089335", + "@alfresco/adf-cli": "6.7.0-7787171278", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -123,12 +123,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.7.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-7675089335.tgz", - "integrity": "sha512-WKCIjuFtbM/04Ziak1EbnmdBcYHDc4GwVKlJE13Pl+YSkvrbWeV+qr2QUpHVMSAC/8oEYmV91SHZqOhiUVxBPw==", + "version": "6.7.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-7787171278.tgz", + "integrity": "sha512-1qcH4uH8G+HkgLHIhtKuGvGPzGAVUmMtBhVhVL1A/2t7blxhpSfGHHCb/gdmdbpcm5k5e19VfdlIpKB+PGJAVQ==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.6.0-7675089335", + "@alfresco/js-api": ">=7.6.0-7787171278", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -143,15 +143,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.7.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-7675089335.tgz", - "integrity": "sha512-86M31AWYYItmkcJmbdekkZgVCi2T1+ZJZNw4r/rIu/c2KivpkX1osVOyF+EGabNxmvliyQARZ+N/OQx+Ch0ytw==", + "version": "6.7.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-7787171278.tgz", + "integrity": "sha512-qRMoCUDAakD2+Jj9tYOfhdUlZGclxLlZRG38gN2BSUrPx551N9olu/YykM5KQewaZr/YOl0bIfYh/QqK0UTBIg==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.7.0-7675089335", - "@alfresco/js-api": ">=7.6.0-7675089335", + "@alfresco/adf-core": ">=6.7.0-7787171278", + "@alfresco/js-api": ">=7.6.0-7787171278", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -166,9 +166,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.7.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-7675089335.tgz", - "integrity": "sha512-5Kt7JheLpkofXIdGXGyHMmcA8Y4tcVeY192ROxnK8HRailLJC3v+WM5VsHk1k+qWr/0ABV2hAa3/SqDW6c5t1w==", + "version": "6.7.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-7787171278.tgz", + "integrity": "sha512-NzNkzQf4ISFkiS0T/uGIcgghw91Rk+NR9wRX1J4AMq1EZ86N8Ovuypvfl24ifLz9tmBLSFDQoriQLN/PcjLvPQ==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -176,8 +176,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.7.0-7675089335", - "@alfresco/js-api": ">=7.6.0-7675089335", + "@alfresco/adf-extensions": ">=6.7.0-7787171278", + "@alfresco/js-api": ">=7.6.0-7787171278", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -192,27 +192,27 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.7.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-7675089335.tgz", - "integrity": "sha512-yndgu34PKz7k50KOVCtQUeDKK0+a3WVy55zxDB3JuNW4sAUJQZj5lLEApjwp4OWv/4fU21Kt2BkCtY/ifzxZ/g==", + "version": "6.7.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-7787171278.tgz", + "integrity": "sha512-GCP/YlFdsH+uyCzjAUBIlDv98cUEhAXQRN2ZoIPHwThLskRBGOh4IKvRlHrNdwePuyHb+SBp3kLdyjGvtJurhg==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.6.0-7675089335", + "@alfresco/js-api": ">=7.6.0-7787171278", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.7.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-7675089335.tgz", - "integrity": "sha512-Cd/WXpzoiIRp/jC6t8hnyx78cRiFoqaWanWQQRnV9/6mJYbhSjGumzjL7BGl0Jw55P9NpGLTomVAcZQVPDWSHA==" + "version": "6.7.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-7787171278.tgz", + "integrity": "sha512-6Ce5Y8oL6LLVtRRY4fzfAZINKYiXJ3VxJKCrU4YmE3jhqkQoL3wxXilgj9zuJqBVhzKEALBfK39NaBrPlY1KPg==" }, "node_modules/@alfresco/js-api": { - "version": "7.6.0-7675089335", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-7675089335.tgz", - "integrity": "sha512-riQYPqTTnDTb5FSxeK+G0YjtfYVPSw4mvw90waNjTrkL/3L9mrRFqomQcAUYfpB6+06DEGJmryre4+du+fWVTA==", + "version": "7.6.0-7787171278", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-7787171278.tgz", + "integrity": "sha512-rEBYxIDMgqDotIurpCaNNdZeFu8U/jgIXvaqrw2qI6pl8wtQVZotZcAQgiJnFoC4XP5tZiWFogTxJaCTWQPlEQ==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^8.0.9", diff --git a/package.json b/package.json index 5612a9377a..d42ad601dc 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.7.0-7675089335", - "@alfresco/adf-core": "6.7.0-7675089335", - "@alfresco/adf-extensions": "6.7.0-7675089335", - "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7675089335", - "@alfresco/js-api": "7.6.0-7675089335", + "@alfresco/adf-content-services": "6.7.0-7787171278", + "@alfresco/adf-core": "6.7.0-7787171278", + "@alfresco/adf-extensions": "6.7.0-7787171278", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7787171278", + "@alfresco/js-api": "7.6.0-7787171278", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -66,7 +66,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.7.0-7675089335", + "@alfresco/adf-cli": "6.7.0-7787171278", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2",