Merge branch 'dev' for release 5.4.10

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## next deploy
 
+## v5.4.10 2022 July 05
+
+- Increased About page title's size
+- Fix a bug: script mount-proof-of-identity-files creates a volume with an invalid path
+- Fix a bug: unable to access the new OIDC provider form
+
 ## v5.4.9 2022 June 29
 
 - Fix a bug: validator of reservation can't find if slot has reserved by reservable type

app/frontend/src/javascript/components/authentication-provider/openid-connect-form.tsx

@@ -69,7 +69,7 @@ export const OpenidConnectForm = <TFieldValues extends FieldValues, TContext ext
    * The resulting list is provided through the callback parameter.
    */
   const loadScopes = (inputValue: string, callback: (options: Array<{ value: string, label: string }>) => void): void => {
-    const current = currentFormValues.scope || [];
+    const current = currentFormValues?.scope || [];
     if (scopesAvailable) {
       // add custom scopes to the list of available scopes
       const unlisted = difference(current, scopesAvailable);

app/frontend/src/stylesheets/app.components.scss

@@ -408,9 +408,10 @@
   .about-title, .about-title p {
     margin: 0;
     font-size: rem-calc(50);
-    line-height: rem-calc(48);
+    line-height: rem-calc(56);
     color: #fff;
     font-weight: 900;
+    text-align: left;
   }
 
   .about-title-aside {
@@ -418,14 +419,6 @@
     font-size: rem-calc(18);
   }
 
-  .about-title,
-  .about-title p
-  {
-    font-size: rem-calc(18);
-    line-height: rem-calc(30);
-    text-align: left;
-  }
-
   &.ng-hide {
     opacity: 0;
 

app/models/slot.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
-# Time range, slicing an Availability.
-# Its duration is defined by globally by Setting.get('slot_duration') but can be overridden per availability
-# During a slot a Reservation is possible
-# Only reserved slots are persisted in DB, others are instantiated on the fly
+# A Time range.
+# Slots have two functions:
+# - slicing an Availability
+#   > Slots duration are defined globally by Setting.get('slot_duration') but can be overridden per availability.
+#   > These slots are not persisted in database and instantiated on the fly, if needed.
+# - hold detailed data about a Reservation.
+#   > Persisted slots (in DB) represents booked slots and stores data about a time range that have been reserved.
 class Slot < ApplicationRecord
   include NotifyWith::NotificationAttachedObject
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.4.9",
+  "version": "5.4.10",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",

scripts/mount-proof-of-identity-files.sh

@@ -22,7 +22,7 @@ add_mount()
   if [[ ! $(yq eval ".services.$SERVICE.volumes.[] | select (. == \"*proof_of_identity_files\")" docker-compose.yml) ]]; then
     # change docker-compose.yml permissions for fix yq can't modify file issue
     chmod 666 docker-compose.yml
-    yq -i eval ".services.$SERVICE.volumes += [\"\./proof_of_identity_files:/usr/src/app/proof_of_identity_files\"]" docker-compose.yml
+    yq -i eval ".services.$SERVICE.volumes += [\"./proof_of_identity_files:/usr/src/app/proof_of_identity_files\"]" docker-compose.yml
     chmod 644 docker-compose.yml
   fi
 }