Add deletion request handling and update related components

openlibrary/core/edits.py

@@ -43,6 +43,8 @@ class CommunityEditsQueue:
         {
             'WORK_MERGE': 1,
             'AUTHOR_MERGE': 2,
+            'WORK_DELETE': 3,
+            'AUTHOR_DELETE': 4,
         }
     )
 

openlibrary/i18n/messages.pot

@@ -1015,8 +1015,8 @@ msgstr ""
 msgid "View the editing history of this page"
 msgstr ""
 
-#: databarDiff.html databarEdit.html databarTemplate.html databarView.html
-#: lib/history.html openlibrary/plugins/openlibrary/home.py
+#: databarDiff.html databarEdit.html databarTemplate.html lib/history.html
+#: openlibrary/plugins/openlibrary/home.py
 msgid "History"
 msgstr ""
 
@@ -1032,27 +1032,27 @@ msgstr ""
 msgid "View this page (exit Edit mode)"
 msgstr ""
 
-#: databarHistory.html databarView.html
+#: databarHistory.html
 #, python-format
 msgid "Last edited by %(author_link)s"
 msgstr ""
 
-#: databarHistory.html databarView.html
+#: databarHistory.html
 msgid "Last edited anonymously"
 msgstr ""
 
-#: databarHistory.html databarView.html type/edition/compact_title.html
+#: databarHistory.html type/edition/compact_title.html
 msgid "Edit this page"
 msgstr ""
 
-#: account.html databarHistory.html databarTemplate.html databarView.html
+#: account.html databarHistory.html databarTemplate.html
 #: my_books/check_ins/check_in_prompt.html
 #: reading_goals/reading_goal_progress.html subjects.html
 #: type/edition/compact_title.html type/user/view.html
 msgid "Edit"
 msgstr ""
 
-#: databarTemplate.html databarView.html
+#: databarTemplate.html
 msgid "View this template's edit history"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "Status Summary"
 msgstr ""
 
-#: batch_import_view.html
+#: batch_import_view.html books/edit.html
 msgid "Approve"
 msgstr ""
 
@@ -2235,7 +2235,7 @@ msgid "Show changed files"
 msgstr ""
 
 #: admin/inspect/store.html admin/people/index.html status.html
-#: type/author/edit.html type/language/view.html
+#: type/language/view.html
 msgid "Name"
 msgstr ""
 
@@ -3368,7 +3368,6 @@ msgid "Infobase Mean"
 msgstr ""
 
 #: admin/history.html admin/imports.html authors/infobox.html
-#: type/author/edit.html
 msgid "Date"
 msgstr ""
 
@@ -4464,12 +4463,11 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: books/add.html books/edit.html
+#: books/add.html
 msgid "Use <b><i>Title: Subtitle</i></b> to add a subtitle."
 msgstr ""
 
-#: books/add.html books/edit.html type/author/edit.html
-#: type/tag/tag_form_inputs.html
+#: books/add.html type/tag/tag_form_inputs.html
 msgid "Required field"
 msgstr ""
 
@@ -4762,7 +4760,7 @@ msgstr ""
 msgid "Editing..."
 msgstr ""
 
-#: books/edit.html type/author/edit.html type/template/edit.html
+#: books/edit.html type/template/edit.html
 msgid "Delete Record"
 msgstr ""
 
@@ -4778,22 +4776,11 @@ msgstr ""
 msgid "This Work"
 msgstr ""
 
-#: books/edit.html
-msgid ""
-"You can search by author name (like <em>j k rowling</em>) or by Open "
-"Library ID (like <a href=\"/authors/OL23919A\" "
-"target=\"_blank\"><em>OL23919A</em></a>)."
-msgstr ""
-
-#: books/edit.html
-msgid "Author editing requires javascript"
-msgstr ""
-
 #: books/edit.html
 msgid "Add Excerpts"
 msgstr ""
 
-#: books/edit.html type/about/edit.html type/author/edit.html
+#: books/edit.html type/about/edit.html
 msgid "Links"
 msgstr ""
 
@@ -4802,14 +4789,7 @@ msgid "Work Identifiers"
 msgstr ""
 
 #: books/edit.html
-msgid "Do you know any identifiers for this work?"
-msgstr ""
-
-#: books/edit.html
-msgid ""
-"These identifiers apply to all editions of this work, for example "
-"Wikidata work identifiers. For edition-specific identifiers, like ISBN or"
-" LCCN, go to the edition tab."
+msgid "Decline"
 msgstr ""
 
 #: books/edition-sort.html
@@ -7434,65 +7414,6 @@ msgstr ""
 msgid "For more information"
 msgstr ""
 
-#: type/author/edit.html
-msgid "Edit Author"
-msgstr ""
-
-#: type/author/edit.html
-msgid ""
-"Please use natural order. For example: <strong>Leo Tolstoy</strong> not "
-"<strong>Tolstoy, Leo</strong>."
-msgstr ""
-
-#: type/author/edit.html
-msgid "A short bio?"
-msgstr ""
-
-#: type/author/edit.html
-msgid ""
-"If you \"borrow\" information from somewhere, please make sure to cite "
-"the source."
-msgstr ""
-
-#: type/author/edit.html
-msgid "Date of birth"
-msgstr ""
-
-#: type/author/edit.html
-msgid "Date of death"
-msgstr ""
-
-#: type/author/edit.html
-msgid ""
-"We're not storing structured dates (yet) so a date like \"21 May 2000\" "
-"is recommended."
-msgstr ""
-
-#: type/author/edit.html
-msgid ""
-"This is a deprecated field. You can help improve this record by removing "
-"this date and populating the \"Date of birth\" and \"Date of death\" "
-"fields. Thanks!"
-msgstr ""
-
-#: type/author/edit.html
-msgid "Does this author go by any other names?"
-msgstr ""
-
-#: type/author/edit.html
-msgid ""
-"For example: Lev Nikolayevich Tolstoy was also known as Leo Tolstoy. "
-"Please list one name per line."
-msgstr ""
-
-#: type/author/edit.html
-msgid "Identifiers"
-msgstr ""
-
-#: type/author/edit.html
-msgid "Author Identifiers Purpose"
-msgstr ""
-
 #: type/author/view.html type/edition/view.html type/work/view.html
 #, python-format
 msgid "%(page_title)s | Open Library"

openlibrary/macros/databarView.html

@@ -1,5 +1,23 @@
 $def with (page, edition=None, edit=True)
 
+$code:
+    # Properly extract mrid from query parameters
+    mrid_raw = query_param("mrid", None)
+    mrid = None
+
+    if mrid_raw is not None:
+        # Handle if it's a list (some frameworks return lists)
+        if isinstance(mrid_raw, list):
+            mrid = mrid_raw[0] if mrid_raw else None
+        else:
+            mrid = mrid_raw
+
+        # Clean and validate
+        if mrid is not None:
+            mrid = str(mrid).strip()
+            if not mrid or mrid == '':
+                mrid = None
+
 $if page.type.key in ["/type/work", "/type/edition", "/type/author"]:
     $if edition and page.type.key in ["/type/work"]:
         $ edit_url = edition.url(suffix="/edit")
@@ -9,6 +27,10 @@
 $else:
     $ edit_url = page.key + "?m=edit"
 
+$# Append mrid to edit_url if it exists
+$if mrid:
+    $ edit_url += ('&' if '?' in edit_url else '?') + 'mrid=' + str(mrid)
+
 <div id="editTools" class="edit">
     <div id="editInfo">
         $if "superfast" in ctx.features:
@@ -20,13 +42,16 @@
         $else:
             <div class="brown smaller sansserif">$_("Last edited anonymously")</div>
         $if page.url:
-            <div class="smallest gray sansserif">$(page.last_modified and datestr(page.last_modified)) | <a href="$page.url(m='history')" rel="nofollow" title="$_('View this template\'s edit history')">$_('History')</a></div>
+            <div class="smallest gray sansserif">$(page.last_modified and datestr(page.last_modified)) |<a href="$page.url(m='history')" rel="nofollow" title="$_('View this
+template\'s edit history')">$_('History')</a></div>
         $else:
-            <div class="smallest gray sansserif">$(page.last_modified and datestr(page.last_modified)) | <a href="$changequery(m='history')" rel="nofollow" title="$_('View this template\'s edit history')">$_('History')</a></div>
+            <div class="smallest gray sansserif">$(page.last_modified and datestr(page.last_modified)) |<a href="$changequery(m='history')" rel="nofollow" title="$_('View this
+template\'s edit history')">$_('History')</a></div>
     </div>
+
     $if edit and not page.is_fake_record():
         <div class="editButton">
-          <!-- FIXME: accesskey / keyboard shortcut needs i18n -->
+    <!-- FIXME: accesskey / keyboard shortcut needs i18n -->
           <a
             class="cta-btn cta-btn--vanilla"
             href="$edit_url"
@@ -36,4 +61,4 @@
             rel="nofollow"
         >$_("Edit")</a>
         </div>
-</div>
+</div>

openlibrary/plugins/openlibrary/js/ile/utils/SelectionManager/SelectionManager.js

@@ -2,7 +2,7 @@
 import $ from 'jquery';
 import { move_to_work, move_to_author } from '../ol.js';
 import './SelectionManager.less';
-
+import { createRequest, REQUEST_TYPES } from '../../../merge-request-table/MergeRequestService.js';
 /**
  * The SelectionManager is responsible for making things (e.g. books in search results,
  * or authors on books pages) on Open Library selectable and drag/droppable from one
@@ -203,18 +203,72 @@ export default class SelectionManager {
 
         for (const action of SelectionManager.ACTIONS) {
             const items = [];
-            if (action.requires_type.every(type => this.selectedItems[type].length > 0)) {
-                action.applies_to_type.forEach(type => items.push(...this.selectedItems[type]));
-                if (action.multiple_only ? items.length > 1 : items.length > 0)
-                    if (action.href) {
-                        this.ile.$actions.append($(`<a target="_blank" href="${action.href(this.getOlidsFromSelectionList(items))}">${action.name}</a>`));
-                    } else if (action.onclick && action.name === 'Tag Works') {
-                        this.ile.$actions.append($(`<a href="javascript:;">${action.name}</a>`).on('click', () => this.ile.updateAndShowBulkTagger(this.getOlidsFromSelectionList(items))));
-                    }
+
+            if (!action.requires_type.every(type => this.selectedItems[type].length > 0)) {
+                continue;
+            }
+
+            action.applies_to_type.forEach(type => {
+                items.push(...this.selectedItems[type]);
+            });
+
+            if (!(action.multiple_only ? items.length > 1 : items.length > 0)) {
+                continue;
+            }
+
+            if (action.href && !action.onclick) {
+                this.ile.$actions.append(
+                    $(
+                        `<a target="_blank" href="${action.href(
+                            this.getOlidsFromSelectionList(items)
+                        )}">${action.name}</a>`
+                    )
+                );
+                continue;
+            }
+
+            if (action.onclick) {
+                this.ile.$actions.append(
+                    $(`<a href="#">${action.name}</a>`).on('click', (e) => {
+                        e.preventDefault();
+                        this.handleActionClick(action, items);
+                    })
+                );
             }
         }
     }
 
+    handleActionClick(action, items) {
+        const olids = this.getOlidsFromSelectionList(items);
+
+        if (action.name === 'Tag Works') {
+            this.ile.updateAndShowBulkTagger(olids);
+            return;
+        }
+
+        if (action.name === 'Delete Works...') {
+            createRequest(
+                olids.join(','),
+                'create-pending',
+                REQUEST_TYPES.WORK_DELETE
+            ).finally(() => {
+                window.open('/merges', '_blank');
+            });
+            return;
+        }
+
+        if (action.name === 'Delete Authors...') {
+            createRequest(
+                olids.join(','),
+                'create-pending',
+                REQUEST_TYPES.AUTHOR_DELETE
+            ).finally(() => {
+                window.open('/merges', '_blank');
+            });
+            return;
+        }
+    }
+
     addSelectedItem(item) {
         this.selectedItems[this.getType(item).singular].push(item);
         sessionStorage.setItem('ile-items', JSON.stringify(this.selectedItems));
@@ -500,6 +554,14 @@ SelectionManager.ACTIONS = [
         name: 'Merge Works...',
         href: olids => `/works/merge?records=${olids.join(',')}`,
     },
+    {
+        applies_to_type: ['work'],
+        requires_type: ['work'],
+        multiple_only: false,
+        name: 'Delete Works...',
+        onclick: true,
+    },
+
     /* Uncomment this when edition merging is available.
     {
         applies_to_type: ['edition'],
@@ -516,4 +578,11 @@ SelectionManager.ACTIONS = [
         name: 'Merge Authors...',
         href: olids => `/authors/merge?records=${olids.join(',')}`,
     },
+    {
+        applies_to_type: ['author'],
+        requires_type: ['author'],
+        multiple_only: false,
+        name: 'Delete Authors...',
+        onclick: true,
+    },
 ];