Merge branch 'develop' of github.com:Alfresco/alfresco-content-app in…

…to dev-pkundu-ACS-6031
Alfresco · Dec 1, 2023 · d89efcb · d89efcb
2 parents 0ea2da2 + 437cf91
commit d89efcb
Show file tree

Hide file tree

Showing 185 changed files with 2,237 additions and 7,705 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -109,7 +109,7 @@ jobs:
       fail-fast: false
       matrix:
         e2e-suites:
-          - name: "listViews,navigation"
+          - name: "listViews"
             id: 1
           - name: "search"
             id: 2
@@ -119,22 +119,14 @@ jobs:
             id: 4
           - name: "pagination"
             id: 5
-          - name: "actionsAvailableFilesFolders"
-            id: 6
-          - name: "actionsAvailableLibraries,actionsAvailableNewMenu"
-            id: 7
-          - name: "actionsAvailableSpecialPermissions"
-            id: 8
           - name: "copyMoveActions"
-            id: 9
+            id: 6
           - name: "deleteActions"
-            id: 10
+            id: 7
           - name: "editActions,favoriteActions"
-            id: 11
-          - name: "libraryActions"
-            id: 12
+            id: 8
           - name: "uploadDownloadActions"
-            id: 13
+            id: 9
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -182,6 +174,8 @@ jobs:
             id: 5
           - name: "special-permissions"
             id: 6
+          - name: "pagination"
+            id: 7
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/app/src/app.config.json b/app/src/app.config.json
@@ -12,14 +12,17 @@
   "plugins": {
     "aosPlugin": true,
     "contentService": true,
-    "folderRules": true
+    "folderRules": true,
+    "tags": true,
+    "categories": true
   },
   "oauth2": {
     "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "publicUrls": ["**/preview/s/*", "**/settings", "**/blank"],
     "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",

diff --git a/app/src/app/app.component.html b/app/src/app/app.component.html
@@ -1,2 +1,2 @@
-<h1 class="sr-only" title="{{pageHeading | async | translate}}">{{ pageHeading | async | translate }}</h1>
+<h1 class="aca-sr-only" title="{{pageHeading | async | translate}}">{{ pageHeading | async | translate }}</h1>
 <router-outlet></router-outlet>
diff --git a/app/src/app/app.component.scss b/app/src/app/app.component.scss
@@ -2,7 +2,7 @@ app-root {
   display: flex;
   flex: 1;
 
-  .sr-only {
+  .aca-sr-only {
     position: absolute;
     width: 1px;
     height: 1px;

diff --git a/docker/docker-entrypoint.d/30-sed-on-appconfig.sh b/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
@@ -50,6 +50,13 @@ if [ -n "${APP_CONFIG_OAUTH2_IMPLICIT_FLOW}" ]; then
     -i "$APP_CONFIG_FILE"
 fi
 
+if [ -n "${APP_CONFIG_OAUTH2_CODE_FLOW}" ]; then
+  echo "SET APP_CONFIG_OAUTH2_CODE_FLOW"
+
+  sed -e "s/\"codeFlow\": [^,]*/\"codeFlow\": ${APP_CONFIG_OAUTH2_CODE_FLOW}/g" \
+    -i "$APP_CONFIG_FILE"
+fi
+
 if [ -n "${APP_CONFIG_OAUTH2_SILENT_LOGIN}" ]; then
   echo "SET APP_CONFIG_OAUTH2_SILENT_LOGIN"
 

diff --git a/docs/getting-started/docker.md b/docs/getting-started/docker.md
@@ -74,6 +74,7 @@ docker run --rm -it \
 | APP_CONFIG_OAUTH2_HOST                       | `oauth2.host`                    |
 | APP_CONFIG_OAUTH2_CLIENTID                   | `oauth2.clientId`                |
 | APP_CONFIG_OAUTH2_IMPLICIT_FLOW              | `oauth2.implicitFlow`            |
+| APP_CONFIG_OAUTH2_CODE_FLOW                  | `oauth2.codeFlow`                |
 | APP_CONFIG_OAUTH2_SILENT_LOGIN               | `oauth2.silentLogin`             |
 | APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI | `oauth2.redirectSilentIframeUri` |
 | APP_CONFIG_OAUTH2_REDIRECT_LOGIN             | `oauth2.redirectUri`             |

diff --git a/docs/getting-started/sso.md b/docs/getting-started/sso.md
@@ -22,7 +22,8 @@ You can find the settings in the `app.config.json` file, and they look similar t
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "redirectSilentIframeUri": "./assets/silent-refresh.html",
     "redirectUri": "/",

diff --git a/docs/ja/getting-started/sso.md b/docs/ja/getting-started/sso.md
@@ -23,7 +23,8 @@ Basic 認証に加えて、Content Application を以下で使用できます:
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "redirectSilentIframeUri": "./assets/silent-refresh.html",
     "redirectUri": "/",

diff --git a/e2e/playwright/actions/src/tests/create-folder.spec.ts b/e2e/playwright/actions/src/tests/create-folder.spec.ts
@@ -33,7 +33,6 @@ import {
   errorStrings,
   test
 } from '@alfresco/playwright-shared';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 
 test.describe('Create folders', () => {
   const apiClientFactory = new ApiClientFactory();
@@ -56,7 +55,7 @@ test.describe('Create folders', () => {
       nodesApi = await NodesApi.initialize(username, username);
       await nodesApi.createFolder(commonFolderName);
     } catch (error) {
-      logger.error(`beforeAll failed : ${error}`);
+      console.error(`beforeAll failed : ${error}`);
     }
   });
 
@@ -77,15 +76,15 @@ test.describe('Create folders', () => {
       await personalFiles.navigate();
       await personalFiles.selectCreateFolder();
     } catch (error) {
-      logger.error(`beforeEach failed : ${error}`);
+      console.error(`beforeEach failed : ${error}`);
     }
   });
 
   test.afterAll(async () => {
     try {
       await nodesApi.deleteCurrentUserNodes();
     } catch (error) {
-      logger.error(`afterAll failed : ${error}`);
+      console.error(`afterAll failed : ${error}`);
     }
   });
 

diff --git a/e2e/playwright/actions/src/tests/create-library.spec.ts b/e2e/playwright/actions/src/tests/create-library.spec.ts
@@ -35,7 +35,6 @@ import {
   Breadcrumb,
   TrashcanApi
 } from '@alfresco/playwright-shared';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 
 test.describe('Create Libraries ', () => {
   const apiClientFactory = new ApiClientFactory();
@@ -70,7 +69,7 @@ test.describe('Create Libraries ', () => {
       await sitesApi.createSite(commonTrashLibraryName);
       await sitesApi.deleteSites([commonTrashLibraryName], false);
     } catch (error) {
-      logger.error(`beforeAll failed : ${error}`);
+      console.error(`beforeAll failed : ${error}`);
     }
   });
 
@@ -91,7 +90,7 @@ test.describe('Create Libraries ', () => {
       await myLibrariesPage.navigate();
       await myLibrariesPage.selectCreateLibrary();
     } catch (error) {
-      logger.error(`beforeEach failed : ${error}`);
+      console.error(`beforeEach failed : ${error}`);
     }
   });
 
@@ -101,7 +100,7 @@ test.describe('Create Libraries ', () => {
       const trashcanApi = await TrashcanApi.initialize(username, username);
       await trashcanApi.emptyTrashcan();
     } catch (error) {
-      logger.error(`afterAll failed : ${error}`);
+      console.error(`afterAll failed : ${error}`);
     }
   });