Skip to content

Commit

Permalink
feat: add loan functionality (#601)
Browse files Browse the repository at this point in the history
* feat: add copy object URI in presentation (#559)

* feat: improved copy url in presentation

* test: added tests for coverage

* chore: revert coverage

* fix: removed console.log :)

* test: write test for coverage

* chore: changed messages on copy

* chore: fixed coverage

Co-authored-by: Stijn Taelemans <[email protected]>

* feat: loan feature setup (#564)

* feat: add copy object URI in presentation (#559)

* feat: improved copy url in presentation

* test: added tests for coverage

* chore: revert coverage

* fix: removed console.log :)

* test: write test for coverage

* chore: changed messages on copy

* chore: fixed coverage

Co-authored-by: Stijn Taelemans <[email protected]>

* feat: ssetup loan-root, machine, event, ... etc

* chore: rename loan events

* chore: rename states

* chore: minor changes in translation file

* chore: revert test command in package.json

* chore: fix event and state nameing

* fix: make loan page content scrollable

Co-authored-by: Stijn Taelemans <[email protected]>

* feat: add copy collection uri in presentation (#569)

* feat: create loan feature components (#568)

* feat: add copy object URI in presentation (#559)

* feat: improved copy url in presentation

* test: added tests for coverage

* chore: revert coverage

* fix: removed console.log :)

* test: write test for coverage

* chore: changed messages on copy

* chore: fixed coverage

Co-authored-by: Stijn Taelemans <[email protected]>

* feat: ssetup loan-root, machine, event, ... etc

* chore: rename loan events

* chore: rename states

* chore: minor changes in translation file

* chore: revert test command in package.json

* chore: fix event and state nameing

* fix: make loan page content scrollable

* feat: develop loan overview page

* feat: add caret svg in theme package

* feat: develop detail page

* feat: create loan creation component

* feat: changed event parameter

* feat: update detail component to fit new figma

* feat: update creation component to fit figma

* fix: minor styling fixes

Co-authored-by: Stijn Taelemans <[email protected]>

* chore: loan feature deployment (#570)

* chore: update refs, only publish front end apps

* chore: revert ci.yml

* chore: add releases for pushes to feat/loan

* chore: publish graduate release when merging to master

* chore: update loan-canary.yml

* chore: update prod-release.yml

* chore: update docker image & deployment names

* chore: update loans-canary.yml

* chore: add -loans infix to deployment verif

* chore: GA_TOKEN -> DIGITA_PACKAGES (#579)

* chore: update NODE_AUTH_TOKEN in canary (#580)

* build: exclude some packages from lerna publish (#581)

* fix: add needs variables to publish-docker (#582)

* fix: set package versions to loans WIP (#583)

* build: update package locks (#584)

* fix: package-locks for loans (#586)

* chore: update package-locks WIP

* test: fix tests

* test: fix tests in presentation WIP

* build: prereleases for loan canary (#587)

* build: use prereleases for canary WIP

* build: discover version WIP

* build: correct action release WIP

* build: update versions WIP

* build: add allowBranch feat/loan (#588)

* build: replace GA_TOKEN (#589)

* build: bump versions for loan (#590)

* build: use single test bracket (#591)

* feat: create semcom object-loan component (#578)

* feat: create object-loan component

* feat: use object-loan semcom component in manage app

* chore: update translations

Co-authored-by: Stijn Taelemans <[email protected]>

* build: bump package versions (#592)

* build: bump versions WIP

* build: bump package versions WIP

* build: use PAT for pushes to feat/loan (#593)

* buikd: bump package versions (#594)

* chore: release v0.17.0-loans.15

* build: fix build errors (#595)

* build: bump package versions WIP

* build: update package-locks WIP

* chore: release v0.17.0-loans.16

* feat: add object updates page in object root (#577)

* feat: add object updates page in object root

* fix: add Onderdelen title in sidebar

* chore: update lnk line offset WIP

Co-authored-by: Stijn Taelemans <[email protected]>

* chore: release v0.17.0-loans.17

* build: use feat/loan for docker images WIP (#597)

* chore: release v0.17.0-loans.18

* feat: implement LDNs for loan requests (#573)

* feat: create and register inboxes for collections WIP

* chore: implement services WIP

* chore: add publisher to collection model WIP

* chore: sending and retrieving loan requests works WIP

* chore: accepting and rejecting works WIP

* chore: request import progress WIP

* feat: add Empty svg when there are no loanRequests on overview page

* feat: improve validation of collection url

* feat: collection anchor tag now opens presentation view in new tab

* test: adapt tests to code changes and write extra tests for coverage

* chore: importing collections works WIP

* fix: build error in presentation WIP

* test: update coverage (core) WIP

* feat: overview page for accepted loan requests (#575)

* feat: develop overview page for accepted loan requests

* fix: revert changes

Co-authored-by: Stijn Taelemans <[email protected]>

* test: fixed tests in manage WIP

Co-authored-by: Arthur Joppart <[email protected]>
Co-authored-by: Arthur Joppart <[email protected]>

* chore: release v0.17.0-loans.19

* feat: create presentation compare page (#596)

* chore: improve router

* feat: implement compare page and object-root refactor

* test: added tests for new components and adapt some old ones

* chore: update coverage

* fix: revert unwanted change

Co-authored-by: Stijn Taelemans <[email protected]>

* chore: release v0.17.0-loans.20

* feat: implement LDN for metadata updates (#598)

* feat: save new collection + object on import WIP

* feat: send metadata updates when saving loaned objects WIP

* feat: show updates in original object overview WIP

* fix: add updated object URI to metadata update notif WIP

* chore: replace nde/original with schema/isbasedon WIP

* chore: rename predicate originalObject -> context WIP

* fix: reload collections on import WIP

* fix: popup styling on object page WIP

* fix: compare page link WIP

* chore: implement import cancels WIP

* feat: implement importing of metadata updates WIP

* test: write tests for core WIP

* chore: remove unnecessary jest param WIP

* test: fix failing tests in manage WIP

* chore: release v0.17.0-loans.21

* build: update release actions WIP

* fix: webid validation for broker.pod.inrupt.com oidcIssuers WIP

* chore: update release action

Co-authored-by: Arthur Joppart <[email protected]>
Co-authored-by: lem-onade <[email protected]>
Co-authored-by: Arthur Joppart <[email protected]>
  • Loading branch information
4 people authored Apr 28, 2022
1 parent 9543367 commit 44625f5
Show file tree
Hide file tree
Showing 120 changed files with 17,743 additions and 12,671 deletions.
60 changes: 60 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@

name: Perform checks

on:

push:

branches:
- feat/*
- fix/*
- test/*
- chore/*
- build/*
- docs/*

workflow_call:
secrets:
DIGITA_PACKAGES:
required: true

jobs:

test:

name: Run tests

runs-on: ubuntu-latest

steps:

- uses: actions/checkout@v2

- name: Extract tag
id: extract-tag
run: echo "::set-output name=tag::${GITHUB_REF/refs\/tags\//}"

- name: Check tag
run: echo ${{ steps.extract-tag.outputs.tag }}

- name: Extract branch
id: extract-branch
run: echo "::set-output name=branch::${GITHUB_REF/refs\/heads\//}"

- name: Check branch
run: echo ${{ steps.extract-branch.outputs.branch }}

- uses: actions/setup-node@v1
with:
node-version: 14
registry-url: https://npm.pkg.github.com

- run: npm run bootstrap
env:
NODE_AUTH_TOKEN: ${{ secrets.DIGITA_PACKAGES }}

- run: npm run build:all

- run: npm run lint:all

- run: npm run test:ci
119 changes: 42 additions & 77 deletions .github/workflows/ci.yml → .github/workflows/prod-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: CI
name: Publish graduated release

on: push
on:

workflow_dispatch:

pull_request:

types: [closed]

branches:
- master

jobs:
variables:
Expand Down Expand Up @@ -28,68 +37,32 @@ jobs:
echo "::set-output name=image_id_proxy::ghcr.io/netwerk-digitaal-erfgoed/solid-crs-id-proxy"
echo "::set-output name=image_webid::ghcr.io/netwerk-digitaal-erfgoed/solid-crs-webid"
test:
name: Run tests
needs: variables
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Check tag
run: echo ${{ needs.variables.outputs.tag }}

- name: Extract branch
id: extract-branch
run: echo "::set-output name=branch::${GITHUB_REF/refs\/heads\//}"

- name: Check branch
run: echo ${{ steps.extract-branch.outputs.branch }}

- uses: actions/setup-node@v2
with:
node-version: 14
registry-url: https://npm.pkg.github.com

- run: npm run bootstrap
env:
NODE_AUTH_TOKEN: ${{ secrets.DIGITA_PACKAGES }}

- run: npm run build:all

- run: npm run lint:all
perform-checks:

- run: npm run test:ci

release:
name: Create release
needs: test
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body_path: CHANGELOG.md
draft: false
prerelease: false
name: Perform checks
uses: netwerk-digitaal-erfgoed/solid-crs/.github/workflows/checks.yml@master
secrets:
DIGITA_PACKAGES: ${{ secrets.DIGITA_PACKAGES }}

publish-npm:
name: Publish NPM packages
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')
needs: [variables, release]
steps:
- uses: actions/checkout@v2

- name: Checkout ref
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Fetch more tags
run: git fetch --tags

- name: Configure git
run: |
git config user.name ${{github.actor}}
git config user.email ${{github.actor}}@users.noreply.github.com
git remote set-url origin https://${{github.actor}}:${{secrets.ACTIONS_PUSH}}@github.com/${{github.repository}}.git
- uses: actions/setup-node@v1
with:
Expand All @@ -100,33 +73,25 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.DIGITA_PACKAGES }}

- run: npm run build:all

- run: npm publish packages/solid-crs-theme
- name: Build packages
run: npm run build:all

- name: Publish packages
id: publish-packages
run: npx lerna publish --no-verify-access --conventional-commits --conventional-graduate --yes --no-push
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Push changes
run: git -c "http.https://github.com/.extraheader=" push

- run: npm publish packages/solid-crs-core
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

- run: npm publish packages/solid-crs-components
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

- run: npm publish packages/solid-crs-client
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

- run: npm publish packages/solid-crs-semcom-components
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}


publish-docker:
name: Publish Docker images
needs: [variables, publish-npm]
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

. "$(dirname $0)/_/husky.sh"

Expand Down
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#!/bin/bash

. "$(dirname $0)/_/husky.sh"

## Run specified linters on staged files, automatically adding fixes
npm run lint:staged
npm run lint:staged
6 changes: 3 additions & 3 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

. "$(dirname $0)/_/husky.sh"

Expand All @@ -12,7 +12,7 @@ do

BRANCH=$(git rev-parse --abbrev-ref "$L_REF")

if [[ "$R_SHA" = "$(printf "%040d")" ]] ; then
if [ "$R_SHA" = "$(printf "%040d")" ] ; then

# Check branch name convention
if ! (echo "$BRANCH" | grep -qE "$REGEX") ; then
Expand All @@ -24,4 +24,4 @@ do

fi

done
done
Loading

0 comments on commit 44625f5

Please sign in to comment.