From b613f22363072ba6ccaee6ead70ad2c2c0e21ad5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 2 Jun 2023 21:02:03 +0000 Subject: [PATCH 1/3] chore(haddock): fix problematic comments --- src/Foundation/Yesod/Auth.hs | 4 ++-- src/Handler/Admin/Avs.hs | 2 +- src/Model/Types/Avs.hs | 2 +- src/Utils/Avs.hs | 2 +- src/Utils/Csv/Mail.hs | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Foundation/Yesod/Auth.hs b/src/Foundation/Yesod/Auth.hs index b3fbced9b..efabadc80 100644 --- a/src/Foundation/Yesod/Auth.hs +++ b/src/Foundation/Yesod/Auth.hs @@ -263,8 +263,8 @@ decodeUser now UserDefaultConf{..} upsertMode ldapData = do userEmail <- if -- TODO: refactor! NOTE: LDAP doesnt know email for all users; we use userPrincialName instead; however validEmail refutes `E return $ CI.mk userEmail - -- | userEmail : _ <- mapMaybe (assertM validEmail . either (const Nothing) Just . Text.decodeUtf8') (lookupSome ldapMap $ toList ldapUserEmail) -- TOO STRONG, see above! - -- -> return $ CI.mk userEmail + -- | userEmail : _ <- mapMaybe (assertM validEmail . either (const Nothing) Just . Text.decodeUtf8') (lookupSome ldapMap $ toList ldapUserEmail) -- TOO STRONG, see above! + -- -> return $ CI.mk userEmail | otherwise -> throwM CampusUserInvalidEmail diff --git a/src/Handler/Admin/Avs.hs b/src/Handler/Admin/Avs.hs index 99751e95c..90fd59ad6 100644 --- a/src/Handler/Admin/Avs.hs +++ b/src/Handler/Admin/Avs.hs @@ -44,7 +44,7 @@ single = uncurry Map.singleton -- Button only needed in AVS TEST; further buttons see below -data ButtonAvsTest = BtnCheckLicences -- | BtnSynchLicences +data ButtonAvsTest = BtnCheckLicences -- | BtnSynchLicences deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic) instance Universe ButtonAvsTest instance Finite ButtonAvsTest diff --git a/src/Model/Types/Avs.hs b/src/Model/Types/Avs.hs index f1937c736..dc58f1087 100644 --- a/src/Model/Types/Avs.hs +++ b/src/Model/Types/Avs.hs @@ -254,7 +254,7 @@ instance FromJSON AvsLicence where parseJSON (Number n) | n == 1 = pure AvsLicenceVorfeld -- ordered by occurrence, n==1 is most common case | n == 2 = pure AvsLicenceRollfeld | n == 0 = pure AvsNoLicence - -- | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence + {- | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence -} #ifdef DEVELOPMENT parseJSON invalid = prependFailure "parsing AvsLicence failed, " $ fail $ "expected Int value being 0, 1 or 2. Found " ++ show invalid #else diff --git a/src/Utils/Avs.hs b/src/Utils/Avs.hs index 9f19af2b6..27932acda 100644 --- a/src/Utils/Avs.hs +++ b/src/Utils/Avs.hs @@ -101,7 +101,7 @@ splitQuery :: (Wrapped a, Wrapped c, Unwrapped a ~ Set b, Semigroup (Unwrapped c splitQuery rawQuery q | avsMaxQueryAtOnce >= Set.size s = rawQuery q | otherwise = do - -- $logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM + -- logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM let (avsid1, avsid2) = Set.splitAt avsMaxQueryAtOnce s res1 <- rawQuery $ view _Unwrapped' avsid1 res2 <- splitQuery rawQuery $ view _Unwrapped' avsid2 diff --git a/src/Utils/Csv/Mail.hs b/src/Utils/Csv/Mail.hs index f88fe6974..b14fc73cc 100644 --- a/src/Utils/Csv/Mail.hs +++ b/src/Utils/Csv/Mail.hs @@ -56,11 +56,11 @@ recodeCsv encOpts toUser act = fromMaybe act $ do inp <- C.sinkLazy inp' <- recode inp sourceLazy inp' .| act - -- -- | FormatXlsx <- fmt -> do - -- -- inp <- C.sinkLazy - -- -- archive <- throwLeft $ Zip.toArchiveOrFail inp - -- -- archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive - -- -- sourceLazy (Zip.fromArchive inp') .| act + -- | FormatXlsx <- fmt -> do + -- inp <- C.sinkLazy + -- archive <- throwLeft $ Zip.toArchiveOrFail inp + -- archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive + -- sourceLazy (Zip.fromArchive inp') .| act | otherwise -> act where From 4f589161a7ae4c6ace4ae131a8b4589ab6cb2888 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 2 Jun 2023 21:03:56 +0000 Subject: [PATCH 2/3] chore(gitignore): ignore /.vscode --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 36bc7572f..b642776ca 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,5 @@ tunnel.log .develop.env **/result **/result-* -.develop.cmd \ No newline at end of file +.develop.cmd +/.vscode \ No newline at end of file From 7d3ccd1183f390e8fbd331d1d874cfc7491a5265 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Sat, 3 Jun 2023 03:36:30 +0000 Subject: [PATCH 3/3] chore(release): 27.4.8 --- CHANGELOG.md | 8 ++++++++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1f791cb1..61384a531 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.7...v27.4.8) (2023-06-03) + + +### Bug Fixes + +* **qualification:** prevent qualification mixups ([88d4356](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/88d43560ae8de1480502914d9c95d6376a3c68cc)) +* **tutorial:** template moving works now ([b982e59](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b982e59b630fbdb3fe8f37c979de8e8726b78ea9)) + ## [27.4.7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.6...v27.4.7) (2023-05-29) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 6b22a574e..155d3135e 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.7" + "version": "27.4.8" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 6b22a574e..155d3135e 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.7" + "version": "27.4.8" } diff --git a/package-lock.json b/package-lock.json index 14dae4e55..58b5899e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.7", + "version": "27.4.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3678be05d..62506c189 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.7", + "version": "27.4.8", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index b354d0d71..a84f3bce4 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.7 +version: 27.4.8 dependencies: - base - yesod