JavaScript/NPM related stuff

libreccm.npmrc

@@ -0,0 +1,5 @@
+@libreccm:registry=https://packages.libreccm.org/repository/libreccm-npm/
+@librecms:registry=https://packages.libreccm.org/repository/libreccm-npm/
+@libreccm:access=public
+@librecms:access=public
+//packages.libreccm.org/repository/libreccm-npm/:_authToken=NpmToken.a5eb72e5-056e-3a5d-ab91-ac163d36ac5b

sci-types-project/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sci-types-project",
-    "version: "7.0.0",
+    "version": "7.0.0",
     "description": "JavaScript parts of the UI of sci-types-project",
     "main": "index.js",
     "scripts": {
@@ -20,10 +20,10 @@
         "webpack-cli": "^4.8.0"
     },
     "dependencies": {
-        "@librecms/ccm-cms": "7.0.0"
+        "@librecms/ccm-cms": "7.0.0",
+        "install": "^0.13.0"
     },
     "targets": {
         "main": false
     }
-
 }

sci-types-project/pom.xml

@@ -125,6 +125,25 @@
 
     <build>
         <finalName>sci-types-project</finalName>
+        
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>./target/generated-resources</directory>
+            </resource>
+        </resources>
+        
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>${project.build.directory}/generated-resources</directory>
+            </testResource>
+        </testResources>
 
         <plugins>
             <plugin>
@@ -138,6 +157,43 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <configuration>
+                    <installDirectory>../node</installDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>Install node.js and NPM</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <nodeVersion>v14.17.0</nodeVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments> --userconfig ../libreccm.npmrc install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -195,12 +251,6 @@
             </plugin>
         </plugins>
 
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
 
     <reporting>
@@ -253,7 +303,7 @@
                     <linkXref>true</linkXref>
                     <sourceEncoding>utf-8</sourceEncoding>
                     <targetJdk>1.8</targetJdk>
-<!--                    <rulesets>
+                    <!--                    <rulesets>
                         <ruleset>/rulesets/java/basic.xml</ruleset>
                         <ruleset>/rulesets/java/braces.xml</ruleset>
                         <ruleset>/rulesets/java/clone.xml</ruleset>

sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectDescriptionStep.java

@@ -183,7 +183,7 @@ public class SciProjectDescriptionStep extends AbstractMvcAuthoringStep {
             descriptionModel.setSelectedLocale(new Locale(localeParam)
                 .toString());
 
-            return "org/scientificcms/contenttypes/sciproject/ui/sciproject-description/view.xhtml";
+            return "org/scientificcms/contenttypes/sciproject/ui/description/view.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -260,7 +260,7 @@ public class SciProjectDescriptionStep extends AbstractMvcAuthoringStep {
                 new Locale(localeParam).toString()
             );
 
-            return "org/scientificcms/contenttypes/sciproject/ui/sciproject-description/edit.xhtml";
+            return "org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),

sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml

@@ -36,7 +36,7 @@
         </ui:define>
 
         <ui:define name="scripts">
-            <script src="#{request.contextPath}/assets/@content-sections/sciproject-description.js"></script>
+            <script src="#{request.contextPath}/assets/@sciproject/sciproject-description.js"></script>
         </ui:define>
 
     </ui:composition>

sci-types-project/src/main/typescript/sciproject-description.ts

@@ -1,4 +1,4 @@
-import { CmsEditorBuilder, CmsEditor} from @librecms/ccm-cms;
+import { CmsEditorBuilder, CmsEditor} from "@librecms/ccm-cms";
 
 document.addEventListener("DOMContentLoaded", (event) => {
     const editorElem = document.querySelector("#sciproject-description-editor");

sci-types-project/src/main/typescript/sciproject-fundingvolume.ts

@@ -1,3 +1,5 @@
+import { } from "@librecms/ccm-cms";
+
 import { CmsEditorBuilder, CmsEditor} from "@librecms/ccm-cms";
 
 document.addEventListener("DOMContentLoaded", (event) => {

sci-types-project/webpack.config.js

@@ -5,10 +5,11 @@ module.exports = {
         chunkIds: false
     },
     entry: {
-        "sciproject-description": "./src/main/typescript/sciproject/sciproject-description.ts",
+        "sciproject-description": "./src/main/typescript/sciproject-description.ts",
-        "sciproject-contacts": "./src/main/typescript/sciproject/sciproject-contacts.ts",
+        //"sciproject-contacts": "./src/main/typescript/sciproject-contacts.ts",
-        "sciproject-members": "./src/main/typescript/sciproject/sciproject-members.ts",
+        "sciproject-fundingtext": "./src/main/typescript/sciproject-fundingtext.ts",
-        "sciproject-sponsoring": "./src/main/typescript/sciproject/sciproject-sponsoring.ts"
+        "sciproject-fundingvolume": "./src/main/typescript/sciproject-fundingvolume.ts",
+        //"sciproject-sponsoring": "./src/main/typescript/sciproject-sponsoring.ts"
     },
     output: {
         filename: "[name].js",