Merge branch 'dev' into f-style-dropdown-editmode

.gitlab-ci.yml

@@ -3,10 +3,10 @@
 #
 # Copyright (C) 2018 Research Group Biomedical Physics,
 # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
+# Copyright (C) 2020-2022 IndiScale GmbH (info@indiscale.com)
 # Copyright (C) 2019 Henrik tom Wörden
 # Copyright (C) 2020 Timm Fitschen (t.fitschen@indiscale.com)
-# Copyright (C) 2020 IndiScale GmbH (info@indiscale.com)
-# Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com>
+# Copyright (C) 2020-2022 Daniel Hornung <d.hornung@indiscale.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -66,18 +66,23 @@ test-server-side-scripting:
     - make test-sss
 
 # Trigger building of server image and integration tests
-trigger_build:
-  timeout: 15 minutes
-  tags: [ docker ]
+trigger_inttest:
   stage: deploy
-  script:
-    - /usr/bin/curl -X POST
-       -F token=$CI_JOB_TOKEN
-       -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
-       -F "variables[WEBUI]=$CI_COMMIT_REF_NAME"
-       -F "variables[TriggerdBy]=WEBUI"
-       -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
-       -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
+  inherit:
+    variables:
+      # List the variables that shall be inherited, which also means they will override any equally
+      # named varibles in child pipelines.
+      - DEPLOY_REF
+  variables:
+    # Renaming variables.
+    F_BRANCH: $CI_COMMIT_REF_NAME
+    WEBUI: $CI_COMMIT_REF_NAME
+    TriggeredBy: WEBUI
+    TriggeredByHash: $CI_COMMIT_SHORT_SHA
+  trigger:
+    project: caosdb/src/caosdb-deploy
+    branch: $DEPLOY_REF
+    strategy: depend
 
 # Build a docker image in which tests for this repository can run
 build-testenv:

CHANGELOG.md

@@ -8,9 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* [#172](https://gitlab.com/caosdb/caosdb-webui/-/issues/172) - Map can handle
-  geo locations in list of references.
-
 ### Changed
 
 ### Deprecated
@@ -23,6 +20,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Documentation
 
+## [0.7.0] - 2022-05-31
+(Florian Spreckelsen)
+
+### Added
+
+* [#172](https://gitlab.com/caosdb/caosdb-webui/-/issues/172) - Map can handle
+  geo locations in list of references.
+
+### Fixed
+
+* [#276](https://gitlab.indiscale.com/caosdb/src/caosdb-webui/-/issues/276)
+  documentation couldn't be built because of a too long module name.
+
 ## [0.6.0] - 2022-05-03
 (Daniel Hornung)
 
@@ -461,4 +471,3 @@ This is the last Bootstrap-3 compatible release.
   property value if the actual value was an empty string.
 
 ### Security (in case of vulnerabilities)
-

DEPENDENCIES.md

-* CaosDB Server 0.7.2
+* CaosDB Server 0.7.3
 * Make 4.2.0
 
 # Java Script Libraries (included in this repository)

RELEASE_GUIDELINES.md

@@ -18,16 +18,20 @@ guidelines of the CaosDB Project
 
 2. Check all general prerequisites.
 
-3. Update `src/doc/conf.py` version
+3. Update `src/doc/conf.py` version and check that the correct caosdb-servre
+   version is listed in `DEPENDENCIES.md`.
 
 4. Merge the release branch into the main branch.
 
 5. Tag the latest commit of the main branch with `v<VERSION>`.
 
-6. Delete the release branch.
+6. Create gitlab releases on gitlab.indiscale.com and on gitlab.com for new
+   tag. Add most recent section of the changelog to release description.
 
-7. Merge the main branch back into the dev branch.
+7. Delete the release branch.
 
-8. Prepare for next release cycle:
+8. Merge the main branch back into the dev branch.
+
+9. Prepare for next release cycle:
    * `CHANGELOG.md`: "Unreleased" section
    * `src/doc/conf.py`: Bump to next version number and `x.y.z-SNAPSHOT` for the `release` variable.

src/core/js/reference_resolver/caosdb_default_person.js

@@ -23,8 +23,9 @@
 
 /**
  * @module caosdb_default_person_reference
+ * @version 0.1
  *
- * Replace the reference to a Person Record by the values of that
+ * @description Replace the reference to a Person Record by the values of that
  * Record's firstname and lastname properties.
  *
  * TODO: Make name(s) of person RecordType(s) and names of firstname

src/doc/conf.py

@@ -26,9 +26,9 @@ copyright = '2022, IndiScale GmbH'
 author = 'Daniel Hornung'
 
 # The short X.Y version
-version = '0.6.1'
+version = '0.7.1'
 # The full version, including alpha/beta/rc tags
-release = '0.6.1-SNAPSHOT'
+release = '0.7.1-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------

test/docker/Dockerfile

-FROM debian:10
+FROM debian:11
 ADD node_gpg.asc /etc/apt/
 RUN  apt-get update \
     && apt-get install -y gnupg ca-certificates\
     && apt-key add /etc/apt/node_gpg.asc \
-    && echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list \
-    && echo "deb https://deb.nodesource.com/node_14.x buster main" >> /etc/apt/sources.list \
     && apt-get update \
     && apt-get install -y \
       firefox-esr gettext-base python3-pip \
       python3-httpbin git curl x11-apps xvfb unzip \
       libhdf5-dev \
       pkgconf \
-      nodejs # Don't install `npm` (Debian), it conflicts with the `nodejs` (Node) package \
+      nodejs npm \
     && apt-get install -f
 
 RUN pip3 install pylint pytest
-RUN pip3 install caosdb>=0.5.2
+RUN pip3 install caosdb>=0.7.4
 RUN pip3 install pandas
 RUN pip3 install git+https://gitlab.com/caosdb/caosdb-advanced-user-tools.git@dev
 # For automatic documentation
-#RUN npm install -g jsdoc
-#RUN npm install -g jsdoc-sphinx
+# RUN npm install -g jsdoc
+# RUN npm install -g jsdoc-sphinx
 RUN pip3 install sphinx-js sphinx-autoapi recommonmark sphinx-rtd-theme