Merge branch 'dev' for release 6.2.0

Author: nflorentin

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog Fab-manager
 
+## v6.2.0 2023 October 13
+
+- Fix a bug: fix ReservationReminderWorker, was sending reservation reminder to users with a event reservation not validated by admin + adds tests for all scenarios
+- Fix a bug: admin could not create new SupportingDocumentType (problem was on js side)
+- Fix a bug: fix back button on space edit page
+- Fix a bug: fix members tour (help), a selector was not valid anymore
+- Fix a bug: unable to save OpenID extra_authorize_params as json
+- Fix machine list bug : when there is no user logged in and access machines list with at least one machine associated to a space
+
 ## v6.1.2 2023 October 2
 
 - Fix a bug: minor pb (exception raised) when bot hit api/projects#search without beeing authenticated

app/frontend/src/javascript/components/events/event-form.tsx

@@ -218,7 +218,8 @@ export const EventForm: React.FC<EventFormProps> = ({ action, event, onError, on
                              id="event_image_attributes"
                              accept="image/*"
                              defaultImage={output.event_image_attributes}
-                             label={t('app.admin.event_form.matching_visual')} />
+                             label={t('app.admin.event_form.illustration')}
+                             tooltip={t('app.admin.event_form.illustration_recommendation')} />
             <FormRichText control={control}
                           id="description"
                           rules={{ required: true }}

app/frontend/src/javascript/components/form/form-image-upload.tsx

@@ -28,7 +28,7 @@ type FormImageUploadProps<TFieldValues, TContext extends object> = FormComponent
 /**
  * This component allows to upload image, in forms managed by react-hook-form.
  */
-export const FormImageUpload = <TFieldValues extends FieldValues, TContext extends object>({ id, label, register, control, defaultImage, className, rules, disabled, error, warning, formState, onFileChange, onFileRemove, accept, setValue, size, onFileIsMain, mainOption = false }: FormImageUploadProps<TFieldValues, TContext>) => {
+export const FormImageUpload = <TFieldValues extends FieldValues, TContext extends object>({ id, label, register, control, defaultImage, className, rules, disabled, error, warning, formState, onFileChange, onFileRemove, accept, setValue, size, onFileIsMain, mainOption = false, tooltip }: FormImageUploadProps<TFieldValues, TContext>) => {
   const { t } = useTranslation('shared');
 
   const [file, setFile] = useState<ImageType>(defaultImage);
@@ -125,7 +125,8 @@ export const FormImageUpload = <TFieldValues extends FieldValues, TContext exten
                    warning={warning}
                    id={`${id}.attachment_files`}
                    onChange={onFileSelected}
-                   placeholder={placeholder()}/>
+                   placeholder={placeholder()}
+                   tooltip={tooltip} />
         {hasImage() && <FabButton onClick={onRemoveFile} icon={<Trash size={20} weight="fill" />} className="is-main" />}
       </div>
     </div>

app/frontend/src/javascript/components/machines/machine-card.tsx

@@ -58,7 +58,7 @@ const MachineCard: React.FC<MachineCardProps> = ({ user, machine, onShowMachine,
   return (
     <div className={`machine-card ${loading ? 'loading' : ''} ${machine.disabled ? 'disabled' : ''} ${!machine.reservable ? 'unreservable' : ''}`}>
       {machinePicture()}
-      {machine.space && user.role === 'admin' && <FabBadge icon='pin-map' iconWidth='3rem' /> }
+      {machine.space && user && user.role === 'admin' && <FabBadge icon='pin-map' iconWidth='3rem' /> }
       <div className="machine-name">
         {machine.name}
       </div>

app/frontend/src/javascript/components/machines/machine-form.tsx

@@ -123,7 +123,8 @@ export const MachineForm: React.FC<MachineFormProps> = ({ action, machine, onErr
                              id="machine_image_attributes"
                              accept="image/*"
                              defaultImage={output.machine_image_attributes}
-                             label={t('app.admin.machine_form.illustration')} />
+                             label={t('app.admin.machine_form.illustration')}
+                             tooltip={t('app.admin.machine_form.illustration_recommendation')} />
             <FormRichText control={control}
                           id="description"
                           rules={{ required: true }}

app/frontend/src/javascript/components/spaces/space-form.tsx

@@ -123,7 +123,8 @@ export const SpaceForm: React.FC<SpaceFormProps> = ({ action, space, onError, on
                             id="space_image_attributes"
                             accept="image/*"
                             defaultImage={output.space_image_attributes}
-                              label={t('app.admin.space_form.illustration')} />
+                            label={t('app.admin.space_form.illustration')}
+                            tooltip={t('app.admin.space_form.illustration_recommendation')} />
             <FormInput register={register}
                       type="number"
                       id="default_places"

app/frontend/src/javascript/components/supporting-documents/supporting-documents-type-form.tsx

@@ -57,13 +57,20 @@ export const SupportingDocumentsTypeForm: React.FC<SupportingDocumentsTypeFormPr
     onChange('name', value);
   };
 
+  /**
+   * to know if select input for groups is display or not
+   */
+  const displayGroupsSelect = (): boolean => {
+    return (supportingDocumentType == null || supportingDocumentType?.document_type === 'User') && (groups.length > 0);
+  };
+
   return (
     <div className="supporting-documents-type-form">
       <div className="info-area">
         {t('app.admin.settings.account.supporting_documents_type_form.type_form_info')}
       </div>
       <form name="supportingDocumentTypeForm">
-        {supportingDocumentType?.document_type === 'User' &&
+        {displayGroupsSelect() &&
           <div className="field">
             <Select defaultValue={groupsValues()}
               placeholder={t('app.admin.settings.account.supporting_documents_type_form.select_group')}

app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx

@@ -49,7 +49,9 @@ const SupportingDocumentsTypesList: React.FC<SupportingDocumentsTypesListProps>
   // get groups
   useEffect(() => {
     GroupAPI.index({ disabled: false }).then(data => {
-      setGroups(data);
+      if (documentType === 'User') {
+        setGroups(data);
+      }
       SupportingDocumentTypeAPI.index({ document_type: documentType }).then(pData => {
         setSupportingDocumentsTypes(pData);
       });

app/frontend/src/javascript/components/trainings/training-form.tsx

@@ -126,7 +126,8 @@ export const TrainingForm: React.FC<TrainingFormProps> = ({ action, training, on
                              id="training_image_attributes"
                              accept="image/*"
                              defaultImage={output.training_image_attributes}
-                             label={t('app.admin.training_form.illustration')} />
+                             label={t('app.admin.training_form.illustration')}
+                             tooltip={t('app.admin.training_form.illustration_recommendation')} />
             <FormRichText control={control}
                           id="description"
                           rules={{ required: true }}

app/frontend/src/javascript/controllers/admin/members.js

@@ -511,7 +511,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
       });
       if ($scope.members.length > 0) {
         uitour.createStep({
-          selector: '.members-management .members-list .buttons',
+          selector: '.members-management .members-list .member-actions',
           stepId: 'actions',
           order: 4,
           title: _t('app.admin.tour.members.actions.title'),