don't show collections for trash files
This commit is contained in:
parent
572e680090
commit
e7be5e679c
|
@ -44,6 +44,7 @@ interface Iprops {
|
||||||
refreshPhotoswipe: () => void;
|
refreshPhotoswipe: () => void;
|
||||||
fileToCollectionsMap: Map<number, number[]>;
|
fileToCollectionsMap: Map<number, number[]>;
|
||||||
collectionNameMap: Map<number, string>;
|
collectionNameMap: Map<number, string>;
|
||||||
|
isTrashCollection: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
function BasicDeviceCamera({
|
function BasicDeviceCamera({
|
||||||
|
@ -77,6 +78,7 @@ export function FileInfo({
|
||||||
refreshPhotoswipe,
|
refreshPhotoswipe,
|
||||||
fileToCollectionsMap,
|
fileToCollectionsMap,
|
||||||
collectionNameMap,
|
collectionNameMap,
|
||||||
|
isTrashCollection,
|
||||||
}: Iprops) {
|
}: Iprops) {
|
||||||
const [location, setLocation] = useState<Location>(null);
|
const [location, setLocation] = useState<Location>(null);
|
||||||
const [parsedExifData, setParsedExifData] = useState<Record<string, any>>();
|
const [parsedExifData, setParsedExifData] = useState<Record<string, any>>();
|
||||||
|
@ -244,7 +246,7 @@ export function FileInfo({
|
||||||
caption={formatTime(file.metadata.modificationTime / 1000)}
|
caption={formatTime(file.metadata.modificationTime / 1000)}
|
||||||
hideEditOption
|
hideEditOption
|
||||||
/>
|
/>
|
||||||
|
{!isTrashCollection && (
|
||||||
<InfoItem icon={<FolderOutlined />} hideEditOption>
|
<InfoItem icon={<FolderOutlined />} hideEditOption>
|
||||||
<Box
|
<Box
|
||||||
display={'flex'}
|
display={'flex'}
|
||||||
|
@ -254,6 +256,9 @@ export function FileInfo({
|
||||||
alignItems={'flex-start'}>
|
alignItems={'flex-start'}>
|
||||||
{fileToCollectionsMap
|
{fileToCollectionsMap
|
||||||
.get(file.id)
|
.get(file.id)
|
||||||
|
?.filter((collectionID) =>
|
||||||
|
collectionNameMap.has(collectionID)
|
||||||
|
)
|
||||||
?.map((collectionID) => (
|
?.map((collectionID) => (
|
||||||
<Chip key={collectionID}>
|
<Chip key={collectionID}>
|
||||||
{collectionNameMap.get(collectionID)}
|
{collectionNameMap.get(collectionID)}
|
||||||
|
@ -261,6 +266,7 @@ export function FileInfo({
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
</InfoItem>
|
</InfoItem>
|
||||||
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
<ExifData
|
<ExifData
|
||||||
exif={exif}
|
exif={exif}
|
||||||
|
|
|
@ -630,6 +630,7 @@ function PhotoViewer(props: Iprops) {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<FileInfo
|
<FileInfo
|
||||||
|
isTrashCollection={props.isTrashCollection}
|
||||||
shouldDisableEdits={props.isSharedCollection}
|
shouldDisableEdits={props.isSharedCollection}
|
||||||
showInfo={showInfo}
|
showInfo={showInfo}
|
||||||
handleCloseInfo={handleCloseInfo}
|
handleCloseInfo={handleCloseInfo}
|
||||||
|
|
Loading…
Reference in a new issue