From 0765890b8b1e4bdcf541a5875cbf770a7064a4ba Mon Sep 17 00:00:00 2001 From: lrnselfreliance <33263708+lrnselfreliance@users.noreply.github.com> Date: Mon, 16 May 2022 17:56:55 -0600 Subject: [PATCH] Feature/127 archive UI rework (#131) * Archives have their own page. Delete/etc buttons are moved into ArchivePage. * Alternatives for an Archive are displayed in the ArchivePage. * ArchiveDownloader returns the location. * Removing color from Details button. * Making Archive screenshot and title a link. * Preserving next_download when updating a Channel. * Removing button icons from Archive page. --- app/src/api.js | 15 ++ app/src/components/Admin.js | 2 +- app/src/components/Archive.js | 195 ++++++++++++++---------- app/src/components/Common.js | 12 ++ app/src/hooks/customHooks.js | 23 +++ app/src/static/wrolpi.css | 24 +++ modules/archive/__init__.py | 4 +- modules/archive/api.py | 9 ++ modules/archive/lib.py | 15 +- modules/archive/models.py | 12 ++ modules/videos/channel/test/test_api.py | 23 ++- modules/videos/models.py | 3 +- 12 files changed, 238 insertions(+), 99 deletions(-) diff --git a/app/src/api.js b/app/src/api.js index 963c5735..c24ef47f 100644 --- a/app/src/api.js +++ b/app/src/api.js @@ -430,6 +430,21 @@ export async function fetchDomains() { } } +export async function getArchive(archiveId) { + const response = await apiGet(`${ARCHIVES_API}/${archiveId}`); + if (response.status === 200) { + const data = await response.json(); + return [data['archive'], data['alternatives']]; + } else { + toast({ + type: 'error', + title: 'Archive Error', + description: 'Unable to get Archive. See server logs.', + time: 5000, + }); + } +} + export async function postDownload(urls, downloader) { let body = {urls: urls, downloader: downloader}; let response = await apiPost(`${API_URI}/download`, body); diff --git a/app/src/components/Admin.js b/app/src/components/Admin.js index f028672e..4e3f32f0 100644 --- a/app/src/components/Admin.js +++ b/app/src/components/Admin.js @@ -460,7 +460,7 @@ class StoppableRow extends React.Component { open={errorModalOpen} trigger={; - if (readabilityUrl) { - readabilityIcon = ( - ); + const localSyncArchive = async () => { + setSyncOpen(false); + await postDownload(archive.url, 'archive'); } - let syncIcon = null; - if (syncArchive) { - syncIcon = (<> - - setSyncOpen(false)} - onConfirm={localSyncArchive} - /> - ); + const syncButton = (<> + - setDeleteOpen(false)} - onConfirm={localDeleteArchive} + return ( + <> + - ); +function ArchiveCard({archive, setDomain}) { + + const imageSrc = archive.screenshot_path ? `/media/${encodeURIComponent(archive.screenshot_path)}` : null; + const singlefileUrl = archive.singlefile_path ? `/media/${encodeURIComponent(archive.singlefile_path)}` : null; const domain = archive.domain.domain; @@ -98,36 +139,35 @@ function ArchiveCard({archive, syncArchive, deleteArchive, setDomain}) { - setDomain(domain)} className="no-link-underscore card-link"> - {textEllipsis(domain, 40)} - + {setDomain && + setDomain(domain)} className="no-link-underscore card-link"> + {textEllipsis(domain, 40)} + + }

{uploadDate(archive.archive_datetime)}

- - {readabilityIcon} - {syncIcon} - {deleteIcon} - {externalIcon} - + +