feat: Add note toc plugin styles in generated sources - EXO-75747 - M…

…eeds-io/MIPs#161 Add note toc plugin styles in generated sources
Meeds-io · Dec 13, 2024 · 9879f8b · 9879f8b
1 parent 6f852ff
commit 9879f8b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 12 deletions.
diff --git a/notes-webapp/pom.xml b/notes-webapp/pom.xml
@@ -40,16 +40,6 @@
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <!--
-            Don't include libraries into Web Archives, except webjars
-          -->
-          <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
@@ -85,6 +75,43 @@
               <overwrite>true</overwrite>
             </configuration>
           </execution>
+          <execution>
+            <id>c-copy-resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/src/main/webapp/skin/css/toc</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/webapp/javascript/eXo/wiki/ckeditor/plugins</directory>
+                  <includes>
+                    <include>toc/*.css</include>
+                  </includes>
+                </resource>
+              </resources>
+              <overwrite>true</overwrite>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/src/main/webapp/skin/css/toc</source>
+              </sources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -140,6 +167,16 @@
             </execution>
           </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <!--
+            Don't include libraries into Web Archives, except webjars
+          -->
+          <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css
@@ -39,8 +39,7 @@
 }
 
 .navigation-img-wrapper .cke_widget_selectImage {
-	margin-bottom: 0!important;
-	margin-right: 4px !important;
+	margin: 0 0 0 10px !important;
 }
 
 #remove-treeview {

diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
@@ -414,6 +414,7 @@ export default {
       if (this.hasEmptyContent || this.isHomeNoteDefaultContent) {
         this.retrieveNoteTreeById();
       }
+      console.log(this.note.content);
     },
     actualVersion() {
       if (!this.isDraft && this.actualVersion) {
@@ -685,6 +686,8 @@ export default {
       noteArticle.published = publicationSettings?.publish;
       noteArticle.targets = publicationSettings?.selectedTargets;
       noteArticle.audience = publicationSettings?.selectedAudience;
+      noteArticle.isHomeDefaultContent = this.isHomeNoteDefaultContent;
+      noteArticle.hasChildren = this.hasChildren;
       this.isPublishing = true;
       if (note) {
         this.$notesService.updateNoteById(note).then(() => {

diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,12 @@
         <version>${project.version}</version>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>notes-webapp</artifactId>
+        <version>${project.version}</version>
+        <classifier>sources</classifier>
+      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>notes-packaging</artifactId>