Merge branch 'main' into wip/DSP-815-Use-the-DSP-name

* main:
  Update dependencies (#327)
  Update dsp dependencies (#326)
  DSP-920 Renaming default github branch to "main" (#325)
  DSP-908 - Project List Sorting Fix (#323)
  DSP-860: Ontology editor: Create resource class (#322)
  DSP-859 Create ontology (#319)
  feat(header+dialog): create button in the header + dialog box (#320)
  fix(node_modules): Update dependencies (#318)
  DSP-329 Fix sort button (#303)
  Update js-lib and ui-lib (#317)
  DSP-293 Update contact information on the landing page (#316)

.editorconfig

@@ -13,10 +13,16 @@ indent_size = 2
 max_line_length = off
 trim_trailing_whitespace = false
 
-[*.json, *.scss, *.yml]
+[*.json]
+indent_size = 2
+
+[*.scss]
 indent_size = 2
 
 [*.ts]
 spaces_around_brackets = inside
 singleQuote = true
 indent_size = 4
+
+[*.yml]
+indent_size = 2

.github/pull_request_template.md

@@ -1 +1 @@
-resolves [DSP-xy](https://dasch.myjetbrains.com/youtrack/issue/DSP-xy)
+resolves DSP-

.github/workflows/main.yml

@@ -33,8 +33,8 @@ jobs:
     name: Update next release draft
     needs: build-test
     runs-on: ubuntu-latest
-    # Drafts your next Release notes as Pull Requests are merged into "master"
-    if: github.ref == 'refs/heads/master'
+    # Drafts your next Release notes as Pull Requests are merged into "main" branch
+    if: github.ref == 'refs/heads/main'
     steps:
       - uses: release-drafter/release-drafter@v5
         env:
@@ -53,9 +53,22 @@ jobs:
           fetch-depth: 50
       - name: Get previous tag
         id: previoustag
-        uses: "WyriHaximus/github-action-get-previous-tag@master"
+        uses: "WyriHaximus/github-action-get-previous-tag@1.0.0"
       - name: Update version in package.json
         run: npm version ${{steps.previoustag.outputs.tag}} --git-tag-version=false --commit-hooks=false
+      - name: Update CHANGELOG
+        uses: lakto/gren-changelog-action@v0.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          options: '--override'
+      - name: Attach CHANGELOG to release assets
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GH_TOKEN }}
+          file: CHANGELOG.md
+          tag: ${{ github.ref }}
+          overwrite: true
       - name: Build and publish image
         run: |
           echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin

.gitignore

@@ -42,6 +42,7 @@ docs/.sass-cache
 docs/.jekyll-metadata
 docs/vendor
 docs/bin
+CHANGELOG.md
 
 # System Files
 .DS_Store

README.md

@@ -45,9 +45,15 @@ We built the user guidelines and developer documentation with [MkDocs](https://w
 
 ## Publish a new version to DockerHub
 
+Before publishing:
+
+- Update README if necessary and commit the changes.
+
+- Be sure that all dependencies to DSP-UI-LIB, DSP-JS-LIB and DSP-API are set to the correct version.
+
 A new version will be published with each Github release as it's part of Github actions' workflow. To make a new release, go to <https://github.com/dasch-swiss/dsp-app/releases> and update the draft called "Next release" by changing:
 
-- the tag version and the release title (same name) with the version number, e.g. `v3.0.0` or `v3.0.0-rc.0`
+- The tag version and the release title (same name) with the version number, e.g. `v3.0.0` or `v3.0.0-rc.0`
 - If this is a pre-release, check the box "This is a pre-release"
 
 New package will be available on <https://hub.docker.com/repository/docker/daschswiss/dsp-app>.