Merge pull request #797 from Plant-Tracer/773-ditch-jquery

removed JQuery

Author: simsong

.eslintrc.yml

@@ -5,8 +5,13 @@ env:
 
 extends: eslint:recommended
 
+ignorePatterns: ["unzipit-worker.module.mjs", "unzipit.module.mjs"]
+
 parserOptions:
   ecmaVersion: latest
 
+overrides:
+  - files: ["*.js"]
+
 rules:
   "no-unused-vars": ["error", { "args": "all", "argsIgnorePattern" : "^_" }]

.github/workflows/continuous-integration-pip.yml

@@ -2,7 +2,17 @@
 # 2025-06-15 - slg - Complete rewrite to avoid MySQL and use DynamoDB and S3 local variants.
 #                    These are automatically configured with install-ubuntu or install-macos
 name: CI (pip)
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+
+# Cancel in-progress runs when a new run is triggered
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:

.github/workflows/documentation.yml

@@ -1,7 +1,18 @@
 # https://coderefinery.github.io/documentation/gh_workflow/
 name: documentation
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+  workflow_dispatch:
+
+# Cancel in-progress runs when a new run is triggered
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 permissions:
   contents: write

jstests/list_movies.test.js

@@ -22,6 +22,8 @@ beforeAll(() => {
 });
 
 describe('list_movies_data', () => {
+  let mockElements;
+  
   beforeEach(() => {
     jest.clearAllMocks();
     // Assign global variables from globalData
@@ -36,6 +38,18 @@ describe('list_movies_data', () => {
     global.UNDELETE_BUTTON = globalData.UNDELETE_BUTTON;
     global.TABLE_HEAD = globalData.TABLE_HEAD;
     global.user_primary_course_id = parseInt(globalData.user_primary_course_id, 10);
+    
+    // Mock document.querySelector to return mock elements with innerHTML setter
+    mockElements = {};
+    document.querySelector = jest.fn((selector) => {
+      if (!mockElements[selector]) {
+        mockElements[selector] = { innerHTML: '', style: {} };
+      }
+      return mockElements[selector];
+    });
+    
+    // Mock document.querySelectorAll for hiding movie players
+    document.querySelectorAll = jest.fn(() => []);
   });
 
   test('should create the correct HTML for published movies', () => {
@@ -57,25 +71,25 @@ describe('list_movies_data', () => {
       }
     ];
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
-    expect($.fn.html).toHaveBeenCalledTimes(4);
-
-    const expectedPublishedHtml = expect.stringContaining("<table><tbody><tr><td><i>");
-    expect($.fn.html).toHaveBeenCalledWith(expectedPublishedHtml);
+    expect(document.querySelector).toHaveBeenCalledTimes(4);
+    
+    // Check that the published movies div was populated
+    const publishedHtml = mockElements['#your-published-movies'].innerHTML;
+    expect(publishedHtml).toContain("<table>");
+    expect(publishedHtml).toContain("Movie Title");
   });
 
   test('should handle an empty list of movies gracefully', () => {
     const movies = [];
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
-    expect($.fn.html).toHaveBeenCalledTimes(4);
+    expect(document.querySelector).toHaveBeenCalledTimes(4);
 
-      // Simson broke this with the dynamodb update. It needs to be fixed.
-      //const expectedEmptyHtml = expect.stringContaining('<table><tbody><tr><td><i>No movies</i></td></tr></tbody></table>');
-      const expectedEmptyHtml = expect.stringContaining("<table><tbody><tr><td><i>No movies</i></td></tr><tr><td colspan=\"6\"><a href=\"/upload\">Click here to upload a movie</a></td></tr></tbody></table>");
-    expect($.fn.html).toHaveBeenCalledWith(expectedEmptyHtml);
+    // Check that empty movies show the right message
+    const publishedHtml = mockElements['#your-published-movies'].innerHTML;
+    expect(publishedHtml).toContain("No movies");
+    expect(publishedHtml).toContain('<a href="/upload">Click here to upload a movie</a>');
   });
 
   test('should correctly classify and display course movies', () => {
@@ -98,36 +112,35 @@ describe('list_movies_data', () => {
       }
     ];
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
-    expect($.fn.html).toHaveBeenCalledTimes(4);
+    expect(document.querySelector).toHaveBeenCalledTimes(4);
 
-    const expectedCourseHtml = expect.stringContaining('<table>');
-    expect($.fn.html).toHaveBeenCalledWith(expectedCourseHtml);
+    // Check that course movies are shown in the right section
+    const courseHtml = mockElements['#course-movies'].innerHTML;
+    expect(courseHtml).toContain('<table>');
   });
 
   test('should display a link to upload movies for non-demo users', () => {
     const movies = [];
     global.demo_mode = false;
-    $.fn.html = jest.fn();
     list_movies_data(movies);
-    expect($.fn.html).toHaveBeenCalledTimes(4);
+    expect(document.querySelector).toHaveBeenCalledTimes(4);
 
-    const expectedUploadLinkHtml = expect.stringContaining('<table><tbody><tr><td><i>No movies</i></td></tr><tr><td colspan="6"><a href="/upload">Click here to upload a movie</a></td></tr></tbody></table>');
-    expect($.fn.html).toHaveBeenCalledWith(expectedUploadLinkHtml);
+    const publishedHtml = mockElements['#your-published-movies'].innerHTML;
+    expect(publishedHtml).toContain('No movies');
+    expect(publishedHtml).toContain('<a href="/upload">Click here to upload a movie</a>');
   });
 
   test('should not display upload link for demo users', () => {
     const movies = [];
 
     global.demo_mode = true;
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
-    expect($.fn.html).toHaveBeenCalledTimes(4);
+    expect(document.querySelector).toHaveBeenCalledTimes(4);
 
-    const notExpectedUploadLinkHtml = expect.not.stringContaining('Click here to upload a movie');
-    expect($.fn.html).toHaveBeenCalledWith(notExpectedUploadLinkHtml);
+    const publishedHtml = mockElements['#your-published-movies'].innerHTML;
+    expect(publishedHtml).not.toContain('Click here to upload a movie');
   });
 
   // Action Button Tests
@@ -142,14 +155,20 @@ describe('list_movies_data', () => {
         published: 0,
         deleted: 0,
         title: 'Unpublished Movie',
+        date_uploaded: 1627689600,
+        width: 1280,
+        height: 720,
+        total_bytes: 2000000,
+        fps: '30',
+        total_frames: 3600,
+        orig_movie: false,
       }
     ];
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
 
-    const expectedButtonHtml = expect.stringContaining(`<td> Status: Not published<br/>`);
-    expect($.fn.html).toHaveBeenCalledWith(expectedButtonHtml);
+    const unpublishedHtml = mockElements['#your-unpublished-movies'].innerHTML;
+    expect(unpublishedHtml).toContain('Status: Not published');
   });
 
   test('should display an unpublish button for published movies', () => {
@@ -160,13 +179,19 @@ describe('list_movies_data', () => {
         published: 1,
         deleted: 0,
         title: 'Published Movie',
+        date_uploaded: 1627689600,
+        width: 1280,
+        height: 720,
+        total_bytes: 2000000,
+        fps: '30',
+        total_frames: 3600,
+        orig_movie: false,
       }
     ];
 
-    $.fn.html = jest.fn();
     list_movies_data(movies);
 
-    const expectedButtonHtml = expect.stringContaining(`<td> Status: <b>Published</b>`);
-    expect($.fn.html).toHaveBeenCalledWith(expectedButtonHtml);
+    const publishedHtml = mockElements['#your-published-movies'].innerHTML;
+    expect(publishedHtml).toContain('Status: <b>Published</b>');
   });
 });