mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
ui: keep the unmigrated pages' notifications working
Greptile P1, and a real one: App.js migrated and took `<SemanticToastContainer/>` with it, but seven pages -- Archive, Channels, Docs, FilePreview, Playlists, Zim, ControllerPage -- still raised their toasts through the Semantic library. With no container mounted those notifications went nowhere. No error, no warning; a user deletes a document and is simply never told whether it worked. Fixed by pointing those seven at the library's `toast`, which takes the same options, rather than by mounting a second toast system. Nothing calls the Semantic toast library now, so a test asserts that at zero: a file that goes back to it would raise notifications that silently never appear, and that is not something a reviewer would spot. Also reverted Archive.js to its last good state. An interrupted agent had migrated part of it -- Panel, Tabs, and Mantine's Grid.Col -- while the rest of the file still used Semantic's Segment, Tab and Grid.Row, so a single `Grid` identifier had to be two different components at once. A half-migrated 1400-line file is worse than an unmigrated one; it goes back on the list and gets done in one piece. That break was masked: react-scripts caches ESLint results per file, so the earlier build passed while Archive.js sat on a stale pass. Editing its import invalidated the entry and the errors appeared. Verified with the cache cleared this time, which is the only way that check means anything after a wide change.
This commit is contained in:
parent
e8dd804010
commit
f8bef9fc23
8 changed files with 98 additions and 75 deletions
|
|
@ -85,7 +85,7 @@ import {Button, Card, darkTheme, Header, Loader, Placeholder, Popup, Segment, St
|
|||
import {BulkTagModal} from "./BulkTagModal";
|
||||
import {taggedImageLabel, TagsSelector} from "../Tags";
|
||||
import {AddToPlaylistButton} from "./AddToPlaylist";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
import {API_ARCHIVE_UPLOAD_URI, Downloaders} from "./Vars";
|
||||
import {CollectionTable} from "./collections/CollectionTable";
|
||||
import {CollectionEditForm} from "./collections/CollectionEditForm";
|
||||
|
|
@ -237,12 +237,28 @@ function ArchivePage() {
|
|||
? isoDatetimeToAgoPopup(archiveFile.published_modified_datetime, true)
|
||||
: 'unknown';
|
||||
|
||||
const aboutPane = {
|
||||
menuItem: 'About', render: () => <Tab.Pane>
|
||||
<Header as={'h3'}>Domain</Header>
|
||||
{domainHeader}
|
||||
|
||||
<Header as='h3'>Size</Header>
|
||||
{humanFileSize(size)}
|
||||
|
||||
<Header as={'h3'}>URL</Header>
|
||||
<p>{archiveFile.url ? <a href={archiveFile.url}>{archiveFile.url}</a> : 'N/A'}</p>
|
||||
|
||||
<Header as={'h3'}>Modified Date</Header>
|
||||
<p>{modifiedDatetimeString}</p>
|
||||
</Tab.Pane>
|
||||
};
|
||||
|
||||
// Helper to find file size from the files array by resolved path
|
||||
const findFileSize = (resolvedPath) => {
|
||||
if (!resolvedPath || !archiveFile.files) return null;
|
||||
const file = archiveFile.files.find(i => String(i.path) === String(resolvedPath));
|
||||
return file && file.size
|
||||
? <span style={{marginLeft: '1em', color: 'var(--muted)'}}>({humanFileSize(file.size)})</span>
|
||||
? <span style={{marginLeft: '1em', color: 'grey'}}>({humanFileSize(file.size)})</span>
|
||||
: null;
|
||||
};
|
||||
|
||||
|
|
@ -259,11 +275,51 @@ function ArchivePage() {
|
|||
|
||||
const tableStyle = {width: '100%', borderCollapse: 'separate', borderSpacing: '0 0.7em'};
|
||||
const labelStyle = {whiteSpace: 'nowrap', paddingRight: '1.5em', verticalAlign: 'top'};
|
||||
const filesPane = {
|
||||
menuItem: 'Files', render: () => <Tab.Pane>
|
||||
<table style={tableStyle}>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Singlefile File</strong></td>
|
||||
<td>{localPreviewPath(data.singlefile_path, 'text/html')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_path, 'text/html')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability Text File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_txt_path, 'text/plain')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability JSON File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_json_path, 'application/json')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Screenshot File</strong></td>
|
||||
<td>
|
||||
{screenshotPath
|
||||
? <><PreviewPath path={screenshotPath} mimetype='image/*'
|
||||
taggable={false}>{screenshotPath}</PreviewPath>{findFileSize(screenshotPath)}</>
|
||||
: 'Unknown'}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Directory</strong></td>
|
||||
<td><DirectoryLink path={archiveFile.directory}/></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</Tab.Pane>
|
||||
};
|
||||
|
||||
const tabPanes = [aboutPane, filesPane];
|
||||
const tabMenu = theme === darkTheme ? {inverted: true, attached: true} : {attached: true};
|
||||
|
||||
return <>
|
||||
<BackButton/>
|
||||
|
||||
<Panel>
|
||||
<Segment>
|
||||
{screenshot}
|
||||
<ExternalCardLink to={singlefileUrl}>
|
||||
<Header as='h2'>{textEllipsis(archiveFile.title || data.url)}</Header>
|
||||
|
|
@ -271,13 +327,15 @@ function ArchivePage() {
|
|||
|
||||
<Header as='h3'>Author: {archiveFile.author ? archiveFile.author : 'unknown'}</Header>
|
||||
|
||||
<Grid>
|
||||
<Grid.Col span={{base: 12, sm: 6}}>
|
||||
<Header as='h4'>Published: {publishedDatetimeString}</Header>
|
||||
</Grid.Col>
|
||||
<Grid.Col span={{base: 12, sm: 6}}>
|
||||
<Header as='h4'>Downloaded: {downloadDatetimeString}</Header>
|
||||
</Grid.Col>
|
||||
<Grid columns={2} stackable>
|
||||
<GridRow>
|
||||
<GridColumn>
|
||||
<Header as='h4'>Published: {publishedDatetimeString}</Header>
|
||||
</GridColumn>
|
||||
<GridColumn>
|
||||
<Header as='h4'>Downloaded: {downloadDatetimeString}</Header>
|
||||
</GridColumn>
|
||||
</GridRow>
|
||||
</Grid>
|
||||
|
||||
{singlefileButton}
|
||||
|
|
@ -286,78 +344,25 @@ function ArchivePage() {
|
|||
{deleteButton}
|
||||
{generateScreenshotButton}
|
||||
<AddToPlaylistButton fileGroupId={archiveFile.id}/>
|
||||
</Panel>
|
||||
</Segment>
|
||||
|
||||
<Panel>
|
||||
<Segment>
|
||||
<TagsSelector
|
||||
selectedTagNames={archiveFile['tags']}
|
||||
onAdd={localAddTag}
|
||||
onRemove={localRemoveTag}
|
||||
/>
|
||||
</Panel>
|
||||
</Segment>
|
||||
|
||||
<Tabs defaultValue='about'>
|
||||
<Tabs.List>
|
||||
<Tabs.Tab value='about'>About</Tabs.Tab>
|
||||
<Tabs.Tab value='files'>Files</Tabs.Tab>
|
||||
</Tabs.List>
|
||||
<Tabs.Panel value='about' pt='md'>
|
||||
<Header as='h3'>Domain</Header>
|
||||
{domainHeader}
|
||||
<Tab menu={tabMenu} panes={tabPanes}/>
|
||||
|
||||
<Header as='h3'>Size</Header>
|
||||
{humanFileSize(size)}
|
||||
|
||||
<Header as='h3'>URL</Header>
|
||||
<p>{archiveFile.url ? <a href={archiveFile.url}>{archiveFile.url}</a> : 'N/A'}</p>
|
||||
|
||||
<Header as='h3'>Modified Date</Header>
|
||||
<p>{modifiedDatetimeString}</p>
|
||||
</Tabs.Panel>
|
||||
<Tabs.Panel value='files' pt='md'>
|
||||
<table style={tableStyle}>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Singlefile File</strong></td>
|
||||
<td>{localPreviewPath(data.singlefile_path, 'text/html')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_path, 'text/html')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability Text File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_txt_path, 'text/plain')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Readability JSON File</strong></td>
|
||||
<td>{localPreviewPath(data.readability_json_path, 'application/json')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Screenshot File</strong></td>
|
||||
<td>
|
||||
{screenshotPath
|
||||
? <><PreviewPath path={screenshotPath} mimetype='image/*'
|
||||
taggable={false}>{screenshotPath}</PreviewPath>{findFileSize(screenshotPath)}</>
|
||||
: 'Unknown'}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style={labelStyle}><strong>Directory</strong></td>
|
||||
<td><DirectoryLink path={archiveFile.directory}/></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</Tabs.Panel>
|
||||
</Tabs>
|
||||
|
||||
<Panel>
|
||||
<Segment>
|
||||
<InfoHeader
|
||||
headerContent='History'
|
||||
popupContent='Other archives of this URL created at different times.'
|
||||
/>
|
||||
{historyList}
|
||||
</Panel>
|
||||
</Segment>
|
||||
|
||||
<TaggedDeleteConfirmModal
|
||||
open={taggedFileGroups !== null}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import Message from "semantic-ui-react/dist/commonjs/collections/Message";
|
|||
import {useChannel, useChannels, useOneQuery} from "../hooks/customHooks";
|
||||
import _ from "lodash";
|
||||
import {Button, Form, Header, Loader, Modal, Segment, Statistic} from "./Theme";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
import {RecurringDownloadsTable} from "./admin/Downloads";
|
||||
import {InputForm, ToggleForm} from "../hooks/useForm";
|
||||
import {ChannelDownloadForm, DestinationForm, DownloadTagsSelector} from "./Download";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import {TaggedDeleteConfirmModal} from "./TaggedDeleteConfirmModal";
|
|||
import {DeepSearchHint, docMimetypeFilterOptions, FilesView, SearchControlBar} from "./Files";
|
||||
import {useAuthors, useDoc, useOneQuery, useSearchDocs, useSubjects} from "../hooks/customHooks";
|
||||
import {TagsSelector} from "../Tags";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
import {CollectionTable} from "./collections/CollectionTable";
|
||||
import {AddToPlaylistButton} from "./AddToPlaylist";
|
||||
import {CbzViewer} from "./CbzViewer";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import {ArchivePreviewContent} from "./ArchivePreview";
|
|||
import {CbzViewer} from "./CbzViewer";
|
||||
import {StlViewer} from "react-stl-viewer";
|
||||
import {Button, Modal} from "./Theme";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
import {useOneQuery} from "../hooks/customHooks";
|
||||
import {ShareButton} from "./Share";
|
||||
import {AddToPlaylistButton} from "./AddToPlaylist";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import React, {useEffect, useState} from "react";
|
||||
import {Link, Route, Routes, useNavigate, useParams} from "react-router";
|
||||
import {Grid, Image, Input, Message} from "semantic-ui-react";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
|
||||
import {Button, Form, Header, Icon, Loader, Modal, Segment, Table} from "./Theme";
|
||||
import {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import {TagsQuerySelector} from "./Files";
|
|||
import {ThemeContext} from "../contexts/contexts";
|
||||
import {Link, Route, Routes} from "react-router";
|
||||
import {SortableTable} from "./SortableTable";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "./ui";
|
||||
import _ from "lodash";
|
||||
import {ZIM_VIEWER_URI} from "./Vars";
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import {
|
|||
updateHotspotSettings,
|
||||
} from "../../api/controller";
|
||||
import QRCode from "react-qr-code";
|
||||
import {toast} from "react-semantic-toasts-2";
|
||||
import {toast} from "../ui";
|
||||
import {RestartButton, ShutdownButton} from "./Settings";
|
||||
import Message from "semantic-ui-react/dist/commonjs/collections/Message";
|
||||
import {CONTROLLER_URI} from "../Vars";
|
||||
|
|
|
|||
|
|
@ -48,6 +48,24 @@ describe('Semantic UI removal', () => {
|
|||
expect(stale).toEqual([]);
|
||||
});
|
||||
|
||||
it('has nobody left calling the Semantic toast library', () => {
|
||||
/*
|
||||
* This one is a ratchet at zero, not a shrinking list.
|
||||
*
|
||||
* The Semantic toasts only appear if `<SemanticToastContainer/>` is mounted, and
|
||||
* that container came out of App.js when App.js migrated. Any file that goes back
|
||||
* to importing `toast` from react-semantic-toasts-2 would therefore raise
|
||||
* notifications that silently never appear — no error, no warning, just a delete
|
||||
* or a failure the user is never told about. Import `toast` from
|
||||
* `src/components/ui` instead; it takes the same options.
|
||||
*/
|
||||
const TOASTS = /from ['"]react-semantic-toasts-2/;
|
||||
const importers = sourceFiles()
|
||||
.filter(file => TOASTS.test(fs.readFileSync(path.join(SRC, '..', file), 'utf8')));
|
||||
|
||||
expect(importers).toEqual([]);
|
||||
});
|
||||
|
||||
it('declares every migrated file that still leans on Semantic CSS classes', () => {
|
||||
/*
|
||||
* A file can stop importing semantic-ui-react and still depend on its stylesheet
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue