From 6598e6fe681946621bcaa68a09db051273111234 Mon Sep 17 00:00:00 2001
From: Anthony Geourjon <anthony.geourjon@tetras-libre.fr>
Date: Wed, 8 Mar 2023 15:54:33 +0100
Subject: [PATCH] Back to normal working with component
---
.../AnnotationManifestsAccordion.js | 8 +---
src/components/AnnotationManifestsItem.js | 37 ++++++++++++-------
src/components/CanvasAnnotations.js | 2 -
src/containers/AnnotationManifestsItem.js | 6 +--
4 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/components/AnnotationManifestsAccordion.js b/src/components/AnnotationManifestsAccordion.js
index 5851ed129..3a8e410ff 100644
--- a/src/components/AnnotationManifestsAccordion.js
+++ b/src/components/AnnotationManifestsAccordion.js
@@ -5,12 +5,7 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMoreSharp';
import Typography from '@material-ui/core/Typography';
import AccordionDetails from '@material-ui/core/AccordionDetails';
import PropTypes from 'prop-types';
-import {
- Card, CardActionArea, CardActions, CardContent, CardMedia, Fab,
-} from '@material-ui/core';
-import Button from '@material-ui/core/Button';
-import Tooltip from '@material-ui/core/Tooltip';
-import { AnnotationManifestsItem } from './AnnotationManifestsItem';
+import AnnotationManifestsItem from '../containers/AnnotationManifestsItem';
/**
* AnnotationManifestsAccordion
@@ -78,6 +73,7 @@ export class AnnotationManifestsAccordion extends Component {
manifestId={manifest.id}
language={i18n.language}
key={manifest}
+ t={t}
/>
))}
</AccordionDetails>
diff --git a/src/components/AnnotationManifestsItem.js b/src/components/AnnotationManifestsItem.js
index 260f55796..ff7db0289 100644
--- a/src/components/AnnotationManifestsItem.js
+++ b/src/components/AnnotationManifestsItem.js
@@ -17,6 +17,12 @@ export class AnnotationManifestsItem extends Component {
constructor(props) {
super(props);
this.handleOpenManifestSideToSide = this.handleOpenManifestSideToSide.bind(this);
+
+ /* const {
+ fetchManifest, manifestId, ready, isFetching, error, provider,
+ } = props;
+
+ if (!ready && !error && !isFetching && provider !== 'file') fetchManifest(manifestId); */
}
/** */
@@ -26,19 +32,10 @@ export class AnnotationManifestsItem extends Component {
addWindow({ manifestId });
}
- /** */
- componentDidMount() {
- const {
- fetchManifest, manifestId, ready, isFetching, error, provider,
- } = this.props;
-
- if (!ready && !error && !isFetching && provider !== 'file') fetchManifest(manifestId);
- }
-
/** */
render() {
const {
- classes, t, language, manifest,
+ classes, t, language, manifestId,
} = this.props;
return (
@@ -47,17 +44,17 @@ export class AnnotationManifestsItem extends Component {
<CardActionArea>
<CardContent>
<Typography>
- { manifest.label ? manifest.label[language] : manifest.id }
+ { manifestId }
</Typography>
</CardContent>
</CardActionArea>
<CardActions>
- <Tooltip title={t('openManifestInOtherWindow', { manifest: manifest.id })}>
+ <Tooltip title={t('openManifestInOtherWindow', { manifestId })}>
<Button
size="small"
color="primary"
onClick={(e) => {
- this.handleOpenManifestSideToSide(e, manifest.id);
+ this.handleOpenManifestSideToSide(e, manifestId);
}}
>
{t('open')}
@@ -77,8 +74,22 @@ AnnotationManifestsItem.propsTypes = {
fetchManifest: PropTypes.func.isRequired,
manifests: PropTypes.arrayOf(PropTypes.string),
t: PropTypes.func.isRequired,
+ manifestLogo: PropTypes.string,
+ provider: PropTypes.string,
+ ready: PropTypes.bool,
+ isFetching: PropTypes.bool,
+ error: PropTypes.string,
+ thumbnail: PropTypes.string,
+ title: PropTypes.string,
};
AnnotationManifestsItem.defaultProps = {
classes: {},
+ error: null,
+ isFetching: false,
+ manifestLogo: null,
+ provider: null,
+ ready: false,
+ thumbnail: null,
+ title: null,
};
diff --git a/src/components/CanvasAnnotations.js b/src/components/CanvasAnnotations.js
index a45baead1..89ee726e6 100644
--- a/src/components/CanvasAnnotations.js
+++ b/src/components/CanvasAnnotations.js
@@ -7,8 +7,6 @@ import MenuItem from '@material-ui/core/MenuItem';
import ListItemText from '@material-ui/core/ListItemText';
import Typography from '@material-ui/core/Typography';
import SearchIcon from '@material-ui/icons/SearchSharp';
-import InputBase from '@material-ui/core/InputBase';
-import CircularProgress from '@material-ui/core/CircularProgress';
import TextField from '@material-ui/core/TextField';
import SanitizedHtml from '../containers/SanitizedHtml';
import { ScrollTo } from './ScrollTo';
diff --git a/src/containers/AnnotationManifestsItem.js b/src/containers/AnnotationManifestsItem.js
index 985132cb6..74db09ef8 100644
--- a/src/containers/AnnotationManifestsItem.js
+++ b/src/containers/AnnotationManifestsItem.js
@@ -6,11 +6,9 @@ import { withPlugins } from '../extend/withPlugins';
import * as actions from '../state/actions';
import { AnnotationManifestsItem } from '../components/AnnotationManifestsItem';
import {
- getCanvases,
getManifest, getManifestLogo,
- getManifestoInstance, getManifestProvider, getManifestThumbnail, getManifestTitle,
- getSequenceBehaviors,
- getWindowManifests
+ getManifestProvider, getManifestThumbnail, getManifestTitle,
+ getWindowManifests,
} from '../state/selectors';
/** For connect */
--
GitLab