Tp10 fixes sans templates

build.xml

@@ -52,8 +52,7 @@
         <echo message="${npm.build.output}" />
     </target>
 
-    <!-- TBD(DP): make conditional on release -->
-    <target name="templates" description="process template files" depends="git.revision">
+    <target name="templates" description="process template files" if="is-release">
         <echo message="Apply values to .tmpl ..." />
         <copy todir="${basedir}" overwrite="true" verbose="true">
             <fileset file="*.xml.tmpl" />
@@ -76,7 +75,7 @@
         </copy>
     </target>
 
-    <target name="git.revision" description="Store git revision in ${commit-id}" if="git.present">
+    <target name="git.revision" description="Store git revision in ${commit-id}" if="is-release" depends="check-release">
         <exec executable="git" outputproperty="git.revision" failifexecutionfails="false"
             errorproperty="">
             <arg value="--git-dir=${git.repo.path}" />

modules/api.json

@@ -356,12 +356,22 @@
         },
         "/api/login": {
 			"post": {
-				"summary": "Login the user",
-				"description": "Login the given user",
+				"summary": "Login or logout the user",
+				"description": "Login the given user or logout current user",
 				"tags": ["user"],
 				"operationId": "auth:login",
+				"parameters": [
+					{
+						"name": "logout",
+						"in": "query",
+						"description": "Set to 'true' to logout current user",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
 				"requestBody": {
-                    "required": true,
+                    "required": false,
                     "content": {
                         "multipart/form-data": {
                             "schema": {
@@ -399,7 +409,7 @@
                 },
 				"responses": {
 					"200": {
-						"description": "OK",
+						"description": "OK - Login successful or logout completed",
 						"content": {
 							"application/json": {
 								"schema": {
@@ -426,7 +436,7 @@
 						}
 					},
 					"401": {
-						"description": "Wrong user or password"
+						"description": "Wrong user or password, or logout when not logged in"
 					}
 				}
 			}

package.json

@@ -29,6 +29,7 @@
     "cypress": "^15.5.0",
     "cypress-ajv-schema-validator": "^2.0.2",
     "esbuild": "^0.25.11",
+    "fflate": "^0.8.2",
     "glob": "^11.0.3",
     "sass": "^1.93.2"
   }

profiles/annotate/test/cypress/e2e/api/annotations.cy.js

@@ -0,0 +1,129 @@
+// StandardJS, should-style assertions
+// API tests for Annotation functionality
+// Generated by jinks - DO NOT EDIT manually
+
+const uploadAnnotations = () => {
+  return cy.fixture('annotations.xml', 'utf8').then(xml => {
+    return cy.uploadXml('/api/upload/annotate', 'annotations.xml', xml)
+      .then(({ status, body }) => {
+        cy.wrap(status).should('eq', 200)
+        cy.wrap(body).should('have.length', 1)
+        cy.wrap(body).its('0.name').should('include', 'annotations.xml')
+      })
+  })
+}
+
+const assertAnnotate = (payload, paraIndex, expectedXml) => {
+  return cy.request({
+    method: 'POST',
+    url: '/api/annotations/merge/annotate%2Fannotations.xml',
+    headers: { 'Content-Type': 'application/json' },
+    body: payload
+  }).then(({ status, body }) => {
+    cy.wrap(status).should('eq', 200)
+    cy.wrap(body.changes).should('have.length', 1)
+    const doc = new DOMParser().parseFromString(body.content, 'application/xml')
+    const para = selectPara(doc, paraIndex)
+    const xml = new XMLSerializer().serializeToString(para)
+    cy.wrap(xml).should('equal', expectedXml)
+  })
+}
+
+const selectPara = (doc, idx) => {
+  const xpath = `//*[local-name()='body']/*[local-name()='p'][${idx}]`
+  const res = doc.evaluate(xpath, doc, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null)
+  return res.singleNodeValue
+}
+
+describe('/api/annotations/merge', () => {
+  // Upload once; login before each test for a fresh session
+  before(() => {
+    return cy.login().then(() => uploadAnnotations())
+  })
+  beforeEach(() => {
+    cy.login()
+  })
+
+  it('deletes at start and wraps', () => {
+    assertAnnotate({
+      annotations: [
+        { type: 'delete', node: '1.4.2.2.2', context: '1.4.2.2' },
+        { context: '1.4.2.2', start: 1, end: 9, text: 'Gauger I', type: 'hi', properties: {} },
+        { context: '1.4.2.2', start: 11, end: 14, text: '113', type: 'hi', properties: {} },
+        { context: '1.4.2.2', start: 1, end: 13, text: 'Gauger I, 113', type: 'link', properties: { target: '#foo' } }
+      ]
+    }, 1, '<p xmlns="http://www.tei-c.org/ns/1.0">(<ref target="#foo"><hi>Gauger I</hi>, <hi>113</hi></ref>).</p>')
+  })
+
+  it('deletes at end and wraps', () => {
+    assertAnnotate({
+      annotations: [
+        { type: 'delete', node: '1.4.2.4.2', context: '1.4.2.4' },
+        { context: '1.4.2.4', start: 1, end: 4, text: '113', type: 'hi', properties: {} },
+        { context: '1.4.2.4', start: 6, end: 14, text: 'Gauger I', type: 'hi', properties: {} },
+        { context: '1.4.2.4', start: 1, end: 13, text: '113, Gauger I', type: 'link', properties: { target: '#foo' } }
+      ]
+    }, 2, '<p xmlns="http://www.tei-c.org/ns/1.0">(<ref target="#foo"><hi>113</hi>, <hi>Gauger I</hi></ref>).</p>')
+  })
+
+  it('annotate after nested note', () => {
+    assertAnnotate({
+      annotations: [
+        { context: '1.4.2.8', start: 20, end: 39, text: 'Opuscula theologica', type: 'hi', properties: {} }
+      ]
+    }, 4, '<p xmlns="http://www.tei-c.org/ns/1.0"><ref target="#">Starb am<note place="footnote">Fehlt.</note></ref>. Sammlung: <hi>Opuscula theologica</hi>.</p>')
+  })
+
+  it('wrap to end of paragraph', () => {
+    assertAnnotate({
+      annotations: [
+        { context: '1.4.2.16', start: 210, end: 308, text: 'S. Werenfels, Fasciculus Epigrammatum, in: ders., Opuscula III (Anm. 20), S. 337–428, dort S. 384:', type: 'link', properties: { target: '#foo' } }
+      ]
+    }, 8, '<p xmlns="http://www.tei-c.org/ns/1.0">Bei <persName type="author" ref="kbga-actors-8470">Budé</persName> (Anm. 21), S. 56f.59, finden sich zwei Briefe von Fontenelle an Turettini, in denen <persName ref="kbga-actors-8482">Fontenelle</persName> sich lobend über <persName ref="kbga-actors-1319">Werenfels</persName> äußert. Den erwähnten Dank formulierte <persName ref="kbga-actors-1319">Werenfels</persName> in Form eines Epigramms; vgl. <ref target="#foo"><persName type="author" ref="kbga-actors-1319">S. Werenfels</persName>, <hi rend="i">Fasciculus Epigrammatum</hi>, in: ders., <hi rend="i">Opuscula</hi> III (Anm. 20), S. 337–428, dort S. 384:</ref></p>')
+  })
+
+  it('annotate after nested choice', () => {
+    assertAnnotate({
+      annotations: [
+        { context: '1.4.2.10', start: 9, end: 28, text: 'Opuscula theologica', type: 'hi', properties: {} }
+      ]
+    }, 5, '<p xmlns="http://www.tei-c.org/ns/1.0"><hi>Zum <choice><abbr>Bsp.</abbr><expan>Beispiel</expan></choice></hi> <hi>Opuscula theologica</hi>.</p>')
+  })
+
+  it('insert choice/abbr/expan', () => {
+    assertAnnotate({
+      annotations: [
+        { context: '1.4.2.12', start: 6, end: 17, text: 'ipsum dolor', type: 'abbreviation', properties: { expan: 'sit amet' } }
+      ]
+    }, 6, '<p xmlns="http://www.tei-c.org/ns/1.0">Lorem <choice><abbr>ipsum dolor</abbr><expan>sit amet</expan></choice> sit amet.</p>')
+  })
+
+  it('insert app/lem/rdg', () => {
+    assertAnnotate({
+      annotations: [
+        { context: '1.4.2.12', start: 6, end: 17, text: 'ipsum dolor', type: 'app', properties: { 'wit[1]': '#me', 'rdg[1]': 'sit amet' } }
+      ]
+    }, 6, '<p xmlns="http://www.tei-c.org/ns/1.0">Lorem <app><lem>ipsum dolor</lem><rdg wit="#me">sit amet</rdg></app> sit amet.</p>')
+  })
+
+  it('delete choice/abbr/expan', () => {
+    assertAnnotate({
+      annotations: [
+        { type: 'delete', node: '1.4.2.14.2', context: '1.4.2.14' }
+      ]
+    }, 7, '<p xmlns="http://www.tei-c.org/ns/1.0">Lorem ipsum dolor sit amet.</p>')
+  })
+
+  it('delete element containing note', () => {
+    assertAnnotate({
+      annotations: [
+        { type: 'delete', node: '1.4.2.8.1', context: '1.4.2.8' }
+      ]
+    }, 4, '<p xmlns="http://www.tei-c.org/ns/1.0">Starb am<note place="footnote">Fehlt.</note>. Sammlung: Opuscula theologica.</p>')
+  })
+
+  after(() => {
+    cy.logout()
+  })
+})
+

profiles/annotate/test/cypress/fixtures/annotations.xml

@@ -0,0 +1,27 @@
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
+    <teiHeader>
+        <fileDesc>
+            <titleStmt>
+                <title>Annotations Test</title>
+            </titleStmt>
+            <publicationStmt>
+                <p/>
+            </publicationStmt>
+            <sourceDesc>
+                <p/>
+            </sourceDesc>
+        </fileDesc>
+    </teiHeader>
+    <text>
+        <body>
+            <p>(<persName type="author" ref="Gauger">Gauger</persName> I, 113).</p>
+            <p>(113, <persName type="author" ref="Gauger">Gauger</persName> I).</p>
+            <p>113, <persName type="author" ref="Gauger">Gauger</persName></p>
+            <p><ref target="#">Starb am<note place="footnote">Fehlt.</note></ref>. Sammlung: Opuscula theologica.</p>
+            <p><hi>Zum <choice><abbr>Bsp.</abbr><expan>Beispiel</expan></choice></hi> Opuscula theologica.</p>
+            <p>Lorem ipsum dolor sit amet.</p>
+            <p>Lorem <choice><abbr>ipsum dolor</abbr><expan>sit amet</expan></choice> sit amet.</p>
+            <p>Bei <persName type="author" ref="kbga-actors-8470">Budé</persName> (Anm. 21), S. 56f.59, finden sich zwei Briefe von Fontenelle an Turettini, in denen <persName ref="kbga-actors-8482">Fontenelle</persName> sich lobend über <persName ref="kbga-actors-1319">Werenfels</persName> äußert. Den erwähnten Dank formulierte <persName ref="kbga-actors-1319">Werenfels</persName> in Form eines Epigramms; vgl. <persName type="author" ref="kbga-actors-1319">S. Werenfels</persName>, <hi rend="i">Fasciculus Epigrammatum</hi>, in: ders., <hi rend="i">Opuscula</hi> III (Anm. 20), S. 337–428, dort S. 384:</p>
+        </body>
+    </text>
+</TEI>

profiles/base10/.gitignore.tpl

@@ -1,10 +1,14 @@
-build
+build/
 transform
-node_modules
+node_modules/
 resources/scripts/*.map
 resources/lib/
 resources/css/leaflet/
 resources/css/prismjs
 resources/images/openseadragon
 resources/images/leaflet
-resources/i18n/common
+resources/i18n/common
+test/cypress/screenshots/
+test/cypress/videos/
+test/cypress/downloads/
+.DS_Store