SUPINT-2380: create and configure the Admin Console Nuxeo package

.github/workflows/build.yaml

@@ -57,9 +57,9 @@ jobs:
         run: npm install -g @angular/cli
 
       - name: Install Dependencies
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: npm install
 
       - name: Build Angular Project
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: npm run build

.github/workflows/lint.yaml

@@ -45,9 +45,9 @@ jobs:
         run: npm install -g @angular/cli
 
       - name: Install Dependencies
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: npm install
 
       - name: Lint
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: npm run lint

.github/workflows/utest.yaml

@@ -45,7 +45,7 @@ jobs:
 
 
       - name: Install Dependencies
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: npm install
 
       - name: Install Chrome and Chromedriver
@@ -58,6 +58,6 @@ jobs:
         run: google-chrome --version
 
       - name: Unit tests
-        working-directory: ./nuxeo-admin-console-ui//nuxeo-admin-console-web
+        working-directory: nuxeo-admin-console-web/ang-src
         run: |
           xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" npm test

.gitignore

@@ -1,4 +1,5 @@
 dist
+node
 node_modules
 target
 .env

nuxeo-admin-console-package/src/main/assemble/assembly.xml

@@ -20,9 +20,8 @@
       <fileset dir="src/main/resources" />
       <filterset>
         <filter token="VERSION" value="${maven.project.version}" />
-        <filter token="DISTRIB_VERSION" value="${nuxeo.platform.version}" />
-        <filter token="NUXEO_TARGET_VERSION" value="${nuxeo.target.version}" />
-        <filter token="STUDIO_PROJECT_VERSION" value="${studio.project.version}" />
+        <filter token="NUXEO_PLATFORM_VERSION" value="${nuxeo.platform.version}" />
+        <filter token="DISTRIBUTION_NAME" value="${nuxeo.distribution.name}" />
       </filterset>
     </copy>
 
@@ -36,7 +35,6 @@
       <artifact:set>
         <includes>
           <artifact groupId="org.nuxeo*" />
-          <artifact groupId="nuxeo-studio" />
           <!-- Include your artifacts using their groupId for instance -->
           <artifact groupId="org.nuxeo.admin.console*" />
         </includes>
@@ -62,7 +60,6 @@
           <artifact scope="test" />
           <artifact scope="provided" />
           <artifact type="pom" />
-          <artifact groupId="nuxeo-studio" />
           <!-- Filter out your artifacts using their groupId for instance -->
           <artifact groupId="org.nuxeo.admin.console*" />
         </excludes>
@@ -137,7 +134,7 @@
     <!-- cleanups -->
     <delete dir="${outdir}/marketplace" failonerror="false" />
     <delete dir="${outdir}/nxr" failonerror="false" />
-    <delete file="${outdir}/nuxeo-nxr-server-${maven.project.version}.zip" failonerror="false" />
+    <delete file="${outdir}/nuxeo-nxr-server-${nuxeo.platform.version}.zip" failonerror="false" />
     <delete file="${outdir}/nxr-${maven.project.version}.zip" failonerror="false" />
   </target>
 

nuxeo-admin-console-package/src/main/resources/package.xml

@@ -2,16 +2,16 @@
 <package type="addon" name="nuxeo-admin-console-ui-package" version="1.0.0">
   <title>Nuxeo Admin Console UI package</title>
   <description>
-    <p>Nuxeo Admin console UI is a standard base web application for Nuxeo admin useres.</p>
+    <p>Nuxeo Admin console UI is a standard base web application for Nuxeo admin users.</p>
   </description>
   <home-page>http://localhost:8080/nuxeo/admin-console</home-page>
   <vendor>nuxeo</vendor>
   <require-terms-and-conditions-acceptance>false</require-terms-and-conditions-acceptance>
   <license>Apache License, Version 2.0</license>
   <license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
   <target-platform>
-     <name>lts</name>
-     <version>[2021.1,2023)</version>
+    <name>@DISTRIBUTION_NAME@</name>
+    <version>[@NUXEO_PLATFORM_VERSION@,2023.0)</version>
   </target-platform>
   <!-- Visibility: PRIVATE | MARKETPLACE | DEV | PUBLIC -->
   <visibility>PUBLIC</visibility>

nuxeo-admin-console-web/package.json → nuxeo-admin-console-web/ang-src/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --base-href=/nuxeo/admin-console/",
     "watch": "ng build --watch --configuration development",
     "test": "ng test --code-coverage --watch=false",
     "lint": "ng lint",

nuxeo-admin-console-web/src/main/app/assets/fonts/Open_Sans/OFL.txt → nuxeo-admin-console-web/ang-src/src/main/app/assets/fonts/Open_Sans/OFL.txt

@@ -1,93 +1,93 @@
-Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

nuxeo-admin-console-web/ang-src/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,9 @@
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Manifest-Version: 1.0
+Bundle-Vendor: org.nuxeo.admin.console
+Bundle-Version: 1.0.0
+Bundle-Name: nuxeo-admin-console-web
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.nuxeo.admin.console.nuxeo-admin-console-web;singleton=true
+Nuxeo-Component: OSGI-INF/admin-console-auth-contrib.xml

nuxeo-admin-console-web/ang-src/src/main/resources/OSGI-INF/deployment-fragment.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<fragment version="1">
+
+  <install>
+    <!-- Unzip the contents of our web application into the server -->
+    <unzip from="${bundle.fileName}" to="/">
+      <include>nuxeo.war/**</include>
+    </unzip>
+  </install>
+
+  <extension target="web#STD-AUTH-FILTER">
+    <filter-mapping>
+      <filter-name>NuxeoAuthenticationFilter</filter-name>
+      <url-pattern>/app/*</url-pattern>
+      <dispatcher>REQUEST</dispatcher>
+      <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+  </extension>
+</fragment>