Merge and resolve conflict in recently-used.ts

Author: atharvsp02

.eslintrc.js

@@ -118,7 +118,7 @@ const bestPracticesRules = {
 	'no-param-reassign': ERROR,
 	'no-proto': ERROR,
 	'no-return-assign': ERROR,
-	'no-return-await': ERROR,
+	'no-return-await': TRANSITION_IGNORE,
 	'no-script-url': ERROR,
 	'no-self-compare': ERROR,
 	'no-sequences': ERROR,

.github/workflows/release-drafter.yml

@@ -0,0 +1,22 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - stable
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        with:
+          disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

eslint.config.js

@@ -94,7 +94,7 @@ const bestPracticesRules = {
 	'no-param-reassign': ERROR,
 	'no-proto': ERROR,
 	'no-return-assign': ERROR,
-	'no-return-await': ERROR,
+	'no-return-await': TRANSITION_IGNORE,
 	'no-script-url': ERROR,
 	'no-self-compare': ERROR,
 	'no-sequences': ERROR,

package.json

@@ -59,7 +59,7 @@
     "isomorphic-dompurify": "^2.24.0",
     "jsesc": "^3.0.2",
     "lobes4": "4.0.1",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "log": "^6.0.0",
     "log-node": "^8.0.3",
     "mocha-chai-jest-snapshot": "^1.1.4",
@@ -91,7 +91,7 @@
     "superagent": "^10.2.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^4.6.0",
-    "validator": "^13.15.20"
+    "validator": "^13.15.22"
   },
   "devDependencies": {
     "@babel/cli": "^7.28.3",
@@ -144,7 +144,7 @@
     "sass-loader": "^13.2.0",
     "sinon": "^19.0.2",
     "typescript": "^4.0.5",
-    "webpack": "^5.94.0",
+    "webpack": "^5.104.1",
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-middleware": "^7.4.2",

src/client/components/footer.js src/client/components/footer.tsxsrc/client/components/footer.js renamed to src/client/components/footer.tsx

@@ -19,16 +19,16 @@
  */
 
 import * as bootstrap from 'react-bootstrap';
-
-import PropTypes from 'prop-types';
 import React from 'react';
 
 
 const {Col, Container, Row} = bootstrap;
 
-function Footer(props) {
-	const {repositoryUrl, siteRevision} = props;
-
+type FooterProps = {
+    repositoryUrl: string;
+    siteRevision: string;
+};
+function Footer({repositoryUrl, siteRevision}: Props) {
 	return (
 		<footer className="footer">
 			<Container fluid>
@@ -89,10 +89,4 @@ function Footer(props) {
 	);
 }
 
-Footer.displayName = 'Footer';
-Footer.propTypes = {
-	repositoryUrl: PropTypes.string.isRequired,
-	siteRevision: PropTypes.string.isRequired
-};
-
 export default Footer;

src/client/components/forms/deletion.js

@@ -68,11 +68,11 @@ class EntityDeletionForm extends React.Component {
 			.then(() => {
 				window.location.href = this.entityUrl;
 			})
-			.catch((res) => {
-				const {error} = res.body;
-
+			.catch((err) => {
+				const {error: erroMessage} = err?.response?.body;
+				const statusText = err?.message ?? `Error ${err?.status}`;
 				this.setState({
-					error,
+					error: `${statusText}: ${erroMessage}`,
 					waiting: false
 				});
 			});

src/client/components/forms/type-editor/identifier-type.tsx

@@ -32,7 +32,6 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 	// State for the ParentType modal
 	const [showModal, setShowModal] = useState<boolean>(false);
 	const [selectedParentType, setSelectedParentType] = useState<number | null>(identifierTypeData.parentId);
-	const [childOrder, setChildOrder] = useState<number>(formData.childOrder);
 
 	const [filteredParentTypes, setFilteredParentTypes] = useState<IdentifierTypeDataT[]>(parentTypes);
 	useEffect(() => {
@@ -55,7 +54,6 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 	// Callback function for closing the modal, the state of the modal should alse be reset
 	const handleModalClose = useCallback(() => {
 		setSelectedParentType(null);
-		setChildOrder(0);
 		setShowModal(false);
 	}, []);
 
@@ -69,18 +67,12 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 		}
 	}, [selectedParentType]);
 
-	// Function to handle child order input in ParentType modal
-	const handleChildOrderChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
-		setChildOrder(event.target.valueAsNumber || 0);
-	}, [formData, childOrder]);
-
 	// Function to handle parent removal
 	const handleRemoveParent = useCallback(() => {
 		setFormData((prevFormData) => ({
 			...prevFormData,
 			childOrder: 0, parentId: null
 		}));
-		setChildOrder(0);
 		setSelectedParentType(null);
 	}, [formData]);
 
@@ -93,11 +85,11 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 		if (selectedParentType !== null) {
 			setFormData((prevFormData) => ({
 				...prevFormData,
-				childOrder, parentId: selectedParentType
+				parentId: selectedParentType
 			}));
 			setShowModal(false);
 		}
-	}, [formData, childOrder, selectedParentType]);
+	}, [formData, selectedParentType]);
 
 	const handleInputChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
 		  const {name, value} = event.target;
@@ -179,7 +171,7 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 
 		try {
 			await request.post(submissionURL).send(formData);
-			window.location.href = '/identifier-types';
+			window.location.href = document.referrer;
 		}
 		catch (err) {
 			const errorMessage = err.response.body.error;
@@ -346,6 +338,22 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 							</Form.Group>
 						</Col>
 					</Row>
+					<Row>
+						<Col lg={lgCol}>
+							<Form.Group >
+								<Form.Label>Child Order</Form.Label>
+								<Form.Control
+									required
+									defaultValue={0}
+									min={0}
+									name="childOrder"
+									type="number"
+									value={formData.childOrder}
+									onChange={handleInputChange}
+								/>
+							</Form.Group>
+						</Col>
+					</Row>
 
 					<Row>
 						<Col lg={lgCol}>
@@ -397,17 +405,6 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE
 									onChange={handleParentTypeChange}
 								/>
 							</Form.Group>
-							<Form.Group >
-								<Form.Label>Child Order</Form.Label>
-								<Form.Control
-									required
-									min={0}
-									name="childOrder"
-									type="number"
-									value={childOrder}
-									onChange={handleChildOrderChange}
-								/>
-							</Form.Group>
 						</Modal.Body>
 						<Modal.Footer>
 							<Button variant="secondary" onClick={handleModalClose}>

src/client/components/forms/type-editor/relationship-type.tsx

@@ -32,7 +32,6 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 	// State for the ParentType modal
 	const [showModal, setShowModal] = useState<boolean>(false);
 	const [selectedParentType, setSelectedParentType] = useState<number | null>(formData.parentId);
-	const [childOrder, setChildOrder] = useState<number>(formData.childOrder);
 
 	const [isFormEdited, setIsFormEdited] = useState(false);
 
@@ -96,7 +95,6 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 	// Callback function for closing the modal, the state of the modal should alse be reset
 	const handleModalClose = useCallback(() => {
 		setSelectedParentType(null);
-		setChildOrder(0);
 		setShowModal(false);
 	}, []);
 
@@ -110,19 +108,12 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 		}
 	}, [selectedParentType]);
 
-	// Function to handle child order input in ParentType modal
-	const handleChildOrderChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
-		const value = parseInt(event.target.value, 10);
-		setChildOrder(isNaN(value) ? 0 : value);
-	}, [formData, childOrder]);
-
 	// Function to handle parent removal
 	const handleRemoveParent = useCallback(() => {
 		setFormData((prevFormData) => ({
 			...prevFormData,
 			childOrder: 0, parentId: null
 		}));
-		setChildOrder(0);
 		setSelectedParentType(null);
 	}, [formData]);
 
@@ -135,11 +126,11 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 		if (selectedParentType !== null) {
 			setFormData((prevFormData) => ({
 				...prevFormData,
-				childOrder, parentId: selectedParentType
+				parentId: selectedParentType
 			}));
 			setShowModal(false);
 		}
-	}, [formData, childOrder, selectedParentType]);
+	}, [formData, selectedParentType]);
 
 	const handleInputChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
 		  const {name, value} = event.target;
@@ -233,7 +224,7 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 		try {
 			await request.post(submissionURL)
 				.send({oldAttributeTypes: relationshipTypeData.attributeTypes, ...formData});
-			window.location.href = '/relationship-types';
+			window.location.href = document.referrer;
 		}
 		catch (err) {
 			throw new Error(err);
@@ -405,6 +396,22 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 						</Col>
 					</Row>
 
+					<Row>
+						<Col lg={lgCol}>
+							<Form.Group >
+								<Form.Label>Child Order</Form.Label>
+								<Form.Control
+									required
+									defaultValue={0}
+									min={0}
+									name="childOrder"
+									type="number"
+									value={formData.childOrder}
+									onChange={handleInputChange}
+								/>
+							</Form.Group>
+						</Col>
+					</Row>
 					<Row>
 						<Col lg={lgCol}>
 							<Form.Group>
@@ -480,17 +487,6 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp
 									onChange={handleParentTypeChange}
 								/>
 							</Form.Group>
-							<Form.Group >
-								<Form.Label>Child Order</Form.Label>
-								<Form.Control
-									required
-									min={0}
-									name="childOrder"
-									type="number"
-									value={childOrder}
-									onChange={handleChildOrderChange}
-								/>
-							</Form.Group>
 						</Modal.Body>
 						<Modal.Footer>
 							<Button variant="secondary" onClick={handleModalClose}>

src/client/components/pages/entities/edition.js

@@ -19,9 +19,9 @@
 import * as bootstrap from 'react-bootstrap';
 import * as entityHelper from '../../../helpers/entity';
 import AuthorCreditDisplay from '../../author-credit-display';
+import EditionCover from '../parts/edition-cover';
 import EntityAnnotation from './annotation';
 import EntityFooter from './footer';
-import EntityImage from './image';
 import EntityLinks from './links';
 import EntityRelatedCollections from './related-collections';
 import EntityTitle from './title';
@@ -155,14 +155,15 @@ function EditionDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 	return (
 		<div>
 			<Row className="entity-display-background">
-				<Col className="entity-display-image-box text-center" lg={2}>
-					<EntityImage
+				<Col className="entity-display-image-box text-center" lg={3}>
+					<EditionCover
 						backupIcon={ENTITY_TYPE_ICONS.Edition}
 						deleted={entity.deleted}
-						imageUrl={entity.imageUrl}
+						editionName={entity.defaultAlias?.name || entity.name}
+						identifiers={entity.identifierSet?.identifiers}
 					/>
 				</Col>
-				<Col lg={10}>
+				<Col lg={9}>
 					<EntityTitle entity={entity}/>
 					{authorCreditSection}
 					<hr/>