Release v2.19.2: reorganize shared UI modules

test/player-time-date-region.test.js

@@ -4,7 +4,7 @@ const fs = require('node:fs');
 const vm = require('node:vm');
 
 function loadTimeDateModule() {
-  const webUiHelpersScript = fs.readFileSync(require.resolve('../src/web/public/js/web-ui-helpers.js'), 'utf8');
+  const webUiHelpersScript = fs.readFileSync(require.resolve('../src/web/public/js/shared/web-ui-helpers.js'), 'utf8');
   const sharedRenderingScript = fs.readFileSync(require.resolve('../src/player/rendering-shared.js'), 'utf8');
   const renderingScript = fs.readFileSync(require.resolve('../src/player/public/js/player-page-rendering.js'), 'utf8');
   const placeholderScript = fs.readFileSync(require.resolve('../src/web/public/js/shared/placeholder-utils.js'), 'utf8');

test/rbac-permissions.test.js

@@ -2,7 +2,7 @@ const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
 
-const rbacPermissionsScript = fs.readFileSync(require.resolve('../src/web/public/js/rbac-permissions.js'), 'utf8');
+const rbacPermissionsScript = fs.readFileSync(require.resolve('../src/web/public/js/rbac/permissions.js'), 'utf8');
 const rbacFormTemplate = fs.readFileSync(require.resolve('../src/web/views/settings/rbac/form.hbs'), 'utf8');
 const rbacRoutesSource = fs.readFileSync(require.resolve('../src/web/routes/admin/rbac.js'), 'utf8');
 const { buildPermissionSections, buildRbacEditViewModel } = require('../src/web/routes/settings/rbac/form-view-model');

test/slide-form-editor.test.js

@@ -6,7 +6,7 @@ const vm = require('node:vm');
 const slideFormEditorSource = fs.readFileSync(require.resolve('../src/web/public/js/slides/slide-form-editor.js'), 'utf8');
 const slideFormSource = fs.readFileSync(require.resolve('../src/web/public/js/slides/slide-form.js'), 'utf8');
 const slideFormTemplateSource = fs.readFileSync(require.resolve('../src/web/views/signage/slides/form.hbs'), 'utf8');
-const mediaPickerSource = fs.readFileSync(require.resolve('../src/web/public/js/media-picker.js'), 'utf8');
+const mediaPickerSource = fs.readFileSync(require.resolve('../src/web/public/js/shared/ui/media-picker.js'), 'utf8');
 const slideThumbnailPreviewSource = fs.readFileSync(require.resolve('../src/web/lib/media/slide-thumbnail-preview.js'), 'utf8');
 const slideThumbnailsSource = fs.readFileSync(require.resolve('../src/web/lib/media/slide-thumbnails.js'), 'utf8');
 const slideHtmlRegionSource = fs.readFileSync(require.resolve('../src/web/public/js/regions/type/html.js'), 'utf8');

test/system-status.test.js

@@ -4,7 +4,7 @@ const fs = require('node:fs');
 const vm = require('node:vm');
 
 test('system status shows connected player count in the live feed label', () => {
-  const script = fs.readFileSync(require.resolve('../src/web/public/js/system-status.js'), 'utf8');
+  const script = fs.readFileSync(require.resolve('../src/web/public/js/shared/system-status.js'), 'utf8');
   const elements = {
     'sidebar-status-dot': {
       classList: {
@@ -74,7 +74,7 @@ test('system status shows connected player count in the live feed label', () =>
 });
 
 test('system status shows an explicit idle label when no players are connected', () => {
-  const script = fs.readFileSync(require.resolve('../src/web/public/js/system-status.js'), 'utf8');
+  const script = fs.readFileSync(require.resolve('../src/web/public/js/shared/system-status.js'), 'utf8');
   const elements = {
     'sidebar-status-dot': {
       classList: {

test/timetable-migrations.test.js

@@ -284,7 +284,7 @@ test('schema startup runs the 2.19.1 repair on its existing locked connection',
 
   assert.equal(acquisitions, 1);
   const commitIndex = connection.queries.findIndex(([sql]) => sql === 'COMMIT');
-  const versionIndex = connection.queries.findIndex(([sql, params]) => sql.startsWith('UPDATE o_app_state') && params[0] === '2.19.1');
+  const versionIndex = connection.queries.findIndex(([sql, params]) => sql.startsWith('UPDATE o_app_state') && params[0] === require('../package.json').version);
   assert.ok(commitIndex > 0);
   assert.ok(versionIndex > commitIndex);
   assert.deepEqual(connection.queries.slice(-2), [

test/toast-refresh.test.js

@@ -130,7 +130,7 @@ test('pending toast is shown after a refresh and cleared from storage', () => {
   };
   sandbox.window = sandbox;
 
-  const scriptPath = path.join(__dirname, '..', 'src', 'web', 'public', 'js', 'toast.js');
+  const scriptPath = path.join(__dirname, '..', 'src', 'web', 'public', 'js', 'shared', 'ui', 'toast.js');
   const script = fs.readFileSync(scriptPath, 'utf8');
   vm.runInNewContext(script, sandbox, { filename: scriptPath });
 

test/web-ui-helpers.test.js

@@ -23,7 +23,7 @@ test('client row keys prefer the client name', () => {
   };
   sandbox.window = sandbox;
 
-  loadScript(path.join(__dirname, '..', 'src', 'web', 'public', 'js', 'web-ui-helpers.js'), sandbox);
+  loadScript(path.join(__dirname, '..', 'src', 'web', 'public', 'js', 'shared', 'web-ui-helpers.js'), sandbox);
 
   const helpers = sandbox.window.webUiHelpers;
   assert.equal(helpers.getClientRowKey({ client_name: 'Conference Left', screen_slug: 'alpha', deviceId: 'device-123', id: 'conn-1', clientId: 'client-1' }), 'conn-1');