Merge branch 'master' into fradrive/lms-type-refactor

.gitlab-ci.yml

@@ -4,9 +4,9 @@
 
 workflow:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push"'
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: always
+    - if: $CI_MERGE_REQUEST_ID
-    - when: never
+    - if: $CI_COMMIT_TAG =~ /^v/
 
 default:
   image:
@@ -26,7 +26,7 @@ stages:
   - frontend:build
   - backend:build
   - test
-  - docker
+  - container:build
   - prepare release
   - release
 
@@ -43,11 +43,6 @@ node dependencies:
     - install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config;
     - install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token
     - install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc
-    - |
-      if [ -n "${REGISTRY_AUTHFILE}" ]; then
-        mkdir -p ~/.docker
-        install -v -T -m 0400 "${REGISTRY_AUTHFILE}" ~/.docker/config.json
-      fi
   artifacts:
     paths:
       - node-dependencies.nar.xz
@@ -215,49 +210,12 @@ check:
   retry: 2
   interruptible: true
 
-# demo docker:
+container:
-#   stage: docker
+  stage: container:build
-#   script:
-#     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
-#     - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import
-#     - source .gitlab-ci/construct-flake-url.sh
-#     - nix -L build -o result "${FLAKE}#uniworxDemoDocker"
-#     - cp -pr --reflink=auto -L result uniworx-demo.tar.gz
-#   before_script: *nix-before
-#   needs:
-#     - job: node dependencies # transitive
-#       artifacts: false
-#     - job: well known # transitive
-#       artifacts: false
-#     - job: frontend # tranitive
-#       artifacts: false
-#     - job: uniworx:lib:uniworx # transitive
-#       artifacts: false
-#     - job: uniworx:exe:uniworx
-#       artifacts: true
-#     - job: uniworx:exe:uniworxdb
-#       artifacts: true
-#     - job: check # sanity
-#       artifacts: false
-#   artifacts:
-#     paths:
-#       - uniworx-demo.tar.gz
-#     name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
-#     expire_in: "1 day"
-#   retry: 2
-#   interruptible: true
-#   rules:
-#     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-#       when: manual
-#       allow_failure: true
-
-docker:
-  stage: docker
   script:
     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
     - source .gitlab-ci/construct-flake-url.sh
-    - nix -L build -o result "${FLAKE}#uniworxDocker"
+    - cp -pr --reflink=auto -L $(nix build --print-out-paths  "${FLAKE}#uniworxDocker") uniworx.tar.gz
-    - cp -pr --reflink=auto -L result uniworx.tar.gz
   before_script: *nix-before
   needs:
     - job: node dependencies # transitive
@@ -279,19 +237,15 @@ docker:
     expire_in: "1 day"
   retry: 2
   interruptible: true
-  rules:
+  rules: &release-rules
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+    - if: $CI_COMMIT_TAG =~ /^v/
-      when: manual
-      allow_failure: true
 
 parse changelog:
   stage: prepare release
   needs:
     - job: node dependencies
       artifacts: true
-  rules:
+  rules: *release-rules
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-      when: on_success
   before_script: *nix-before
   script:
     - xzcat node-dependencies.nar.xz | nix-store --import
@@ -310,13 +264,14 @@ parse changelog:
   retry: 2
   interruptible: true
 
-upload docker:
+upload container:
-  stage: docker
+  variables:
+    GIT_STRATEGY: none
+  stage: release
+  image: quay.io/skopeo/stable:latest
   script:
-    - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
+    - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://${CI_REGISTRY_IMAGE}:${VERSION}
-    - source .gitlab-ci/construct-flake-url.sh
+    - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY_IMAGE}:${VERSION} docker://${CI_REGISTRY_IMAGE}:latest
-    - nix -L run "${FLAKE}#pushUniworxDocker"
-  before_script: *nix-before
   needs:
     - job: node dependencies # transitive
       artifacts: false
@@ -326,51 +281,29 @@ upload docker:
       artifacts: false
     - job: uniworx:lib:uniworx # transitive
       artifacts: false
-    - job: uniworx:exe:uniworx
+    - job: uniworx:exe:uniworx # transitive
+      artifacts: false
+    - job: container
+      artifacts: true
+    - job: parse changelog
       artifacts: true
     - job: check # sanity
       artifacts: false
-  rules:
+  rules: *release-rules
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
+  retry: 2
-      when: on_success
-
-# upload demo docker:
-#   stage: docker
-#   script:
-#     - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import
-#     - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import
-#     - source .gitlab-ci/construct-flake-url.sh
-#     - nix -L run "${FLAKE}#pushUniworxDemoDocker"
-#   before_script: *nix-before
-#   needs:
-#     - job: node dependencies # transitive
-#       artifacts: false
-#     - job: well known # transitive
-#       artifacts: false
-#     - job: frontend # tranitive
-#       artifacts: false
-#     - job: uniworx:lib:uniworx # transitive
-#       artifacts: false
-#     - job: uniworx:exe:uniworx
-#       artifacts: true
-#     - job: uniworx:exe:uniworxdb
-#       artifacts: true
-#     - job: check # sanity
-#       artifacts: false
-#   rules:
-#     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-#       when: on_success
 
 release:
   variables:
     GIT_STRATEGY: none
   stage: release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
-  rules:
+  rules: *release-rules
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/
-      when: on_success
   script:
-    - release-cli create --name "${VERSION}" --tag-name $CI_COMMIT_TAG --description .current-changelog.md
+    - echo "Will create release ${VERSION}..."
+  release:
+    name: '$VERSION'
+    tag_name: '$CI_COMMIT_TAG'
+    description: .current-changelog.md
   needs:
     - job: check # sanity
       artifacts: false

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [27.4.6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.5...v27.4.6) (2023-05-24)
+
+## [27.4.5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.4...v27.4.5) (2023-05-23)
+
 ## [27.4.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.3...v27.4.4) (2023-05-20)
 
 ## [27.4.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.2...v27.4.3) (2023-05-12)

flake.nix

@@ -124,14 +124,6 @@
 
           haskellFlake = pkgs.uniworx.flake {};
 
-          mkPushDocker = { imageName, dockerImage, defaultRegistry ? "docker://registry.uniworx.de/fradrive/fradrive" }: pkgs.writeScriptBin "push-${dockerImage.imageName}" ''
-            #!${pkgs.zsh}/bin/zsh -xe
-
-            target=''${1:-${defaultRegistry}/${imageName}:${dockerImage.imageTag}}
-            [[ -n "''${1}" ]] && shift
-            ${pkgs.skopeo}/bin/skopeo --tmpdir ''${TMPDIR:-/var/tmp} ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target}
-          '';
-
           inherit (pkgs.lib) recursiveUpdate;
       in {
         packages = haskellFlake.packages // {
@@ -139,8 +131,6 @@
         };
 
         apps = haskellFlake.apps // {
-          pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; }; };
-          pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; }; };
           calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; exePath = ""; };
           jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; };
         };

messages/uniworx/categories/qualification/de-de-formal.msg

@@ -32,6 +32,7 @@ QualificationUserNoRenewal: Läuft ohne Benachrichtigung aus
 QualificationUserNone: Für diese Person sind keine Qualifikationen registriert.
 QualificationBlockReason: Entzugsbegründung
 QualificationBlockNotify: Benachrichtigung verschicken
+QualificationBlockRemoveSupervisor: Alle Ansprechpartner löschen
 QualificationExpired: Ungültig seit
 LmsUser: Inhaber
 LmsURL: Link E‑Learning
@@ -47,7 +48,7 @@ TableLmsStarted: Begonnen
 TableLmsReceived: Letzte Rückmeldung
 TableLmsNotified: Versand Benachrichtigung
 TableLmsNotifiedTooltip: Benachrichtigungen werden erst versendet wenn das LMS bestätigt die Eröffnung des E‑Learning für den Benutzer bestätigt hat, was ein paar Stunden dauern kann!
-TableLmsEnded: Beended
+TableLmsEnded: Beendet
 TableLmsStatus: Status E‑Learning
 TableLmsStatusTooltip mbMonth@(Maybe Int): Zeigt #{maybeToMessage "bis zu " (fmap (flip pluralDEeN "Monat") mbMonth) " nach Abschluss"} den letzten Zustand eines E‑Learnings an:
 TableLmsStatusDay: Datum letzte Statusänderung E‑Learning

messages/uniworx/categories/qualification/en-eu.msg

@@ -32,6 +32,7 @@ QualificationUserNoRenewal: Expires without further notification
 QualificationUserNone: No registered qualifications for this person.
 QualificationBlockReason: Reason for revoking
 QualificationBlockNotify: Send notification
+QualificationBlockRemoveSupervisor: Remove all supervisors
 QualificationExpired: Expired on
 LmsUser: Licensee
 LmsURL: Link E-learning

nix/docker/demo-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "27.4.4"
+  "version": "27.4.6"
 }

nix/docker/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "27.4.4"
+  "version": "27.4.6"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "27.4.4",
+  "version": "27.4.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "27.4.4",
+  "version": "27.4.6",
   "description": "",
   "keywords": [],
   "author": "",

package.yaml

@@ -1,5 +1,5 @@
 name: uniworx
-version: 27.4.4
+version: 27.4.6
 dependencies:
   - base
   - yesod

src/Handler/Qualification.hs

@@ -269,7 +269,7 @@ data QualificationTableActionData
   = QualificationActExpireData 
   | QualificationActUnexpireData  
   | QualificationActBlockSupervisorData
-  | QualificationActBlockData           { qualTableActBlockReason :: Text, qualTableActNotify :: Bool }
+  | QualificationActBlockData           { qualTableActBlockReason :: Text, qualTableActNotify :: Bool, qualTableActRemoveSupervisors :: Bool }
   | QualificationActUnblockData
   | QualificationActRenewData
   | QualificationActGrantData           { qualTableActGrantUntil  :: Day }   
@@ -286,6 +286,11 @@ isBlockAct QualificationActBlockData{}          = True
 isBlockAct QualificationActUnblockData          = True
 isBlockAct _ = False
 
+blockActRemoveSupervisors :: QualificationTableActionData -> Bool
+blockActRemoveSupervisors QualificationActBlockSupervisorData  = True
+blockActRemoveSupervisors QualificationActBlockData{qualTableActRemoveSupervisors=res} = res
+blockActRemoveSupervisors _ = False
+
 qualificationTableQuery :: QualificationId -> (_ -> E.SqlExpr (E.Value Bool)) -> QualificationTableExpr
   -> E.SqlQuery ( E.SqlExpr (Entity QualificationUser)
                 , E.SqlExpr (Entity User)
@@ -491,7 +496,8 @@ postQualificationR sid qsh = do
           [ singletonMap QualificationActUnblock         $ pure QualificationActUnblockData           -- Admin-only actions
           , singletonMap QualificationActBlock           $      QualificationActBlockData 
               <$> apreq textField (fslI MsgQualificationBlockReason) Nothing
-              <*> areq (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgQualificationBlockNotify) (Just False)
+              <*> areq (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgQualificationBlockNotify)            (Just False)
+              <*> areq (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgQualificationBlockRemoveSupervisor)  (Just False)
           , singletonMap QualificationActRenew           $ pure QualificationActRenewData
           , singletonMap QualificationActGrant           $      QualificationActGrantData 
                 <$> apopt dayField (fslI MsgLmsQualificationValidUntil) dayExpiry
@@ -562,8 +568,7 @@ postQualificationR sid qsh = do
               _ -> False
           
       oks <- runDB $ do 
-        deleteWhere [UserSupervisorUser <-. selUserIds]
+        when (blockActRemoveSupervisors action) $ deleteWhere [UserSupervisorUser <-. selUserIds]
-        deleteWhere [UserCompanyUser    <-. selUserIds]
         qualificationUserBlocking qid selUserIds notify qubr
       let nrq = length selectedUsers
           warnLevel = if