Merge branch 'main' into improvement-404

Author: Mathys-Lemort

.github/workflows/publish.yml

@@ -16,23 +16,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Get frontend build
         uses: actions/download-artifact@v8
         with:
           name: frontend-build
           path: frontend/build
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: benel
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: . #No checkout
           push: true

backend/hyperglosae/src/updates/editFlag.js

@@ -0,0 +1,11 @@
+function(doc, req) {
+  if (!doc) return [null, { json: { error: 'not_found' } }];
+  const body = JSON.parse(req.body);
+  if (body.beingEditedBy) {
+    doc.beingEditedBy = body.beingEditedBy;
+  } else {
+    delete doc.beingEditedBy;
+  }
+  return [doc, { json: { status: 'ok' } }];
+}
+

backend/hyperglosae/src/views/content/map.js

@@ -1,9 +1,9 @@
 function (doc) {
   const { getRelatedDocuments, emitPassages, emitIncludedDocuments } = require('views/lib/links');
 
-  let { _id, text = '', isPartOf = _id, links = [] } = doc;
+  let { _id, text = '', isPartOf = _id, links = [], beingEditedBy } = doc;
   let related = getRelatedDocuments({isPartOf, links});
 
-  emitPassages({text, isPartOf, related});
+  emitPassages({text, isPartOf, related, beingEditedBy});
   emitIncludedDocuments({isPartOf, links});
 }

backend/hyperglosae/src/views/lib/links.js

@@ -31,11 +31,17 @@ const parseText = (text) => {
   }));
 }
 
-exports.emitPassages = ({text, isPartOf, related}) => {
+exports.emitPassages = ({text, isPartOf, related, beingEditedBy}) => {
   parseText(text).forEach(({rubric, passage, parsed_rubric}) =>
     related.forEach((x) => {
-      emit([x, ...parsed_rubric], { text: passage, isPartOf, rubric, _id: null });
- 	  })
+      emit([x, ...parsed_rubric], {
+        text: passage,
+        isPartOf,
+        rubric,
+        _id: null,
+        ...(beingEditedBy && {beingEditedBy})
+      });
+    })
   );
 }