Skip to content

Commit f0aebeb

Browse files
ddelpianoddelpiano
authored
Merge pull request #134 from MetaCell/feature/ILEX-95-2
minor fixes
2 parents 102cc0d + 1208aff commit f0aebeb

5 files changed

Lines changed: 117 additions & 33 deletions

File tree

‎src/components/Dashboard/EditBulkTerms/EditBulkTermsDialog.jsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { patchTerm } from "../../../api/endpoints";
1515

1616
const initialSearchConditions = { attribute: '', value: '', condition: 'where', relation: SearchTermsData.objectOptions[0].value }
1717

18-
const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBack, setActiveStep, isAllFieldsFilled, selectedOntology, isUpdating }) => {
18+
const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBack, setActiveStep, isAllFieldsFilled, selectedOntology, isUpdating, ontologyTerms }) => {
1919
return (
2020
<Box display='flex' alignItems='center' gap='.75rem'>
2121
<MobileStepper
@@ -47,7 +47,7 @@ const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBac
4747
variant='contained'
4848
color='primary'
4949
onClick={handleNext}
50-
disabled={(activeStep === 0 && !isAllFieldsFilled && !selectedOntology) || isUpdating}
50+
disabled={(activeStep === 0 && (!isAllFieldsFilled && !selectedOntology)) || (activeStep === 0 && selectedOntology && (!ontologyTerms || ontologyTerms.length === 0)) || isUpdating}
5151
>
5252
{isUpdating ? 'Saving Changes...' : 'Continue'}
5353
</Button>
@@ -65,6 +65,8 @@ HeaderRightSideContent.propTypes = {
6565
setActiveStep: PropTypes.func.isRequired,
6666
isAllFieldsFilled: PropTypes.bool.isRequired,
6767
selectedOntology: PropTypes.object,
68+
isUpdating: PropTypes.bool.isRequired,
69+
ontologyTerms: PropTypes.array,
6870
};
6971

7072
const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) => {
@@ -218,6 +220,7 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
218220
isAllFieldsFilled={isAllFieldsFilled(searchConditions)}
219221
selectedOntology={selectedOntology}
220222
isUpdating={isUpdating}
223+
ontologyTerms={ontologyTerms}
221224
/>
222225
}
223226
sx={{

‎src/components/Dashboard/EditBulkTerms/SearchTerms.jsx‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const styles = {
4848
},
4949
}
5050

51-
const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchConditions, setOntologyTerms, ontologyAttributes, setOntologyAttributes, selectedOntology, setSelectedOntology, setOriginalTerms }) => {
51+
const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchConditions, ontologyTerms, setOntologyTerms, ontologyAttributes, setOntologyAttributes, selectedOntology, setSelectedOntology, setOriginalTerms }) => {
5252
const [ontologyEditOption, setOntologyEditOption] = useState(Confirmation.Yes);
5353
const [attributesLoading, setAttributesLoading] = useState(false);
5454
const { user } = useContext(GlobalDataContext);
@@ -292,13 +292,20 @@ const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchCondi
292292
</Stack>
293293

294294
{ontologyEditOption === Confirmation.Yes && (
295-
<OntologySearch
296-
placeholder="Enter an Ontology URI"
297-
fullWidth
298-
extra={ontologySearchExtraStyles}
299-
userGroupname={user?.groupname}
300-
onOntologySelect={handleOntologySelect}
301-
/>
295+
<>
296+
<OntologySearch
297+
placeholder="Enter an Ontology URI"
298+
fullWidth
299+
extra={ontologySearchExtraStyles}
300+
userGroupname={user?.groupname}
301+
onOntologySelect={handleOntologySelect}
302+
/>
303+
{selectedOntology && ontologyTerms.length === 0 && !attributesLoading && (
304+
<Typography variant="body2" sx={{ mt: 2, color: 'warning.main', fontWeight: 500 }}>
305+
⚠️ The selected ontology &quot;{selectedOntology.label}&quot; contains no terms to edit.
306+
</Typography>
307+
)}
308+
</>
302309
)}
303310
</Box>
304311

‎src/components/Dashboard/EditBulkTerms/TermsTable.jsx‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ const TermsTable = ({ setOpenEditAttributes, setAttributes, attributes, ontology
112112
};
113113

114114
const sortedRows = React.useMemo(
115-
() => stableSort(terms || [], getComparator(order, orderBy)),
115+
() => {
116+
if (!terms || terms.length === 0) return [];
117+
return stableSort(terms, getComparator(order, orderBy));
118+
},
116119
[order, orderBy, terms]
117120
);
118121

@@ -156,7 +159,7 @@ const TermsTable = ({ setOpenEditAttributes, setAttributes, attributes, ontology
156159
</Box>
157160
}
158161
return (
159-
terms.length > 0 ? (
162+
terms && terms.length > 0 ? (
160163
<Box sx={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
161164
<Typography color={gray800} fontSize='1.125rem' fontWeight={600} mb='2.75rem'>
162165
Edit your terms or select an header to bulk edit that property
@@ -243,11 +246,11 @@ const TermsTable = ({ setOpenEditAttributes, setAttributes, attributes, ontology
243246
attributes={attributes}
244247
/>
245248
<TableBody>
246-
{sortedRows.map((row, index) => (
249+
{sortedRows && sortedRows.length > 0 ? sortedRows.map((row, index) => (
247250
<TableRow key={index}>
248251
{filteredColumns.map((column) => {
249252
const isEditing = editingCell?.rowIndex === index && editingCell?.columnId === column.id;
250-
const cellValue = row[column.id];
253+
const cellValue = row && row[column.id];
251254

252255
return (
253256
<TableCell
@@ -273,27 +276,51 @@ const TermsTable = ({ setOpenEditAttributes, setAttributes, attributes, ontology
273276
fullWidth
274277
sx={{ minWidth: 0 }}
275278
/>
276-
) : Array.isArray(cellValue) ? (
279+
) : Array.isArray(cellValue) && cellValue.length > 0 ? (
277280
<Stack gap='.25rem' direction="row" alignItems="center" maxWidth='20rem' flexWrap='wrap'>
278-
{cellValue.map((chip, chipIndex) => (
279-
<Chip key={`${chip}-${chipIndex}`} label={chip} className='rounded IDchip-outlined' icon={<OpenInNewOutlinedIcon />} onClick={() => handleChipClick(chip)} />
280-
))}
281+
{cellValue.map((chip, chipIndex) => {
282+
const chipLabel = typeof chip === 'object' && chip !== null
283+
? chip['@value'] || chip.value || chip['@id'] || JSON.stringify(chip)
284+
: chip || '';
285+
const chipValue = typeof chip === 'object' && chip !== null
286+
? chip['@id'] || chip.value || chip['@value']
287+
: chip;
288+
return (
289+
<Chip
290+
key={`${chipLabel}-${chipIndex}`}
291+
label={chipLabel}
292+
className='rounded IDchip-outlined'
293+
icon={<OpenInNewOutlinedIcon />}
294+
onClick={() => handleChipClick(chipValue)}
295+
/>
296+
);
297+
})}
281298
</Stack>
282299
) : column.id === '@id' ? (
283300
// Format the Interlex ID to show just the ID part - read-only display
284301
<span style={{ color: gray700, fontWeight: 500 }}>
285-
{cellValue?.split('/').pop() || cellValue}
302+
{(() => {
303+
if (!cellValue) return '';
304+
if (typeof cellValue === 'object') {
305+
const idValue = cellValue['@id'] || cellValue.id || cellValue['@value'] || JSON.stringify(cellValue);
306+
return typeof idValue === 'string' ? idValue.split('/').pop() || idValue : idValue;
307+
}
308+
return typeof cellValue === 'string' ? cellValue.split('/').pop() || cellValue : cellValue;
309+
})()}
286310
</span>
287311
) : (
288312
<span>
289-
{cellValue}
313+
{typeof cellValue === 'object' && cellValue !== null
314+
? cellValue['@value'] || cellValue.value || JSON.stringify(cellValue)
315+
: cellValue || ''
316+
}
290317
</span>
291318
)}
292319
</TableCell>
293320
);
294321
})}
295322
</TableRow>
296-
))}
323+
)) : null}
297324
</TableBody>
298325
</Table>
299326
</TableContainer>

‎src/components/SingleTermView/OntologySearch.jsx‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,17 @@ const OntologySearch = ({ placeholder, fullWidth = false, disabled, extra, userG
227227
setSearchTerm('');
228228
setSelectedValue(value);
229229

230+
// If value is null (cleared), also clear from context
231+
if (!value) {
232+
setOntologyData(null);
233+
console.log('Ontology cleared from context');
234+
}
235+
230236
// Call the callback if provided
231237
if (onOntologySelect) {
232238
onOntologySelect(value);
233239
}
234-
}, [onOntologySelect]);
240+
}, [onOntologySelect, setOntologyData]);
235241

236242
const popperProps = useMemo(() => ({
237243
sx: {
@@ -315,15 +321,18 @@ const OntologySearch = ({ placeholder, fullWidth = false, disabled, extra, userG
315321
<FolderSharedOutlinedIcon />
316322
</InputAdornment>
317323
),
318-
endAdornment: selectedValue?.selected && (
319-
<InputAdornment position='end'>
320-
<Chip
321-
label={selectedValue.badge}
322-
variant='outlined'
323-
size='small'
324-
sx={{ marginLeft: '0.5rem' }}
325-
/>
326-
</InputAdornment>
324+
endAdornment: (
325+
<Box sx={{ display: 'flex', alignItems: 'center' }}>
326+
{selectedValue?.selected && (
327+
<Chip
328+
label={selectedValue.badge}
329+
variant='outlined'
330+
size='small'
331+
sx={{ marginRight: '0.5rem' }}
332+
/>
333+
)}
334+
{params.InputProps.endAdornment}
335+
</Box>
327336
),
328337
}}
329338
sx={{
@@ -345,8 +354,9 @@ const OntologySearch = ({ placeholder, fullWidth = false, disabled, extra, userG
345354
<div ref={autocompleteRef} style={{ width: fullWidth ? '100%' : 'fit-content' }}>
346355
<Autocomplete
347356
disableCloseOnSelect
348-
disableClearable
357+
disableClearable={false}
349358
options={ontologies}
359+
value={selectedValue}
350360
open={openList}
351361
disabled={disabled}
352362
onOpen={handleOpenList}
@@ -360,7 +370,7 @@ const OntologySearch = ({ placeholder, fullWidth = false, disabled, extra, userG
360370
popper: popperProps,
361371
paper: { sx: paperStyles },
362372
}}
363-
inputValue={searchTerm ? searchTerm : selectedValue?.selected ? selectedValue?.label : ''}
373+
inputValue={searchTerm ? searchTerm : selectedValue?.selected ? selectedValue?.label : selectedValue?.label || ''}
364374
renderOption={renderOption}
365375
renderInput={renderInput}
366376
PaperComponent={PaperComponent}

‎vite.config.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,43 @@ export default defineConfig({
3838
});
3939
},
4040
},
41+
'^/([^/]+)/priv/password_change$': {
42+
target: "https://uri.olympiangods.org",
43+
secure: false,
44+
changeOrigin: true,
45+
rewrite: (path) => path, // keep full path
46+
configure: (proxy) => {
47+
proxy.on('error', (err, req) => {
48+
console.log('Password change proxy error:', err);
49+
console.log('Request URL:', req.url);
50+
});
51+
proxy.on('proxyReq', (proxyReq, req) => {
52+
console.log('Proxying password change request:', req.method, req.url);
53+
// pass through auth/cookies if present
54+
if (req.headers.authorization) proxyReq.setHeader('Authorization', req.headers.authorization);
55+
if (req.headers.cookie) proxyReq.setHeader('Cookie', req.headers.cookie);
56+
// Set appropriate content type for password change (likely form data)
57+
if (req.method === 'POST') {
58+
proxyReq.setHeader('Content-Type', 'application/x-www-form-urlencoded');
59+
}
60+
});
61+
proxy.on('proxyRes', (proxyRes, req, res) => {
62+
console.log('Password change response:', proxyRes.statusCode, req.url);
63+
// handle redirects
64+
const location = proxyRes.headers['location'];
65+
if (proxyRes.statusCode === 303 && location) {
66+
delete proxyRes.headers['location'];
67+
res.setHeader('X-Redirect-Location', location);
68+
}
69+
70+
// CORS headers
71+
const origin = req.headers.origin;
72+
if (origin) res.setHeader('Access-Control-Allow-Origin', origin);
73+
res.setHeader('Access-Control-Allow-Credentials', 'true');
74+
res.setHeader('Access-Control-Expose-Headers', 'X-Redirect-Location');
75+
});
76+
},
77+
},
4178
'^/([^/]+)/priv/entity(.*)': {
4279
target: "https://uri.olympiangods.org",
4380
secure: false,

0 commit comments

Comments
 (0)