fix user list

.github/workflows/main.yml

@@ -3,179 +3,158 @@ on:
   push
 
 jobs:
-  push_aspen_to_dockerhub:
-    name: Push Aspen image to Docker Hub
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
+  build_aspen_docker_images:
+    name: Push Aspen image to GitHub Container Registry
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Extract GitHub Tag
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag
+        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Add placeholder if this is not a tag
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag_dummy
+        run: echo "GIT_TAG=NOTHING" >> $GITHUB_ENV
 
       - name: Extract branch name
         shell: bash
         run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
         id: extract_branch
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+      - name: Log in to Docker Hub
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          context: .
-          file: docker/Dockerfile
-          push: true
-          tags: |
-            aspendiscovery/aspen:latest
-            aspendiscovery/aspen:${{ steps.extract_branch.outputs.branch }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-  push_aspen_to_quay:
-    name: Push Aspen image to Quay.io
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
+      - name: Log in to GHCR
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        run: echo "${{ secrets.GHCR_PASSWORD }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
 
       - name: Log in to Quay.io
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
       - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/Dockerfile
-          push: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            quay.io/aspen-discovery/aspen:latest
-            quay.io/aspen-discovery/aspen:${{ steps.extract_branch.outputs.branch }}
+            aspendiscovery/aspen:${{ env.GIT_TAG }}
+            ghcr.io/aspen-discovery/aspen:${{ env.GIT_TAG }}
+            quay.io/aspen-discovery/aspen:${{ env.GIT_TAG }}
 
-  push_solr_to_dockerhub:
-    name: Push Solr image to Docker Hub
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
+  build_solr_docker_images:
+    name: Push Aspen image to GitHub Container Registry
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Extract GitHub Tag
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag
+        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Add placeholder if this is not a tag
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag_dummy
+        run: echo "GIT_TAG=NOTHING" >> $GITHUB_ENV
 
       - name: Extract branch name
         shell: bash
         run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
         id: extract_branch
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+      - name: Log in to Docker Hub
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          context: .
-          file: docker/files/solr/Dockerfile
-          push: true
-          tags: |
-            aspendiscovery/solr:latest
-            aspendiscovery/solr:${{ steps.extract_branch.outputs.branch }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-  push_solr_to_quay:
-    name: Push Solr image to Quay.io
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
+      - name: Log in to GHCR
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        run: echo "${{ secrets.GHCR_PASSWORD }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
 
       - name: Log in to Quay.io
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
       - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/files/solr/Dockerfile
-          push: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            quay.io/aspen-discovery/solr:latest
-            quay.io/aspen-discovery/solr:${{ steps.extract_branch.outputs.branch }}
+            aspendiscovery/solr:${{ env.GIT_TAG }}
+            ghcr.io/aspen-discovery/solr:${{ env.GIT_TAG }}
+            quay.io/aspen-discovery/solr:${{ env.GIT_TAG }}
 
-  push_tunnel_to_dockerhub:
-    name: Push Tunnel image to Docker Hub
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
+  build_tunnel_docker_images:
+    name: Push Aspen image to GitHub Container Registry
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Extract GitHub Tag
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag
+        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Add placeholder if this is not a tag
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        id: extract_tag_dummy
+        run: echo "GIT_TAG=NOTHING" >> $GITHUB_ENV
 
       - name: Extract branch name
         shell: bash
         run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
         id: extract_branch
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+      - name: Log in to Docker Hub
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          context: .
-          file: docker/files/tunnel/Dockerfile
-          push: true
-          tags: |
-            aspendiscovery/tunnel:latest
-            aspendiscovery/tunnel:${{ steps.extract_branch.outputs.branch }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-  push_tunnel_to_quay:
-    name: Push Tunnel image to Quay.io
-    if: github.repository == 'Aspen-Discovery/aspen-discovery'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
+      - name: Log in to GHCR
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
+        run: echo "${{ secrets.GHCR_PASSWORD }}" | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
 
       - name: Log in to Quay.io
+        if: github.repository == 'Aspen-Discover/aspen-discovery'
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
       - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/files/tunnel/Dockerfile
-          push: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            quay.io/aspen-discovery/tunnel:latest
-            quay.io/aspen-discovery/tunnel:${{ steps.extract_branch.outputs.branch }}
+            aspendiscovery/tunnel:${{ env.GIT_TAG }}
+            ghcr.io/aspen-discovery/tunnel:${{ env.GIT_TAG }}
+            quay.io/aspen-discovery/tunnel:${{ env.GIT_TAG }}

.github/workflows/pull_request_qa.yml

@@ -0,0 +1,73 @@
+name: Check Pull Request for QA Issues
+
+on:
+  pull_request:
+
+jobs:
+  check_release_notes:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout pull request branch
+        uses: actions/checkout@v4
+
+      - name: Add official Aspen Discovery repo as another remote
+        run: git remote add official https://github.com/Aspen-Discovery/aspen-discovery.git && git fetch official
+
+      - name: Get default branch
+        id: get_default_branch
+        run: |
+          default_branch=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/Aspen-Discovery/aspen-discovery | jq -r .default_branch)
+          echo "Default branch is $default_branch"
+          echo "DEFAULT_BRANCH=$default_branch" >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check for changes in release notes
+        run: |
+          if git diff --name-only official/$DEFAULT_BRANCH HEAD | grep -q 'code/web/release_notes/'; then
+            echo "Release notes have been modified."
+          else
+            echo "No changes detected in the release notes."
+            exit 1
+          fi
+
+  check_tabs_vs_spaces:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout pull request branch
+        uses: actions/checkout@v4
+
+      - name: Add official Aspen Discovery repo as another remote
+        run: git remote add official https://github.com/Aspen-Discovery/aspen-discovery.git && git fetch official
+
+      - name: Get default branch
+        id: get_default_branch
+        run: |
+          default_branch=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/Aspen-Discovery/aspen-discovery | jq -r .default_branch)
+          echo "Default branch is $default_branch"
+          echo "DEFAULT_BRANCH=$default_branch" >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check for spaces instead of tabs
+        run: |
+          # Find files that are modified in the pull request
+          MODIFIED_FILES=$(git diff --name-only official/$DEFAULT_BRANCH HEAD)
+
+          # Loop through each file and check for spaces used instead of tabs
+          EXIT_CODE=0
+          for file in $MODIFIED_FILES; do
+            echo "Found modified file: $file";
+            if [[ $file == *.php || $file == *.js || $file == *.java ]]; then 
+              #echo "Checking $file for whitespace issues"
+              DIFF=$(git diff official/$DEFAULT_BRANCH HEAD -- $file)
+              #echo "DIFF: $DIFF"
+              if [[ $DIFF =~ "  " ]]; then
+                echo "Detected spaces instead of tabs in $file"
+                EXIT_CODE=1
+              fi
+            fi
+          done
+          exit $EXIT_CODE

.gitignore

@@ -229,3 +229,5 @@ code/aspen_app/updateTestApps.sh
 code/cron/.idea/misc.xml
 tests/phpunit/.phpunit.result.cache
 install/unit_tests_local.ini
+intellij_project
+phpstorm_project

code/aspen_app/package.json

@@ -28,7 +28,7 @@
     "@sentry/react-native": "~5.22.0",
     "@tanstack/react-query": "^4.33.0",
     "apisauce": "^2.1.6",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "babel-preset-expo": "^11.0.10",
     "chroma-js": "~2.4.2",
     "compare-versions": "^6.1.0",

code/aspen_app/yarn.lock

@@ -7219,10 +7219,10 @@ axios@^0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.6.0:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
-  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+axios@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
+  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

code/koha_export/src/com/turning_leaf_technologies/koha_export/KohaExportMain.java

@@ -529,16 +529,11 @@ private static void exportVolumes(Connection dbConn, Connection kohaConn) {
 			float kohaVersion = getKohaVersion(kohaConn);
 			PreparedStatement getVolumeInfoStmt;
 			PreparedStatement getItemsForVolumeStmt;
-			if (kohaVersion < 22.11) {
-				//Arlington's code for volumes
-				getVolumeInfoStmt = kohaConn.prepareStatement("SELECT * from volumes", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-				getItemsForVolumeStmt = kohaConn.prepareStatement("SELECT * from volume_items", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-			}else {
-				//community code for
-				getVolumeInfoStmt = kohaConn.prepareStatement("SELECT * from item_groups", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-				getItemsForVolumeStmt = kohaConn.prepareStatement("SELECT * from item_group_items", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-			}
-			PreparedStatement addVolumeStmt = dbConn.prepareStatement("INSERT INTO ils_volume_info (recordId, volumeId, displayLabel, relatedItems, displayOrder) VALUES (?,?,?,?, ?) ON DUPLICATE KEY update recordId = VALUES(recordId), displayLabel = VALUES(displayLabel), relatedItems = VALUES(relatedItems), displayOrder = VALUES(displayOrder)");
+			// Filter out any item groups that do not currently contain items
+			getVolumeInfoStmt = kohaConn.prepareStatement("SELECT item_groups.* FROM item_groups LEFT JOIN item_group_items USING (item_group_id) GROUP BY item_group_id HAVING COUNT(item_id) > 0", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+			getItemsForVolumeStmt = kohaConn.prepareStatement("SELECT * from item_group_items", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+
+      PreparedStatement addVolumeStmt = dbConn.prepareStatement("INSERT INTO ils_volume_info (recordId, volumeId, displayLabel, relatedItems, displayOrder) VALUES (?,?,?,?, ?) ON DUPLICATE KEY update recordId = VALUES(recordId), displayLabel = VALUES(displayLabel), relatedItems = VALUES(relatedItems), displayOrder = VALUES(displayOrder)");
 			PreparedStatement deleteVolumeStmt = dbConn.prepareStatement("DELETE from ils_volume_info where volumeId = ?");
 
 			ResultSet volumeInfoRS = null;

code/web/CatalogConnection.php

@@ -1790,8 +1790,12 @@ public function checkoutBySip(User $patron, $barcode, $currentLocationId): array
 		return $this->driver->checkoutBySip($patron, $barcode, $currentLocationId);
 	}
 
-	public function checkoutByAPI(User $patron, $barcode, $currentLocationId): array {
-		return $this->driver->checkoutByAPI($patron, $barcode, $currentLocationId);
+	public function hasAPICheckout() : bool {
+		return $this->driver->hasAPICheckout();
+	}
+
+	public function checkoutByAPI(User $patron, $barcode, Location $currentLocation): array {
+		return $this->driver->checkoutByAPI($patron, $barcode, $currentLocation);
 	}
 
 	public function allowUpdatesOfPreferredName(User $patron) : bool {