Merge branch 'internetarchive:master' into 10196/refactor/enable-ruff-rule-SIM115

Author: techy4shri

.github/workflows/olbase.yaml

@@ -28,10 +28,22 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push
+      # If on master, use the latest tag, otherwise use the branch name
+      - name: Master Build and push
         uses: docker/build-push-action@v6
+        if: github.ref == 'refs/heads/master'
         with:
           context: "."
           file: "./docker/Dockerfile.olbase"
           tags: openlibrary/olbase:latest
           push: true
+
+      # If on another branch, use the branch name -- just the branch name, not the full ref
+      - name: Test Branch Build and push
+        uses: docker/build-push-action@v6
+        if: github.ref != 'refs/heads/master'
+        with:
+          context: "."
+          file: "./docker/Dockerfile.olbase"
+          tags: openlibrary/olbase:${{ github.ref_name }}
+          push: true

compose.production.yaml

@@ -126,8 +126,6 @@ services:
     user: root
     command: docker/ol-cron-start.sh
     restart: unless-stopped
-    env_file:
-      - ../olsystem/etc/cron-jobs.env
     volumes:
       - ../olsystem/etc/cron.d/openlibrary.ol_home0:/etc/cron.d/openlibrary.ol_home0:ro
       - ../olsystem:/olsystem

openlibrary/components/IdentifiersInput.vue

@@ -28,14 +28,14 @@
       </th>
     </tr>
       <template v-for="(value, name) in assignedIdentifiers">
-        <tr :key="name" v-if="value && !isEdition">
+        <tr :key="name" v-if="value && !saveIdentifiersAsList">
           <td>{{ identifierConfigsByKey[name].label }}</td>
           <td>{{ value }}</td>
           <td>
             <button class="form-control" @click="removeIdentifier(name)">Remove</button>
           </td>
         </tr>
-        <template v-else-if="value && isEdition">
+        <template v-else-if="value && saveIdentifiersAsList">
           <tr v-for="(item, idx) in value" :key="name + idx">
             <td>{{ identifierConfigsByKey[name].label }}</td>
             <td>{{ item }}</td>
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { errorDisplay, validateEditionIdentifiers } from './IdentifiersInput/utils/utils.js';
+import { errorDisplay, validateIdentifiers } from './IdentifiersInput/utils/utils.js';
 const identifierPatterns  = {
     wikidata: /^Q[1-9]\d*$/i,
     isni: /^[0]{4} ?[0-9]{4} ?[0-9]{4} ?[0-9]{3}[0-9X]$/i,
@@ -76,7 +76,9 @@ export default {
         id_config_string: {
             type: String
         },
-        /** see createHiddenInputs function for usage */
+        /** see createHiddenInputs function for usage
+         * #hiddenEditionIdentifiers, #hiddenWorkIdentifiers
+         */
         output_selector: {
             type: String
         },
@@ -108,20 +110,20 @@ export default {
         return {
             selectedIdentifier: '', // Which identifier is selected in dropdown
             inputValue: '', // What user put into input
-            assignedIdentifiers: {}, // IDs assigned to the entity Ex: {'viaf': '12632978'}
+            assignedIdentifiers: {}, // IDs assigned to the entity Ex: {'viaf': '12632978'} or {'abaa': ['123456','789012']}
         }
     },
 
     computed: {
         popularEditionConfigs: function() {
-            if (this.isEdition) {
+            if (this.edition_popular) {
                 const popularConfigs = JSON.parse(decodeURIComponent(this.edition_popular));
                 return Object.fromEntries(popularConfigs.map(e => [e.name, e]));
             }
             return {};
         },
         secondaryEditionConfigs: function() {
-            if (this.isEdition) {
+            if (this.secondary_identifiers) {
                 const secondConfigs = JSON.parse(decodeURIComponent(this.secondary_identifiers));
                 return Object.fromEntries(secondConfigs.map(e => [e.name, e]));
             }
@@ -139,6 +141,9 @@ export default {
             return this.admin.toLowerCase() === 'true';
         },
         isEdition() {
+            return this.multiple.toLowerCase() === 'true' && this.edition_popular;
+        },
+        saveIdentifiersAsList() {
             return this.multiple.toLowerCase() === 'true';
         },
         setButtonEnabled: function(){
@@ -154,10 +159,10 @@ export default {
             if (this.selectedIdentifier === 'isni') {
                 this.inputValue = this.inputValue.replace(/\s/g, '')
             }
-            if (this.isEdition) {
+            if (this.saveIdentifiersAsList) {
                 // collect id values of matching type, or empty array if none present
                 const existingIds = this.assignedIdentifiers[this.selectedIdentifier] ?? [];
-                const validEditionId = validateEditionIdentifiers(this.selectedIdentifier, this.inputValue, existingIds);
+                const validEditionId = validateIdentifiers(this.selectedIdentifier, this.inputValue, existingIds, this.output_selector);
                 if (validEditionId) {
                     if (!this.assignedIdentifiers[this.selectedIdentifier]) {
                         this.inputValue = [this.inputValue];
@@ -170,18 +175,18 @@ export default {
                     return;
                 }
             } else if (this.assignedIdentifiers[this.selectedIdentifier]) {
-                errorDisplay(`An author identifier for ${this.identifierConfigsByKey[this.selectedIdentifier].label} already exists.`)
+                errorDisplay(`An identifier for ${this.identifierConfigsByKey[this.selectedIdentifier].label} already exists.`, this.output_selector)
                 return;
-            } else { errorDisplay() }
+            } else { errorDisplay('', this.output_selector) }
             // We use $set otherwise we wouldn't get the reactivity desired
             // See https://vuejs.org/v2/guide/reactivity.html#Change-Detection-Caveats
             this.$set(this.assignedIdentifiers, this.selectedIdentifier, this.inputValue);
             this.inputValue = '';
             this.selectedIdentifier = '';
         },
         /** Removes an identifier with value from memory and it will be deleted from database on save */
-        removeIdentifier: function(identifierName, idx = 0){
-            if (this.isEdition) {
+        removeIdentifier: function(identifierName, idx = 0) {
+            if (this.saveIdentifiersAsList) {
                 this.assignedIdentifiers[identifierName].splice(idx, 1);
             } else {
                 this.$set(this.assignedIdentifiers, identifierName, '');
@@ -194,7 +199,8 @@ export default {
               * So for now this just drops the hidden inputs into the the parent form anytime there is a change
               */
             let html = '';
-            if (this.isEdition) {
+            // should save a list of ids for work + edition identifiers
+            if (this.saveIdentifiersAsList) {
                 let num = 0;
                 for (const [key, value] of Object.entries(this.assignedIdentifiers)) {
                     for (const idx in value) {
@@ -227,7 +233,11 @@ export default {
     },
     created: function(){
         this.assignedIdentifiers = JSON.parse(decodeURIComponent(this.assigned_ids_string));
-        if (this.isEdition) {
+        if (this.assignedIdentifiers.length === 0) {
+            this.assignedIdentifiers = {}
+            return;
+        }
+        if (this.saveIdentifiersAsList) {
             const edition_identifiers = {};
             this.assignedIdentifiers.forEach(entry => {
                 if (!edition_identifiers[entry.name]) {

openlibrary/components/IdentifiersInput/utils/utils.js

@@ -8,8 +8,15 @@ import {
     isValidLccn,
 } from '../../../plugins/openlibrary/js/idValidation.js';
 
-export function errorDisplay(message) {
-    const errorSelector = document.querySelector('#id-errors');
+export function errorDisplay(message, error_output) {
+    let errorSelector;
+    if (error_output === '#hiddenAuthorIdentifiers') {
+        errorSelector = document.querySelector('#id-errors-author')
+    } else if (error_output === '#hiddenWorkIdentifiers') {
+        errorSelector = document.querySelector('#id-errors-work')
+    } else if (error_output === '#hiddenEditionIdentifiers') {
+        errorSelector = document.querySelector('#id-errors-edition')
+    }
     if (message) {
         errorSelector.style.display = '';
         errorSelector.innerHTML = `<div>${message}</div>`;
@@ -23,10 +30,12 @@ export function errorDisplay(message) {
 function validateIsbn10(value) {
     const isbn10_value = parseIsbn(value);
     if (!isFormatValidIsbn10(isbn10_value)) {
-        errorDisplay('ID must be exactly 10 characters [0-9] or X.');
+        errorDisplay('ID must be exactly 10 characters [0-9] or X.', '#hiddenEditionIdentifiers');
         return false;
-    } else if (isFormatValidIsbn10(isbn10_value) === true && isChecksumValidIsbn10(isbn10_value) === false) {
-        errorDisplay(`ISBN ${isbn10_value} may be invalid. Please confirm if you'd like to add it before saving all changes`);
+    } else if (
+        isFormatValidIsbn10(isbn10_value) && !isChecksumValidIsbn10(isbn10_value)
+    ) {
+        errorDisplay(`ISBN ${isbn10_value} may be invalid. Please confirm if you'd like to add it before saving all changes`, '#hiddenEditionIdentifiers');
     }
     return true;
 }
@@ -35,10 +44,12 @@ function validateIsbn13(value) {
     const isbn13_value = parseIsbn(value);
 
     if (!isFormatValidIsbn13(isbn13_value)) {
-        errorDisplay('ID must be exactly 13 digits [0-9]. For example: 978-1-56619-909-4');
+        errorDisplay('ID must be exactly 13 digits [0-9]. For example: 978-1-56619-909-4', '#hiddenEditionIdentifiers');
         return false;
-    } else if (isFormatValidIsbn13(isbn13_value) === true && isChecksumValidIsbn13(isbn13_value) === false) {
-        errorDisplay(`ISBN ${isbn13_value} may be invalid. Please confirm if you'd like to add it before saving all changes`);
+    } else if (
+        isFormatValidIsbn13(isbn13_value) && !isChecksumValidIsbn13(isbn13_value)
+    ) {
+        errorDisplay(`ISBN ${isbn13_value} may be invalid. Please confirm if you'd like to add it before saving all changes`, '#hiddenEditionIdentifiers');
     }
     return true;
 }
@@ -47,18 +58,18 @@ function validateLccn(value) {
     const lccn_value = parseLccn(value);
 
     if (!isValidLccn(lccn_value)) {
-        errorDisplay('Invalid ID format');
+        errorDisplay('Invalid ID format', '#hiddenEditionIdentifiers');
         return false;
     }
     return true;
 }
 
-export function validateEditionIdentifiers(name, value, entries) {
+export function validateIdentifiers(name, value, entries, error_output) {
     let validId = true;
-    errorDisplay('');
+    errorDisplay('', error_output);
     if (name === '' || name === '---') {
     // if somehow an invalid identifier is passed through
-        errorDisplay('Invalid identifier');
+        errorDisplay('Invalid identifier', error_output);
         return false;
     }
     if (name === 'isbn_10') {
@@ -70,7 +81,7 @@ export function validateEditionIdentifiers(name, value, entries) {
     }
     if (Array.from(entries).some(entry => entry === value) === true) {
         validId = false;
-        errorDisplay('That ID already exists for this edition');
+        errorDisplay('That ID already exists for an identifier.', error_output);
     }
     return validId;
 }

openlibrary/components/LibraryExplorer.vue

@@ -15,8 +15,8 @@
 </template>
 
 <script>
-import BookRoom from './LibraryExplorer/components/BookRoom';
-import LibraryToolbar from './LibraryExplorer/components/LibraryToolbar';
+import BookRoom from './LibraryExplorer/components/BookRoom.vue';
+import LibraryToolbar from './LibraryExplorer/components/LibraryToolbar.vue';
 import DDC from './LibraryExplorer/ddc.json';
 import LCC from './LibraryExplorer/lcc.json';
 import { recurForEach } from './LibraryExplorer/utils.js';

openlibrary/components/LibraryExplorer/components/BookCover3D.vue

@@ -22,8 +22,8 @@
 </template>
 
 <script>
-import CSSBox from './CSSBox';
-import FlatBookCover from './FlatBookCover';
+import CSSBox from './CSSBox.vue';
+import FlatBookCover from './FlatBookCover.vue';
 import { hashCode } from '../utils.js';
 
 export default {

openlibrary/components/LibraryExplorer/components/BooksCarousel.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import FlatBookCover from './FlatBookCover';
+import FlatBookCover from './FlatBookCover.vue';
 import CONFIGS from '../../configs';
 
 export default {

openlibrary/components/LibraryExplorer/components/Bookshelf.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import Shelf from './Shelf';
+import Shelf from './Shelf.vue';
 
 
 export default {

openlibrary/components/LibraryExplorer/components/ClassSlider.vue

@@ -28,8 +28,8 @@
 </template>
 
 <script>
-import RightArrowIcon from './icons/RightArrowIcon';
-import ShelfProgressBar from './ShelfProgressBar';
+import RightArrowIcon from './icons/RightArrowIcon.vue';
+import ShelfProgressBar from './ShelfProgressBar.vue';
 export default {
     components: { RightArrowIcon, ShelfProgressBar },
     props: {

openlibrary/components/LibraryExplorer/components/LibraryToolbar.vue

@@ -201,10 +201,10 @@
 
 <script>
 import lucenerQueryParser from 'lucene-query-parser';
-import SettingsIcon from './icons/SettingsIcon';
-import FilterIcon from './icons/FilterIcon';
-import SortIcon from './icons/SortIcon';
-import FeedbackIcon from './icons/FeedbackIcon';
+import SettingsIcon from './icons/SettingsIcon.vue';
+import FilterIcon from './icons/FilterIcon.vue';
+import SortIcon from './icons/SortIcon.vue';
+import FeedbackIcon from './icons/FeedbackIcon.vue';
 import CONFIGS from '../../configs';
 import Multiselect from 'vue-multiselect';