diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js
index 26920638..f726ddd4 100644
--- a/app/src/components/Archive.js
+++ b/app/src/components/Archive.js
@@ -82,6 +82,7 @@ import Grid from "semantic-ui-react/dist/commonjs/collections/Grid";
import _ from "lodash";
import {Media, ThemeContext} from "../contexts/contexts";
import {Button, Card, darkTheme, Header, Loader, Placeholder, Popup, Segment, Statistic, Tab} from "./Theme";
+import {BulkTagModal} from "./BulkTagModal";
import {taggedImageLabel, TagsSelector} from "../Tags";
import {toast} from "react-semantic-toasts-2";
import {API_ARCHIVE_UPLOAD_URI, Downloaders} from "./Vars";
@@ -1080,6 +1081,7 @@ function ArchiveSettingsPage() {
function ArchivesPage() {
const [selectedArchives, setSelectedArchives] = useState([]);
+ const [bulkTagOpen, setBulkTagOpen] = useState(false);
const searchInputRef = React.useRef();
useHotkeys('f', (e) => {
@@ -1148,7 +1150,17 @@ function ArchivesPage() {
setSelectedArchives([]);
}
+ const onBulkTagComplete = async () => {
+ await fetchArchives();
+ setSelectedArchives([]);
+ }
+
const selectElm =
+
Clear
+ setBulkTagOpen(false)}
+ paths={selectedArchives}
+ onComplete={onBulkTagComplete}
+ />
;
- const {body, paginator, selectButton, viewButton, limitDropdown, tagQuerySelector} = FilesView(
+ const {body, paginator, viewButton, limitDropdown, tagQuerySelector} = FilesView(
{
files: archives,
activePage: activePage,
@@ -1222,11 +1240,10 @@ function ArchivesPage() {
- {selectButton}
{viewButton}
{limitDropdown}
{tagQuerySelector}
-
+
{searchInput}
@@ -1236,12 +1253,11 @@ function ArchivesPage() {
- {selectButton}
{viewButton}
{limitDropdown}
{tagQuerySelector}
- {searchInput}
+ {searchInput}
diff --git a/app/src/components/Docs.js b/app/src/components/Docs.js
index d7d6886e..2589b8e2 100644
--- a/app/src/components/Docs.js
+++ b/app/src/components/Docs.js
@@ -20,6 +20,7 @@ import {
useTitle
} from "./Common";
import {Button, darkTheme, Header, Icon, Segment, Statistic, Tab} from "./Theme";
+import {BulkTagModal} from "./BulkTagModal";
import {FilesView} from "./Files";
import {useAuthors, useDoc, useOneQuery, useSearchDocs, useSubjects} from "../hooks/customHooks";
import {TagsSelector} from "../Tags";
@@ -45,6 +46,7 @@ function DocsPage() {
} = useSearchDocs();
const [selectedDocs, setSelectedDocs] = useState([]);
+ const [bulkTagOpen, setBulkTagOpen] = useState(false);
const onSelect = (path, checked) => {
if (checked && path) {
@@ -71,7 +73,14 @@ function DocsPage() {
setSelectedDocs([]);
}
+ const onBulkTagComplete = async () => {
+ await fetchDocs();
+ setSelectedDocs([]);
+ }
+
const selectElm =
+
Invert
+ setBulkTagOpen(false)}
+ paths={selectedDocs}
+ onComplete={onBulkTagComplete}
+ />
;
let docOrders = [
@@ -94,7 +109,7 @@ function DocsPage() {
docOrders = [{value: 'rank', text: 'Rank'}, ...docOrders];
}
- const {body, paginator, selectButton, viewButton, limitDropdown, tagQuerySelector} = FilesView(
+ const {body, paginator, viewButton, limitDropdown, tagQuerySelector} = FilesView(
{
files: docs,
activePage: activePage,
@@ -122,11 +137,10 @@ function DocsPage() {
- {selectButton}
{viewButton}
{limitDropdown}
{tagQuerySelector}
-
+
{searchInput}
@@ -136,12 +150,11 @@ function DocsPage() {
- {selectButton}
{viewButton}
{limitDropdown}
{tagQuerySelector}
- {searchInput}
+ {searchInput}
diff --git a/app/src/components/Files.js b/app/src/components/Files.js
index 4ef45ac0..f1b7bdd1 100644
--- a/app/src/components/Files.js
+++ b/app/src/components/Files.js
@@ -353,31 +353,19 @@ export function FilesView(
) {
const {view} = useSearchView();
- let selectButton;
- const [selectOn, setSelectOn] = React.useState(false);
- const toggleSelectOn = () => setSelectOn(!selectOn);
- const selectButtonDisabled = view !== 'list';
- if (selectOn) {
- selectButton =