Allowing write of style, updated version

kite9-org · Jul 27, 2022 · a326edf · a326edf
1 parent 00997ff
commit a326edf
Show file tree

Hide file tree

Showing 68 changed files with 110 additions and 108 deletions.
diff --git a/...ite9-pipeline-common/src/main/kotlin/com/kite9/pipeline/command/xml/replace/ReplaceTag.kt b/...ite9-pipeline-common/src/main/kotlin/com/kite9/pipeline/command/xml/replace/ReplaceTag.kt
@@ -31,6 +31,8 @@ open class ReplaceTag : AbstractReplaceCommand<Element?, Element>() {
         for (a in keptAttributes) {
             if (e.hasAttribute(a)) {
                 n.setAttribute(a, e.getAttribute(a))
+            } else {
+                n.removeAttribute(a);
             }
         }
     }

diff --git a/...java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java b/...java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java
@@ -51,7 +51,7 @@ public String getTitle() {
 
 			@Override
 			public String getIcon() {
-				return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.10";
+				return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.11";
 			}
 
 			@Override
@@ -89,7 +89,7 @@ public String getTitle() {
 
 			@Override
 			public String getIcon() {
-				return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.10";
+				return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.11";
 			}
 
 			@Override
@@ -281,9 +281,9 @@ private String getIconUrl(Link l, GHContent c) {
 				if (fs.getFormatFor(c.getName()) instanceof DiagramFileFormat) {
 					return l.getHref();	
 				} else if (hasIcon(c.getName())) {
-					return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.10";
+					return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.11";
 				} else {
-					return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.10";
+					return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.11";
 				}
 			}
 

diff --git a/...-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java b/...-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java
@@ -121,9 +121,9 @@ private String getExtension(String name) {
 					@Override
 					public String getIcon() {
 						if (hasIcon(d.getFilename())) {
-							return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.10";
+							return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.11";
 						} else {
-							return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.10";
+							return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.11";
 						}
 					}
 

diff --git a/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java b/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java
@@ -171,7 +171,7 @@ protected Document generateRestXML(RepresentationModel<?> t) throws XMLStreamExc
 	}
 
 	private void handleTemplateNaming(Document out) {
-		out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.10");
+		out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.11");
 	}
 
 	/**

diff --git a/server/kite9-server-java/src/main/resources/page-template.html b/server/kite9-server-java/src/main/resources/page-template.html
@@ -8,7 +8,7 @@
   <meta property="og:title" content="Kite9 Diagrams" />
   <meta property="og:description"
     content="Kite9 draws diagrams, automatically.  UML, Risk-First, Templated, SVG, Flow-Charts, System Diagrams." />
-  <meta property="og:image" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.10" />
+  <meta property="og:image" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.11" />
   <meta property="og:image:type" content="image/png" />
   <meta property="og:image:width" content="718" />
   <meta property="og:image:height" content="372" />
@@ -18,7 +18,7 @@
   <meta property="twitter:title" content="Kite9" />
   <meta property="twitter:description"
     content="Kite9 draws diagrams, automatically.  UML, Risk-First, Templated, SVG, Flow-Charts, System Diagrams." />
-  <meta property="twitter:image:src" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.10" />
+  <meta property="twitter:image:src" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.11" />
   <meta property="twitter:image:width" content="718" />
   <meta property="twitter:image:height" content="372" />
   <meta charset="UTF-8" />

diff --git a/...er/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js b/...er/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js
@@ -6,7 +6,7 @@ export function createAdlToSVGResolver(transition, command, metadata) {
 
 	const XSL_TEMPLATE_NAMESPACE = "http://www.kite9.org/schema/xslt";
 	const ADL_NAMESPACE = "http://www.kite9.org/schema/adl";
-	const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.10";
+	const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.11";
     const META_NAMESPACE = "http://www.kite9.org/schema/metadata";
 
 

diff --git a/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl b/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl
@@ -1,4 +1,4 @@
-<diagram xslt:template="/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.10"
+<diagram xslt:template="/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.11"
          xmlns="http://www.kite9.org/schema/adl"
          xmlns:xslt="http://www.kite9.org/schema/xslt" id="dia">
 

diff --git a/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl b/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl
@@ -4,7 +4,7 @@
 
    <svg:defs>
      <svg:style type="text/css">
-       @import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.10');
+       @import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.11');
      </svg:style>
    </svg:defs>
 

diff --git a/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java b/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java
@@ -17,7 +17,7 @@
 @ContextConfiguration
 public class PrivateGithubIT extends AbstractRestIT {
 
-	public static final String JS = "/github/kite9-org/examples/some.js?v=v0.10";
+	public static final String JS = "/github/kite9-org/examples/some.js?v=v0.11";
 	public static final String DIR = "/github/kite9-org/examples";
 
 

diff --git a/server/kite9-server-java/src/test/java/com/kite9/server/command/xml/CommandsTest.java b/server/kite9-server-java/src/test/java/com/kite9/server/command/xml/CommandsTest.java
@@ -17,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.RequestEntity;
@@ -101,8 +101,8 @@ public void testReplaceTag() throws Exception {
 		ReplaceTag replace = new ReplaceTag();
 		replace.fragmentId = "link";
 		replace.from= Base64.getEncoder().encodeToString(("<link id=\"link\" rank=\"4\"></link>").getBytes());
-		replace.to= Base64.getEncoder().encodeToString(("<glyph id=\"The Diagram\"></glyph>").getBytes());
-		replace.keptAttributes = Arrays.asList("rank", "id");
+		replace.to= Base64.getEncoder().encodeToString(("<glyph id=\"The Diagram\" style=\"raw: fish\"></glyph>").getBytes());
+		replace.keptAttributes = Arrays.asList("rank", "id", "style");
 
 		testDoAndUndo(replace, "replaceTag");
 	}

diff --git a/.../kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg b/.../kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg
diff --git a/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html b/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html
@@ -168,7 +168,7 @@
                  };
               </script>
     <script xlink:actuate="onLoad" xlink:type="simple" xlink:show="other" type="module" xmlns:xlink="http://www.w3.org/1999/xlink">
-     import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.10'
+     import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.11'
   </script>
   </defs>
 </svg>

diff --git a/...kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg b/...kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg
diff --git a/...r/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg b/...r/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg
diff --git a/...te9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg b/...te9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg
diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html b/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html
@@ -170,7 +170,7 @@
                  };
               </script>
     <script xlink:actuate="onLoad" xlink:type="simple" xlink:show="other" type="module" xmlns:xlink="http://www.w3.org/1999/xlink">
-     import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.10'
+     import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.11'
   </script>
   </defs>
 </svg>

diff --git a/...ite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg b/...ite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg
diff --git a/.../resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg b/.../resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg
diff --git a/...esources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg b/...esources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg
diff --git a/...esources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg b/...esources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg
diff --git a/...resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg b/...resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg
diff --git a/.../rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg b/.../rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg
diff --git a/...resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg b/...resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg
diff --git a/...ring/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg b/...ring/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg
diff --git a/...ing/public/testExampleSVG/public/templates/containers/common-containers.adl.svg b/...ing/public/testExampleSVG/public/templates/containers/common-containers.adl.svg
diff --git a/...urces/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg b/...urces/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg
diff --git a/...urces/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg b/...urces/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg
diff --git a/...rces/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg b/...rces/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg
diff --git a/...ring/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg b/...ring/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg
diff --git a/...ndering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg b/...ndering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg
diff --git a/...urces/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg b/...urces/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg
diff --git a/...s/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg b/...s/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg
diff --git a/...rces/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg b/...rces/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg
diff --git a/...ces/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg b/...ces/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg
diff --git a/...ring/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg b/...ring/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg
diff --git a/...ces/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg b/...ces/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg
diff --git a/...ng/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg b/...ng/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg
diff --git a/...ources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg b/...ources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg
diff --git a/...ces/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg b/...ces/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg