Merge pull request #69 from XIMDEX/develop

Develop

src/api/service.ts

@@ -792,6 +792,24 @@ class AppService {
         return {error: 'Error on retrying duplication'}
       }
     }
+
+    async checkAccessibility(id)
+    {
+        const _api = api().checkAccessibility(id)
+        const request = {
+            method: _api.method
+          }
+          try {
+            const res = await (await fetch(_api.url, request)).json();
+            if (res.error) throw Error(res.error)
+            return res
+          }
+          catch (e) {
+            console.error(e.message)
+            return ['base'];
+          }
+    }
+
 }
 
 export default function MainService()

src/api/urlMapper.ts

@@ -238,6 +238,11 @@ const api = () => {
             method: 'POST',
             url: `${BOOK_EDITOR_URL}api/book/${bookId}/upgrade`
         }),
+
+        checkAccessibility: (resource_id) => ({
+            method: 'GET',
+            url: `${BOOK_EDITOR_URL}api/book/${resource_id}/checkaccessibility`
+        }),
     }
     return mapper;
 }

src/features/Layout/Sidebar/AddOrEditFacetItem.tsx

@@ -1,12 +1,13 @@
 import React, { useRef, useState } from 'react'
 import {  Grid, IconButton, styled, TextField } from '@material-ui/core';
 import { useDispatch, useSelector  } from 'react-redux';
-import { reloadCatalogue, setSchemas } from '../../../appSlice';
+import {  reloadCatalogue, selectWorkspaceCollections, selectWorkspacesData, setSchemas, setUser, setWorkspaceCollections, setWorkspacesData } from '../../../appSlice';
 import PostAddRounded from '@material-ui/icons/PostAddRounded';
 import Modal from '../../Resources/Modals/Modal/Modal';
 import { CustomToggle } from '../../Resources/Modals/DynamicFormTemplates/CustomFields';
 import MainService from '../../../api/service';
 import { selectCollection, selectOrganization } from '../../../slices/organizationSlice';
+import { parseWorkspace } from '../../../api/providers/workspacesProvider';
 
 const StyledTextField = styled(TextField)({
     '& label.Mui-focused': {
@@ -30,7 +31,6 @@ const AddOrEditItemFacet = ({facet, requestOpts, values = {}, ...props}) => {
     const [disableSuccess, setDisableSuccess] = useState(true)
     const [disableCancel, setDisableCancel] = useState(false)
     const organization_id = useSelector(selectOrganization)
-    const collection_id = useSelector(selectCollection)
     const [open, setOpen] = useState(false)
     const [form, setForm] = useState({});
     const formRef = useRef(null);
@@ -65,8 +65,15 @@ const AddOrEditItemFacet = ({facet, requestOpts, values = {}, ...props}) => {
 
             if (facet.key === 'workspaces' && res.ok) {
                 alert('Workspace created successfully')
+                let fetchedUser = await MainService().getUser();
+                    if (fetchedUser?.error) {
+                        return alert(
+                            "Error loading user: " + fetchedUser.error
+                        );
+                    } 
+                    dispatch(setWorkspaceCollections(fetchedUser.data.workspaces));
             }
-            
+
             const schemas = await MainService().getSchemas();
             dispatch(reloadCatalogue())
             dispatch(setSchemas(schemas));
@@ -82,11 +89,13 @@ const AddOrEditItemFacet = ({facet, requestOpts, values = {}, ...props}) => {
     }
 
     const handleChange = (key, value) => {
-        let newForm = {...form, [key]: value}
+        let newForm = {...values, ...form, [key]: value}
         if (value === '') {
             delete newForm[key]
         }
-        setDisableSuccess(Object.keys(newForm).length !== facet.fields.filter(obj => obj.type === "string").length)
+
+        setDisableSuccess(Object.keys(newForm).length === 0)
+        // setDisableSuccess(Object.keys(newForm).length !== facet.fields.filter(obj => obj.type === "string").length)
         setForm(newForm)
     }
 

src/features/Layout/Sidebar/FacetCard.tsx

@@ -157,7 +157,6 @@ export function FacetCard({ facet, fixed, resources, collection, organization, f
     const handleFilterSelected = (value, isChecked) => {
         let newValues = {...facetValues}
         newValues[value] = {...newValues[value], selected: isChecked}
-        console.log("FILTER SELECTED", newValues);
         setFacetValues(newValues)
         if (isChecked && !selectedWS.includes(value)) {
             setSelectedWS([...selectedWS,value ])

src/features/Resources/Modals/DynamicForm.tsx

@@ -15,7 +15,7 @@ import { selectCollection } from '../../../slices/organizationSlice';
 import SemanticForm from "@rjsf/semantic-ui";
 import { JSONSchema7 } from 'json-schema';
 import { render } from '../../../utils/render';
-import { Tab, Label, Icon, Dropdown } from 'semantic-ui-react'
+import { Tab, Label, Icon, Dropdown, Radio} from 'semantic-ui-react'
 import { Button as Btn } from 'semantic-ui-react';
 import { Message } from 'semantic-ui-react';
 import RelatedFiles from './RelatedFiles';
@@ -126,6 +126,9 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
     }
   });
 
+  const [loadingAccessibiliy, setLoadingAccessibility] = useState(true)
+  const [accessibility, setAccessibility] = useState(false);
+
   const resources  = useSelector(selectResources)
 
   const handleWorkspaceSelected = (data) => {
@@ -277,8 +280,6 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
   //end cdn functions
 
   useEffect(() => {
-
-
     const getThemes = async () => {
         const themes_scorm = await MainService().getBookThemes()
         const newThemes = themes_scorm.map(th => ({key: th, value: th, text: th === 'v1' ? `${th} (deprecated)` : th}))
@@ -291,6 +292,20 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
 
   }, [])
 
+
+  useEffect(() => {
+    const getAccessibility = async () => {
+        const {accessibility} = await MainService().checkAccessibility(resourceData.id)
+        setAccessibility(accessibility)
+        setLoadingAccessibility(false)
+    }
+
+    if (resourceData?.id && action === 'edit' && resourceType === 'book') {
+        getAccessibility()
+    }
+
+  }, [resourceData])
+
   useEffect(() => {
 
     if(action === 'create') {
@@ -477,6 +492,11 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
       theFormData.append(e, body[e]);
     })
 
+    if (wksSelected?.wsp?.length !== 0) {
+        const valuesWsp: number[] = wksSelected?.wsp?.map(e => e.id)
+        theFormData.append('toWorkspaceId', valuesWsp.join(',') )
+    }
+
     if (formFiles) {
       for (var i = 0; i < formFiles.length; i++) {
         theFormData.append('File[]', formFiles[i]);
@@ -683,6 +703,10 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
     setResourceData({...resourceData, theme: value})
   }
 
+  const handleResourceAccessibility = (_, {checked}) => {
+    setAccessibility(checked)
+  }
+
   const handleDuplicate = async () => {
     if(canDuplicate){
       setProcessingDuplicate(true);
@@ -776,6 +800,15 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
                 />
             </div>
         )}
+        {resourceType === 'book' && action !== 'create' && (
+            <div className='form-theme' style={{display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingInline: 20}}>
+                <label style={{fontWeight: 'bold', fontSize: 16}}><span style={{ color: 'tomato', fontSize: '1rem'}}>Test</span> Enable Accessibility: </label>
+                {loadingAccessibiliy
+                    ? (<Icon loading name='spinner' />)
+                    : (<Radio toggle defaultChecked={accessibility} onClick={handleResourceAccessibility}/>)
+                }
+            </div>
+        )}
         <SemanticForm
           id='sfu'
           className={fillAlert ? 'fill-alert' : ''}
@@ -835,7 +868,7 @@ export default function DynamicForm({ resourceType, action, schema, dataForUpdat
 
             <Grid item sm={12} className={classes.divider}>
               {dataForUpdate ? (
-                <ResourceActionButtons resource={dataForUpdate} themeBook={resourceData?.theme ?? DEFAULT_THEME_BOOK} />
+                <ResourceActionButtons resource={dataForUpdate} themeBook={resourceData?.theme ?? DEFAULT_THEME_BOOK} accessibility={accessibility}/>
               ) : null}
             </Grid>