diff --git a/.cursor/rules/django_javascript_implementation.mdc b/.cursor/rules/django_javascript_implementation.mdc index 03dd4a6d8..d4a0db04c 100644 --- a/.cursor/rules/django_javascript_implementation.mdc +++ b/.cursor/rules/django_javascript_implementation.mdc @@ -13,6 +13,10 @@ alwaysApply: true - Classes should follow DRY principles and avoid duplicating the functionality of existing classes. - Javascript added to existing templates should ONLY call existing classes to initialize them so their functions are available to run in the template. - Ignore and NEVER update files in the `deprecated/` folder. +- Differentiation of code use by asset type should be configuration-driven, NOT by the method logic-driven. +- Prefer more generic method implementations over specific, per-case basis implementations which lead to bloat. +- If you notice multiple uses of the same block of code, consider adding a utils or manager method/class to handle that instead of repeating the same code everywhere. +- When creating/naming a method, check if a method by the same name/function/use already exists. If so, point it out and suggest refactoring original method to be more generic. ## Django Template Structure diff --git a/.cursor/skills/jest-test-writing/SKILL.md b/.cursor/skills/jest-test-writing/SKILL.md new file mode 100644 index 000000000..e8a3ac68e --- /dev/null +++ b/.cursor/skills/jest-test-writing/SKILL.md @@ -0,0 +1,126 @@ +--- +name: jest-test-writing +description: Writes and refactors Jest unit tests for browser JS (jsdom), emphasizing behavior-focused tests, shared mocks, and repo conventions. Use when adding or updating tests under gateway/sds_gateway/static/js, fixing failing Jest runs, or when the user asks for Jest test best practices. +--- + +# Jest test writing (SDS gateway static JS) + +## When to apply + +- New or changed code under `gateway/sds_gateway/static/js/` +- User asks for Jest patterns, test structure, or coverage for frontend managers/handlers +- CI/local failure from `npm test` in `gateway/` + +## Run tests + +From `gateway/`: + +```bash +npm test +npm run test:watch +npm run test:coverage +``` + +Config: `sds_gateway/static/js/tests-config/jest.config.js` (jsdom, `clearMocks` + `restoreMocks`). + +## File placement + +| Rule | Detail | +|------|--------| +| Co-locate | `SomeManager.js` → `__tests__/SomeManager.test.js` in the same folder | +| Naming | `*.test.js` or `*.spec.js` (see `testMatch` in jest config) | +| Skip | Never add tests for `deprecated/` | + +## What to test (and what not to) + +**Do** + +- Public methods and user-visible outcomes (DOM updates, calls to `DOMUtils`, `APIClient`, Bootstrap modal show/hide) +- Branches that encode product rules (permissions denied, missing modal, API error responses) +- Async flows: `await` the method under test, then assert mocks/callbacks + +**Avoid** + +- Asserting private helpers or internal call order unless order is the contract +- Tests that only `expect(x).toBeDefined()` or mirror the implementation line-for-line +- Copy-pasting 50-line mock trees—extend shared helpers instead + +## Shared infrastructure (use first) + +Read and reuse before inventing mocks: + +| Resource | Path | +|----------|------| +| DOM/API/permissions helpers | `sds_gateway/static/js/tests-config/testHelpers.js` | +| Action-manager setups | `sds_gateway/static/js/__tests__/helpers/actionTestMocks.js` | +| Global env | `sds_gateway/static/js/tests-config/jest.setup.js` | + +Common helpers: + +- `setupStandardUnitTest({ useModalDomUtils, apiClientOverrides, window, getElementByIdMap })` — resets mocks, stubs `document`, sets `window.DOMUtils` +- `createMockDOMUtils` / `createMockDOMUtilsWithModals` +- `createMockAPIClient`, `createMockPermissionsManager` +- `flushMicrotasks()` — after fire-and-forget promises tied to `setTimeout(0)` +- `installDocumentGetByIdMap({ id: element })` when code uses `getElementById` + +For Download/Share/Versioning action tests, prefer `setupDownloadActionTestEnvironment` / patterns in `actionTestMocks.js`. + +## Structure template + +```javascript +/** + * Jest tests for TargetClass + */ + +import { TargetClass } from "../TargetClass.js"; +import { setupStandardUnitTest, flushMicrotasks } from "../../tests-config/testHelpers.js"; + +describe("TargetClass", () => { + beforeEach(() => { + setupStandardUnitTest({ /* opts */ }); + // Extra per-suite: bootstrap, document.body, window globals + }); + + test("describes behavior in plain language", async () => { + // arrange → act → assert + }); +}); +``` + +Use `require()` for helpers if the file already uses CommonJS; stay consistent within a file. + +## Mocking conventions (this repo) + +1. **Bootstrap modals** — set `global.bootstrap.Modal` and `Modal.getInstance` in `beforeEach` (see `ModalManager.test.js`, `actionTestMocks.installBootstrapModalMocks`). +2. **`window.DOMUtils`** — via `setupStandardUnitTest` or explicit assign; use `.mockResolvedValue()` for async UI helpers. +3. **`document`** — prefer `installDocumentGetByIdMap` or minimal stubs from testHelpers; use real `document.createElement` / `body.innerHTML` only when testing DOM wiring. +4. **Module mocks** — `jest.mock("../Dependency.js")` at top level; factory returns minimal surface the unit needs. +5. **Fetch / API** — mock `APIClient` methods or `window.fetch` with `createMockFetchResponse` / resolved shapes `{ success: true }` matching production handlers. + +## Async + +- Prefer `async/await` in tests over bare `.then()`. +- If code schedules work on microtasks/macrotasks without returning a promise, `await flushMicrotasks()` before assertions. +- Fake timers: use `jest.useFakeTimers()` only when testing timer logic; restore in `afterEach`. + +## Assertions + +- One logical behavior per test name (readable as a spec sentence). +- Assert on **arguments** to mocks when the contract is “calls X with Y” (`toHaveBeenCalledWith`). +- For errors: assert rejected promise or that `showError` / `showModalError` was invoked with expected message. + +## Coverage + +Global thresholds (70%) in jest config. New code should not drop coverage on touched files; add tests for new branches rather than excluding files. + +## Checklist before finishing + +- [ ] Test file lives in `__tests__/` next to source +- [ ] Reused `testHelpers` / `actionTestMocks` where applicable +- [ ] `beforeEach` resets DOM/globals needed for isolation +- [ ] Tests describe behavior, not implementation trivia +- [ ] `npm test` passes from `gateway/` + +## More detail + +See [reference.md](reference.md) for helper exports and example patterns. diff --git a/.cursor/skills/jest-test-writing/reference.md b/.cursor/skills/jest-test-writing/reference.md new file mode 100644 index 000000000..7ed9851a7 --- /dev/null +++ b/.cursor/skills/jest-test-writing/reference.md @@ -0,0 +1,70 @@ +# Jest helpers reference (gateway static JS) + +## testHelpers.js (primary exports) + +| Export | Use when | +|--------|----------| +| `setupStandardUnitTest` | Default start of unit test `beforeEach` | +| `createMockDOMUtils` | Class uses `window.DOMUtils` without modals | +| `createMockDOMUtilsWithModals` | Modal loading/error/open/close | +| `createMockAPIClient` | Inject or assign API client mock | +| `createMockPermissionsManager` | Permission-gated actions | +| `installDocumentGetByIdMap` | Code looks up specific element IDs | +| `installMinimalDocumentMocks` / `installDocumentQueryStubs` | Low-level DOM stubs | +| `mergeWindowMocks` | Attach globals (`downloadActionManager`, etc.) | +| `flushMicrotasks` | Settle `setTimeout(0)` chains | +| `createMockFetchResponse` / `mockFetchResolved` | Raw `fetch` tests | +| `installCsrfMetaToken` | `APIClient` / CSRF paths | +| `createPublishingSubmitDomFixture` | Publish flow DOM | +| `createDefaultAssetSearchConfig` | Search handler tests | + +`setupStandardUnitTest` always calls `jest.clearAllMocks()` and installs document stubs; pass `useModalDomUtils: true` for action/modal suites. + +## actionTestMocks.js + +| Export | Use when | +|--------|----------| +| `setupDownloadActionTestEnvironment` | Download action manager tests | +| `installBootstrapModalMocks` | Any Bootstrap 5 modal interaction | +| `createMockDownloadPermissions` | Download permission checks | +| `createDefaultShareActionConfig` | Share action defaults | + +## Example: permission denied + +```javascript +setupStandardUnitTest({ + apiClientOverrides: { post: jest.fn().mockResolvedValue({ success: false, message: "Forbidden" }) }, +}); +const manager = new SomeActionManager({ permissions: { canShare: false } }); +await manager.submit(); +expect(window.DOMUtils.showError).toHaveBeenCalled(); +``` + +## Example: DOM id map + +```javascript +const form = createMockFormElement(); +setupStandardUnitTest({ + getElementByIdMap: { "share-form": form }, +}); +``` + +## jest.setup.js + +Provides baseline `document`, `window`, `fetch`, storage, and timers. Do not duplicate full window mocks in every file—override only what the test needs in `beforeEach`. + +## Import paths + +From `actions/__tests__/Foo.test.js`: + +```javascript +const { setupStandardUnitTest } = require("../../tests-config/testHelpers.js"); +``` + +From `actions/details/__tests__/Bar.test.js`: + +```javascript +const { setupStandardUnitTest } = require("../../../tests-config/testHelpers.js"); +``` + +Adjust `../` depth to reach `tests-config/`. diff --git a/.github/workflows/gwy-code-quality.yaml b/.github/workflows/gwy-code-quality.yaml index 00c8eb2bf..aa40f62bf 100644 --- a/.github/workflows/gwy-code-quality.yaml +++ b/.github/workflows/gwy-code-quality.yaml @@ -58,6 +58,10 @@ jobs: key: prek-gateway-${{ hashFiles('gateway/.pre-commit-config.yaml') }} path: ~/.cache/prek/ + - name: Install gateway frontend dependencies + working-directory: ./gateway + run: npm ci + - name: Install hooks working-directory: ./gateway run: uv run --extra local prek install --install-hooks diff --git a/.github/workflows/sdk-code-quality.yaml b/.github/workflows/sdk-code-quality.yaml index 21d5443f4..d33a2bc44 100644 --- a/.github/workflows/sdk-code-quality.yaml +++ b/.github/workflows/sdk-code-quality.yaml @@ -54,6 +54,10 @@ jobs: key: prek-${{ hashFiles('.pre-commit-config.yaml') }} path: ~/.cache/prek/ + - name: Install gateway frontend dependencies + working-directory: ./gateway + run: npm ci + - name: Install hooks working-directory: ./sdk run: uv run --dev prek install --install-hooks diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8c6962b2..58e8f055a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -107,6 +107,12 @@ repos: language: system pass_filenames: false # run once per commit, not per file types: [ python ] + - id: fallow-cross-file-dupes + name: fallow cross-file dupes (gateway static js) + entry: bash gateway/scripts/fallow-cross-file-dupes.sh + language: system + pass_filenames: false + files: ^gateway/sds_gateway/static/js/.*\.js$ # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date ci: diff --git a/gateway/.fallowrc.json b/gateway/.fallowrc.json new file mode 100644 index 000000000..ff1e56d05 --- /dev/null +++ b/gateway/.fallowrc.json @@ -0,0 +1,9 @@ +{ + "$schema": "https://raw.githubusercontent.com/fallow-rs/fallow/main/schema.json", + "ignorePatterns": [ + "sds_gateway/static/js/deprecated/**", + "compose/**", + "sds_gateway/static/css/**" + ], + "ignoreExportsUsedInFile": true +} diff --git a/gateway/.gitignore b/gateway/.gitignore index 76db6d0a6..c310d5cbb 100644 --- a/gateway/.gitignore +++ b/gateway/.gitignore @@ -278,6 +278,8 @@ tags dump.rdb ### Project template +.fallow/ + sds_gateway/media/ .pytest_cache/ diff --git a/gateway/package-lock.json b/gateway/package-lock.json index a9685f574..eaabd5292 100644 --- a/gateway/package-lock.json +++ b/gateway/package-lock.json @@ -21,6 +21,7 @@ "babel-loader": "^9.2.1", "bootstrap": "^5.3.3", "css-loader": "^6.5.1", + "fallow": "^2.74.0", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "mini-css-extract-plugin": "^2.9.1", @@ -3092,6 +3093,118 @@ "node": ">=10.0.0" } }, + "node_modules/@fallow-cli/darwin-arm64": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/darwin-arm64/-/darwin-arm64-2.74.0.tgz", + "integrity": "sha512-zpxOjs8YdVgq82JSQbjph2Zzp8dlNBLC3vWcyAsmoUlnQxUTfmQbCM6PMugrs+7iMpp1IgTIjVXfZsnbua+L1Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@fallow-cli/darwin-x64": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/darwin-x64/-/darwin-x64-2.74.0.tgz", + "integrity": "sha512-0QCR3fsnbhmaHLLIMdhEMeoyvNAP6oxNAyVA3Te3eGjVum7yVy9P7FzN44D1pPerb1qriG4MsJOOfT8Hix/9jg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@fallow-cli/linux-arm64-gnu": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/linux-arm64-gnu/-/linux-arm64-gnu-2.74.0.tgz", + "integrity": "sha512-iGsRcR9+fd5WpybXFTBjw1mJigePJgdqp8T6NAqwgz0DgBUB1s8PpAnOUQRLtshfNAhsJdxZTakFuNdV8R7VTQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@fallow-cli/linux-arm64-musl": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/linux-arm64-musl/-/linux-arm64-musl-2.74.0.tgz", + "integrity": "sha512-9uqyXjhp5kRwJxucRxChN4/YmuDyuoPx2iKzqW73JgU08BGIJyY5Olq4B594MmqRrjwmsFm7jFKT8x9BbSvWlA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@fallow-cli/linux-x64-gnu": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/linux-x64-gnu/-/linux-x64-gnu-2.74.0.tgz", + "integrity": "sha512-K2ghYaXH8kmeos9bAKG7+HQLU7Y/hbm/+p9ZyTD28U/S/PdHtiny8KmuCCC7uisy9nUmTnyy59YX///3lkIqxA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@fallow-cli/linux-x64-musl": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/linux-x64-musl/-/linux-x64-musl-2.74.0.tgz", + "integrity": "sha512-3YSBIZLEXs47HX8HI2wr+C0QAuqF3eeB+3uDIijXgF0guE58iUrzFLOoFAqEv4cuv5WTvD/PtMllWyCPWkiIaQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@fallow-cli/win32-arm64-msvc": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/win32-arm64-msvc/-/win32-arm64-msvc-2.74.0.tgz", + "integrity": "sha512-wjCHg6iKjTwRg2AJ2wl2ryil5XAtxNwI1JbxC7I32uD4mZUnBqDNkijecC61ZGg18JpE3vsumwzqcZbQgPtwdw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@fallow-cli/win32-x64-msvc": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/@fallow-cli/win32-x64-msvc/-/win32-x64-msvc-2.74.0.tgz", + "integrity": "sha512-y5AsMPWWlI3gTrsFA+7ggeAMUbQjBQE15i+wu9LLlQs43RQdfY9DylYcMVw8gcQmxx0d+PcL/1WyJYdr8CeqSw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -6577,7 +6690,6 @@ "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "dev": true, "license": "Apache-2.0", - "optional": true, "engines": { "node": ">=8" } @@ -7072,6 +7184,35 @@ "dev": true, "license": "MIT" }, + "node_modules/fallow": { + "version": "2.74.0", + "resolved": "https://registry.npmjs.org/fallow/-/fallow-2.74.0.tgz", + "integrity": "sha512-Ym1hY5E/5hex0THEfjMrJ0tDPRc0Ax4q+rS8EeVprpG/etpkOa6hSeWktyuG+Bhj7E+PotHg8vrATEGQpNo6qw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "detect-libc": "2.1.2" + }, + "bin": { + "fallow": "bin/fallow", + "fallow-lsp": "bin/fallow-lsp", + "fallow-mcp": "bin/fallow-mcp" + }, + "engines": { + "node": ">=16" + }, + "optionalDependencies": { + "@fallow-cli/darwin-arm64": "2.74.0", + "@fallow-cli/darwin-x64": "2.74.0", + "@fallow-cli/linux-arm64-gnu": "2.74.0", + "@fallow-cli/linux-arm64-musl": "2.74.0", + "@fallow-cli/linux-x64-gnu": "2.74.0", + "@fallow-cli/linux-x64-musl": "2.74.0", + "@fallow-cli/win32-arm64-msvc": "2.74.0", + "@fallow-cli/win32-x64-msvc": "2.74.0" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", diff --git a/gateway/package.json b/gateway/package.json index b025607e5..8c28b4b49 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -2,6 +2,7 @@ "name": "sds_gateway", "version": "0.0.1", "devDependencies": { + "fallow": "^2.74.0", "@babel/core": "^7.25.2", "@babel/plugin-transform-runtime": "^7.25.4", "@babel/preset-env": "^7.25.4", @@ -50,6 +51,8 @@ "test": "jest --config sds_gateway/static/js/tests-config/jest.config.js", "test:watch": "jest --config sds_gateway/static/js/tests-config/jest.config.js --watch", "test:coverage": "jest --config sds_gateway/static/js/tests-config/jest.config.js --coverage", - "test:ci": "jest --config sds_gateway/static/js/tests-config/jest.config.js --ci --coverage --watchAll=false" + "test:ci": "jest --config sds_gateway/static/js/tests-config/jest.config.js --ci --coverage --watchAll=false", + "fallow": "fallow --summary", + "fallow:static-js": "node scripts/fallow-static-js-dead-code.cjs" } } diff --git a/gateway/scripts/fallow-cross-file-dupes.sh b/gateway/scripts/fallow-cross-file-dupes.sh new file mode 100755 index 000000000..6ac01cf41 --- /dev/null +++ b/gateway/scripts/fallow-cross-file-dupes.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")/.." + +npx fallow dupes --format json -q | jq -e ' + [ (.clone_groups // .dupes.clone_groups // [])[] + | select((.instances | map(.file) | unique | length) > 1) + ] | length == 0 +' >/dev/null + +echo "No cross-file clone groups detected." \ No newline at end of file diff --git a/gateway/scripts/fallow-static-js-dead-code.cjs b/gateway/scripts/fallow-static-js-dead-code.cjs new file mode 100644 index 000000000..b39538b53 --- /dev/null +++ b/gateway/scripts/fallow-static-js-dead-code.cjs @@ -0,0 +1,32 @@ +#!/usr/bin/env node +/** + * Runs `fallow dead-code` with `--file` for each non-deprecated `.js` under + * `sds_gateway/static/js/` so reported issues are limited to that tree while + * the full project graph (webpack + templates) still resolves usage. + */ +const { spawnSync } = require("node:child_process"); +const fs = require("node:fs"); +const path = require("node:path"); + +const root = path.join(__dirname, ".."); +const base = path.join(root, "sds_gateway/static/js"); +const deprecated = path.join(base, "deprecated") + path.sep; + +function walk(dir, out) { + for (const ent of fs.readdirSync(dir, { withFileTypes: true })) { + const p = path.join(dir, ent.name); + if (p.startsWith(deprecated)) continue; + if (ent.isDirectory()) walk(p, out); + else if (p.endsWith(".js")) out.push(path.relative(root, p)); + } +} + +const files = []; +walk(base, files); +const args = ["dead-code"]; +for (const f of files) { + args.push("--file", f); +} +const bin = path.join(root, "node_modules", ".bin", "fallow"); +const r = spawnSync(bin, args, { cwd: root, stdio: "inherit" }); +process.exit(r.status === null ? 1 : r.status); diff --git a/gateway/sds_gateway/api_methods/serializers/capture_serializers.py b/gateway/sds_gateway/api_methods/serializers/capture_serializers.py index 182ad1ef7..da6b8ea9e 100644 --- a/gateway/sds_gateway/api_methods/serializers/capture_serializers.py +++ b/gateway/sds_gateway/api_methods/serializers/capture_serializers.py @@ -15,6 +15,7 @@ from sds_gateway.api_methods.helpers.index_handling import retrieve_indexed_metadata from sds_gateway.api_methods.models import Capture from sds_gateway.api_methods.models import CaptureType +from sds_gateway.api_methods.models import PermissionLevel from sds_gateway.api_methods.models import DEPRECATEDPostProcessedData from sds_gateway.api_methods.models import File from sds_gateway.api_methods.models import ItemType @@ -115,6 +116,7 @@ class CaptureGetSerializer(serializers.ModelSerializer[Capture]): share_permissions = serializers.SerializerMethodField() is_shared = serializers.SerializerMethodField() is_shared_with_me = serializers.SerializerMethodField() + permission_level = serializers.SerializerMethodField() capture_props = serializers.SerializerMethodField() files = serializers.SerializerMethodField() total_file_size = serializers.SerializerMethodField() @@ -169,6 +171,27 @@ def get_is_shared(self, capture: Capture) -> bool: """ return check_if_shared(capture.uuid, ItemType.CAPTURE) + def get_permission_level(self, capture: Capture) -> PermissionLevel | None: + """Get the current user's permission level for this capture.""" + request = self.context.get("request") + if not request or not hasattr(request, "user"): + return None + + # Check if user is the owner + if capture.owner == request.user: + return PermissionLevel.OWNER + + # Check for shared permissions + permission = UserSharePermission.objects.filter( + shared_with=request.user, + item_type=ItemType.CAPTURE, + item_uuid=capture.uuid, + is_enabled=True, + is_deleted=False, + ).first() + + return permission.permission_level if permission else None + def get_files(self, capture: Capture) -> ReturnList[File]: """Get the files for the capture. diff --git a/gateway/sds_gateway/static/css/file-list.css b/gateway/sds_gateway/static/css/file-list.css index 193b27adb..1caa7366e 100644 --- a/gateway/sds_gateway/static/css/file-list.css +++ b/gateway/sds_gateway/static/css/file-list.css @@ -344,11 +344,40 @@ body { transform: scale(1.15); } +/* Capture list table column widths (matches capture_list_table_row.html) */ +.capture-list-table { + table-layout: fixed; + width: 100%; +} + +.capture-list-table .capture-col-select { + width: 3rem; +} + +.capture-list-table .capture-col-name { + width: 34%; +} + +.capture-list-table .capture-col-directory { + width: 22%; +} + +.capture-list-table .capture-col-type { + width: 14%; +} + +.capture-list-table .capture-col-created { + width: 20%; +} + +.capture-list-table .capture-col-actions { + width: 7rem; +} + /* ================================ Modal Styling ================================ */ .modal-dialog { - max-width: 600px; margin: 1.75rem auto; } diff --git a/gateway/sds_gateway/static/js/__tests__/file-list.test.js b/gateway/sds_gateway/static/js/__tests__/file-list.test.js deleted file mode 100644 index 62582e290..000000000 --- a/gateway/sds_gateway/static/js/__tests__/file-list.test.js +++ /dev/null @@ -1,784 +0,0 @@ -/** - * Jest tests for file-list.js - * Tests FileListController and FileListCapturesTableManager functionality - */ - -// Mock components.js classes that file-list.js depends on -// These MUST be set up BEFORE importing file-list.js -class MockTableManager { - constructor(options) { - this.options = options; - this.showLoading = jest.fn(); - this.hideLoading = jest.fn(); - this.showError = jest.fn(); - this.attachRowClickHandlers = jest.fn(); - } -} - -class MockCapturesTableManager extends MockTableManager { - constructor(options) { - super(options); - this.resultsCountElement = null; - } - updateTable() {} - updateResultsCount() {} - renderRow() {} -} - -class MockSearchManager { - constructor(options) { - this.options = options; - } -} - -class MockModalManager { - constructor(options) { - this.options = options; - } -} - -class MockPaginationManager { - constructor(options) { - this.options = options; - } -} - -// Make these available globally (as they would be from components.js) -global.TableManager = MockTableManager; -global.CapturesTableManager = MockCapturesTableManager; -global.SearchManager = MockSearchManager; -global.ModalManager = MockModalManager; -global.PaginationManager = MockPaginationManager; - -// Also make them available on window (file-list.js uses them without global prefix) -global.window.ModalManager = MockModalManager; -global.window.SearchManager = MockSearchManager; -global.window.PaginationManager = MockPaginationManager; - -// Mock CONFIG constant (file-list.js uses it) -global.CONFIG = { - DEBOUNCE_DELAY: 300, - DEFAULT_SORT_BY: "created_at", - DEFAULT_SORT_ORDER: "desc", - ELEMENT_IDS: { - SEARCH_INPUT: "search-input", - START_DATE: "start_date", - END_DATE: "end_date", - CENTER_FREQ_MIN: "centerFreqMinInput", - CENTER_FREQ_MAX: "centerFreqMaxInput", - APPLY_FILTERS: "apply-filters-btn", - CLEAR_FILTERS: "clear-filters-btn", - ITEMS_PER_PAGE: "items-per-page", - }, -}; - -// Mock ComponentUtils -global.window.ComponentUtils = { - escapeHtml: jest.fn((str) => { - if (!str) return ""; - return String(str) - .replace(/&/g, "&") - .replace(//g, ">") - .replace(/"/g, """) - .replace(/'/g, "'"); - }), - formatDateForModal: jest.fn((date) => { - if (!date) return "-"; - const d = new Date(date); - return d.toISOString().split("T")[0]; - }), -}; - -// Mock Bootstrap Dropdown -global.bootstrap.Dropdown = jest - .fn() - .mockImplementation((element, options) => ({ - show: jest.fn(), - hide: jest.fn(), - element: element, - options: options, - })); - -// NOW import the actual classes from file-list.js -// (after all dependencies are mocked) -// Use require() instead of import so it executes after mocks are set up -const { FileListController } = require("../file-list.js"); - -describe("FileListController", () => { - let fileListController; - let mockElements; - let mockTableManager; - let mockSearchManager; - let mockModalManager; - let mockPaginationManager; - - beforeEach(() => { - jest.clearAllMocks(); - - // Mock DOM elements - mockElements = { - searchInput: { - value: "", - addEventListener: jest.fn(), - }, - startDate: { value: "", addEventListener: jest.fn() }, - endDate: { value: "", addEventListener: jest.fn() }, - centerFreqMin: { value: "", addEventListener: jest.fn() }, - centerFreqMax: { value: "", addEventListener: jest.fn() }, - applyFilters: { addEventListener: jest.fn() }, - clearFilters: { addEventListener: jest.fn() }, - itemsPerPage: { value: "25", addEventListener: jest.fn() }, - sortableHeaders: [], - frequencyButton: { addEventListener: jest.fn() }, - frequencyCollapse: {}, - dateButton: { addEventListener: jest.fn() }, - dateCollapse: {}, - }; - - // Mock document methods - document.getElementById = jest.fn((id) => { - const idMap = { - "search-input": mockElements.searchInput, - start_date: mockElements.startDate, - end_date: mockElements.endDate, - centerFreqMinInput: mockElements.centerFreqMin, - centerFreqMaxInput: mockElements.centerFreqMax, - "apply-filters-btn": mockElements.applyFilters, - "clear-filters-btn": mockElements.clearFilters, - "items-per-page": mockElements.itemsPerPage, - collapseFrequency: mockElements.frequencyCollapse, - collapseDate: mockElements.dateCollapse, - }; - return idMap[id] || null; - }); - - document.querySelector = jest.fn((selector) => { - if (selector === '[data-bs-target="#collapseFrequency"]') { - return mockElements.frequencyButton; - } - if (selector === '[data-bs-target="#collapseDate"]') { - return mockElements.dateButton; - } - if (selector === "th.sortable") { - return []; - } - return null; - }); - - document.querySelectorAll = jest.fn(() => []); - - // Mock window.location - window.location = { - pathname: "/captures/", - search: "", - }; - window.history = { - pushState: jest.fn(), - }; - - // Mock URLSearchParams - window.URLSearchParams = class URLSearchParams { - constructor(search) { - this.params = new Map(); - if (search) { - const pairs = search.replace("?", "").split("&"); - for (const pair of pairs) { - const [key, value] = pair.split("="); - if (key) this.params.set(key, value || ""); - } - } - } - get(name) { - return this.params.get(name) || null; - } - set(name, value) { - this.params.set(name, value); - } - toString() { - return Array.from(this.params.entries()) - .map(([k, v]) => `${k}=${v}`) - .join("&"); - } - }; - - // Create mock managers - mockTableManager = new MockCapturesTableManager({ - tableId: "captures-table", - loadingIndicatorId: "loading-indicator", - tableContainerSelector: ".table-responsive", - resultsCountId: "results-count", - }); - - mockSearchManager = new MockSearchManager({ - searchInputId: "search-input", - searchButtonId: "search-btn", - clearButtonId: "reset-search-btn", - }); - - mockModalManager = new MockModalManager({ - modalId: "capture-modal", - modalBodyId: "capture-modal-body", - }); - - mockPaginationManager = new MockPaginationManager({ - containerId: "captures-pagination", - }); - - // Mock global classes (they would be imported from components.js) - global.ModalManager = jest.fn(() => mockModalManager); - global.SearchManager = jest.fn(() => mockSearchManager); - global.PaginationManager = jest.fn(() => mockPaginationManager); - global.CapturesTableManager = jest.fn(() => mockTableManager); - - // Also make them available on window (file-list.js uses them without global prefix) - global.window.ModalManager = global.ModalManager; - global.window.SearchManager = global.SearchManager; - global.window.PaginationManager = global.PaginationManager; - global.window.CapturesTableManager = global.CapturesTableManager; - }); - - describe("Initialization", () => { - test("should initialize with default sort values", () => { - window.location.search = ""; - fileListController = new FileListController(); - - expect(fileListController.currentSortBy).toBe("created_at"); - expect(fileListController.currentSortOrder).toBe("desc"); - }); - - test("should initialize with URL params", () => { - // Mock URLSearchParams to return the values we want - const originalURLSearchParams = window.URLSearchParams; - window.URLSearchParams = class URLSearchParams { - constructor(search) { - this.params = new Map(); - if (search) { - const pairs = search.replace("?", "").split("&"); - for (const pair of pairs) { - const [key, value] = pair.split("="); - if (key) this.params.set(key, value || ""); - } - } - } - get(name) { - return this.params.get(name) || null; - } - }; - - // Create a mock location that will be used by URLSearchParams - Object.defineProperty(window, "location", { - value: { - search: "?sort_by=name&sort_order=asc", - pathname: "/captures/", - }, - writable: true, - }); - - fileListController = new FileListController(); - - expect(fileListController.currentSortBy).toBe("name"); - expect(fileListController.currentSortOrder).toBe("asc"); - - // Restore - window.URLSearchParams = originalURLSearchParams; - }); - - test("should cache DOM elements", () => { - fileListController = new FileListController(); - - expect(fileListController.elements).toBeDefined(); - expect(fileListController.elements.searchInput).toBe( - mockElements.searchInput, - ); - expect(fileListController.elements.startDate).toBe( - mockElements.startDate, - ); - }); - - test("should initialize component managers", () => { - fileListController = new FileListController(); - - expect(global.ModalManager).toHaveBeenCalled(); - expect(global.SearchManager).toHaveBeenCalled(); - expect(global.PaginationManager).toHaveBeenCalled(); - expect(fileListController.modalManager).toBe(mockModalManager); - expect(fileListController.searchManager).toBe(mockSearchManager); - }); - }); - - describe("Search functionality", () => { - beforeEach(() => { - fileListController = new FileListController(); - }); - - test("buildSearchParams should include all filter values", () => { - mockElements.searchInput.value = "test search"; - mockElements.startDate.value = "2024-01-01"; - mockElements.endDate.value = "2024-12-31"; - mockElements.centerFreqMin.value = "1.0"; - mockElements.centerFreqMax.value = "5.0"; - - // Set userInteractedWithFrequency to true to include frequency params - fileListController.userInteractedWithFrequency = true; - - const params = fileListController.buildSearchParams(); - - expect(params.get("search")).toBe("test search"); - expect(params.get("date_start")).toBe("2024-01-01"); - expect(params.get("date_end")).toBe("2024-12-31T23:59:59"); - expect(params.get("min_freq")).toBe("1.0"); - expect(params.get("max_freq")).toBe("5.0"); - expect(params.get("sort_by")).toBe("created_at"); - expect(params.get("sort_order")).toBe("desc"); - }); - - test("buildSearchParams should handle empty values", () => { - mockElements.searchInput.value = ""; - mockElements.startDate.value = ""; - - const params = fileListController.buildSearchParams(); - - // Empty values should not be set in params - expect(params.get("search")).toBeNull(); - expect(params.get("date_start")).toBeNull(); - // But sort params should always be set - expect(params.get("sort_by")).toBe("created_at"); - expect(params.get("sort_order")).toBe("desc"); - }); - }); -}); - -describe("FileListCapturesTableManager", () => { - let tableManager; - let mockTbody; - let mockResultsCount; - - beforeEach(() => { - jest.clearAllMocks(); - - // Mock tbody element - mockTbody = { - innerHTML: "", - querySelector: jest.fn(), - querySelectorAll: jest.fn(() => []), - }; - - // Mock results count element - mockResultsCount = { - textContent: "", - }; - - document.querySelector = jest.fn((selector) => { - if (selector === "tbody") { - return mockTbody; - } - return null; - }); - - document.querySelectorAll = jest.fn(() => []); - - document.getElementById = jest.fn((id) => { - if (id === "results-count") { - return mockResultsCount; - } - return null; - }); - - // Mock ComponentUtils - global.window.ComponentUtils = { - escapeHtml: jest.fn((str) => { - if (!str) return ""; - return String(str) - .replace(/&/g, "&") - .replace(//g, ">") - .replace(/"/g, """) - .replace(/'/g, "'"); - }), - formatDateForModal: jest.fn((date) => { - if (!date) return "-"; - const d = new Date(date); - return d.toISOString().split("T")[0]; - }), - }; - - // Mock Bootstrap Dropdown - global.bootstrap.Dropdown = jest.fn().mockImplementation((element) => ({ - show: jest.fn(), - hide: jest.fn(), - element: element, - })); - - // Create table manager instance - // We need to import or define the class - for now, we'll test it directly - // In a real scenario, we'd import from file-list.js - tableManager = { - resultsCountElement: mockResultsCount, - renderRow: (capture) => { - // This would be the actual renderRow implementation - const safeData = { - uuid: window.ComponentUtils.escapeHtml(capture.uuid || ""), - name: window.ComponentUtils.escapeHtml(capture.name || ""), - channel: window.ComponentUtils.escapeHtml(capture.channel || ""), - scanGroup: window.ComponentUtils.escapeHtml(capture.scan_group || ""), - captureType: window.ComponentUtils.escapeHtml( - capture.capture_type || "", - ), - captureTypeDisplay: window.ComponentUtils.escapeHtml( - capture.capture_type_display || "", - ), - topLevelDir: window.ComponentUtils.escapeHtml( - capture.top_level_dir || "", - ), - owner: window.ComponentUtils.escapeHtml(capture.owner || ""), - }; - - const nameDisplay = safeData.name || "Unnamed Capture"; - const typeDisplay = - safeData.captureTypeDisplay || safeData.captureType || "-"; - - return ` - - - - ${nameDisplay} - - - ${safeData.topLevelDir || "-"} - ${typeDisplay} - - - -
- - -
- - - `; - }, - updateTable: function (captures, hasResults) { - if (!mockTbody) return; - - if (!hasResults || captures.length === 0) { - mockTbody.innerHTML = ` - - - No captures found matching your search criteria. - - - `; - return; - } - - const tableHTML = captures - .map((capture, index) => this.renderRow(capture, index)) - .join(""); - mockTbody.innerHTML = tableHTML; - - // Initialize dropdowns - this.initializeDropdowns(); - }, - updateResultsCount: function (captures, hasResults) { - if (this.resultsCountElement) { - const count = hasResults && captures ? captures.length : 0; - const pluralSuffix = count === 1 ? "" : "s"; - this.resultsCountElement.textContent = `${count} capture${pluralSuffix} found`; - } - }, - initializeDropdowns: () => { - const dropdownButtons = document.querySelectorAll(".btn-icon-dropdown"); - - if (dropdownButtons.length === 0) { - return; - } - - for (const toggle of dropdownButtons) { - if (toggle._dropdown) { - continue; - } - - const dropdownMenu = toggle.nextElementSibling; - if ( - !dropdownMenu || - !dropdownMenu.classList.contains("dropdown-menu") - ) { - continue; - } - - const dropdown = new bootstrap.Dropdown(toggle, { - container: "body", - boundary: "viewport", - popperConfig: { - modifiers: [ - { - name: "preventOverflow", - options: { - boundary: "viewport", - }, - }, - ], - }, - }); - - toggle.addEventListener("show.bs.dropdown", () => { - if (dropdownMenu?.classList.contains("dropdown-menu")) { - document.body.appendChild(dropdownMenu); - } - }); - - toggle._dropdown = dropdown; - } - }, - }; - }); - - describe("updateTable", () => { - test("should render empty state when no results", () => { - tableManager.updateTable([], false); - - expect(mockTbody.innerHTML).toContain("No captures found"); - expect(mockTbody.innerHTML).toContain('colspan="5"'); - }); - - test("should render captures when results exist", () => { - const captures = [ - { - uuid: "test-uuid-1", - name: "Test Capture 1", - capture_type: "drf", - capture_type_display: "DRF", - top_level_dir: "/test/dir", - channel: "1", - owner: "test@example.com", - created_at: "2024-01-01T00:00:00Z", - }, - { - uuid: "test-uuid-2", - name: "Test Capture 2", - capture_type: "rh", - capture_type_display: "RH", - top_level_dir: "/test/dir2", - channel: "2", - owner: "test2@example.com", - created_at: "2024-01-02T00:00:00Z", - }, - ]; - - tableManager.updateTable(captures, true); - - expect(mockTbody.innerHTML).toContain("Test Capture 1"); - expect(mockTbody.innerHTML).toContain("Test Capture 2"); - expect(mockTbody.innerHTML).toContain("test-uuid-1"); - expect(mockTbody.innerHTML).toContain("test-uuid-2"); - }); - - test("should call initializeDropdowns after rendering", () => { - const spy = jest.spyOn(tableManager, "initializeDropdowns"); - const captures = [ - { - uuid: "test-uuid-1", - name: "Test Capture", - capture_type: "drf", - top_level_dir: "/test", - channel: "1", - owner: "test@example.com", - }, - ]; - - tableManager.updateTable(captures, true); - - expect(spy).toHaveBeenCalled(); - }); - }); - - describe("updateResultsCount", () => { - test("should update results count with correct pluralization", () => { - const captures = [{ uuid: "1" }]; - tableManager.updateResultsCount(captures, true); - - expect(mockResultsCount.textContent).toBe("1 capture found"); - }); - - test("should handle plural form", () => { - const captures = [{ uuid: "1" }, { uuid: "2" }]; - tableManager.updateResultsCount(captures, true); - - expect(mockResultsCount.textContent).toBe("2 captures found"); - }); - - test("should handle no results", () => { - tableManager.updateResultsCount([], false); - - expect(mockResultsCount.textContent).toBe("0 captures found"); - }); - }); - - describe("initializeDropdowns", () => { - test("should initialize Bootstrap dropdowns", () => { - const mockDropdownMenu = { - classList: { - contains: jest.fn(() => true), - }, - }; - const mockToggle = { - _dropdown: null, - nextElementSibling: mockDropdownMenu, - addEventListener: jest.fn(), - }; - - document.querySelectorAll = jest.fn(() => [mockToggle]); - - // Mock document.body properly - if (!document.body) { - document.body = document.createElement("body"); - } - document.body.appendChild = jest.fn(); - - tableManager.initializeDropdowns(); - - expect(global.bootstrap.Dropdown).toHaveBeenCalled(); - expect(mockToggle._dropdown).toBeDefined(); - expect(mockToggle.addEventListener).toHaveBeenCalledWith( - "show.bs.dropdown", - expect.any(Function), - ); - }); - - test("should skip already initialized dropdowns", () => { - const mockToggle = { - _dropdown: { show: jest.fn() }, - nextElementSibling: null, - addEventListener: jest.fn(), - }; - - document.querySelectorAll = jest.fn(() => [mockToggle]); - - tableManager.initializeDropdowns(); - - expect(global.bootstrap.Dropdown).not.toHaveBeenCalled(); - }); - - test("should handle missing dropdown menu", () => { - const mockToggle = { - _dropdown: null, - nextElementSibling: null, - addEventListener: jest.fn(), - }; - - document.querySelectorAll = jest.fn(() => [mockToggle]); - - tableManager.initializeDropdowns(); - - // Should not initialize dropdown if nextElementSibling is null - expect(global.bootstrap.Dropdown).not.toHaveBeenCalled(); - }); - }); - - describe("renderRow", () => { - test("should render row with all required columns", () => { - const capture = { - uuid: "test-uuid", - name: "Test Capture", - capture_type: "drf", - capture_type_display: "DRF", - top_level_dir: "/test/dir", - channel: "1", - owner: "test@example.com", - created_at: "2024-01-01T00:00:00Z", - }; - - const html = tableManager.renderRow(capture, 0); - - expect(html).toContain("test-uuid"); - expect(html).toContain("Test Capture"); - expect(html).toContain("/test/dir"); - expect(html).toContain('headers="name-header"'); - expect(html).toContain('headers="top-level-dir-header"'); - expect(html).toContain('headers="type-header"'); - expect(html).toContain('headers="created-header"'); - expect(html).toContain('headers="actions-header"'); - }); - - test("should escape HTML in capture data", () => { - const capture = { - uuid: "test-uuid", - name: "", - capture_type: "drf", - top_level_dir: "/test/dir", - channel: "1", - owner: "test@example.com", - }; - - const html = tableManager.renderRow(capture, 0); - - expect(html).not.toContain(" + + + + {% endblock javascript %} @@ -188,10 +192,10 @@
{{ notification.user_message }}
{% endfor %} {% endif %} - {% comment %} Django messages rendered as toasts {% endcomment %} + {% comment %} Django messages: server-rendered toasts via message.html {% endcomment %} {% if messages %} {% for message in messages %} - {% include "users/components/toast.html" with message=message type=message.level_tag|default:"info" %} + {% include "users/components/message.html" with message=message type=message.level_tag|default:"info" presentation="toast" %} {% endfor %} {% endif %} {% block body %} diff --git a/gateway/sds_gateway/templates/pages/home.html b/gateway/sds_gateway/templates/pages/home.html index c230b392a..8c552f007 100644 --- a/gateway/sds_gateway/templates/pages/home.html +++ b/gateway/sds_gateway/templates/pages/home.html @@ -59,10 +59,11 @@

Latest Public Datasets

{{ dataset.name }} + class="dataset-name-link text-decoration-none dataset-details-open" + data-dataset-uuid="{{ dataset.uuid }}" + data-item-uuid="{{ dataset.uuid }}" + data-item-type="dataset" + aria-label="View details for {{ dataset.name }}">{{ dataset.name }} {% if dataset.is_public %}{% endif %}
@@ -163,13 +164,11 @@

SpectrumX Website

- - {% for dataset in latest_datasets %} - {% include "users/partials/dataset_details_modal.html" with dataset=dataset %} - {% endfor %} + {% include "users/partials/asset_details_modal.html" %} {% endblock body %} {% block javascript %} {{ block.super }} + @@ -177,28 +176,7 @@

SpectrumX Website

{# djlint:off #} {# djlint:on #} diff --git a/gateway/sds_gateway/templates/users/capture_list.html b/gateway/sds_gateway/templates/users/capture_list.html new file mode 100644 index 000000000..1547e8eb1 --- /dev/null +++ b/gateway/sds_gateway/templates/users/capture_list.html @@ -0,0 +1,409 @@ +{# Captures list page (shell + filters + table + modals). Legacy URL/template name was file_list.html. #} +{% extends "base.html" %} + +{% load static %} + +{% block bodyclass %} + hero-white-page +{% endblock bodyclass %} +{% block css %} + {{ block.super }} + + +{% endblock css %} +{% block body %} + + + + + + + + + + + {% csrf_token %} + + {% if system_notifications %} +
+ {% for notification in system_notifications %} +
{{ notification.user_message }}
+ {% endfor %} +
+ {% endif %} + {% if messages %} +
+ {% for message in messages %} + {% include "users/components/message.html" with message=message type=message.level_tag|default:"info" presentation="toast" %} + {% endfor %} +
+ {% endif %} +
+
+
+
+ +
+
+

Captures

+
+
+ +
+ + + +
+ + + +
+ +

Searching captures...

+
+ +
+ {% include "users/components/asset_list_table.html" with page_obj=page_obj asset_type=asset_type table_headers=table_headers no_assets_message=no_assets_message asset_row_template=asset_row_template ajax_fragment=ajax_fragment %} +
+
+
+
+
+
+ + {% include "users/partials/quick_add_to_dataset_modal.html" %} + {% include "users/partials/asset_details_modal.html" %} + + {% include "users/partials/upload_capture_modal.html" %} + + {% include "users/partials/upload_result_modal.html" %} +
+ + {% include "users/components/capture_list_modals.html" with captures=page_obj.object_list %} +
+{% endblock body %} +{% block javascript %} + {{ block.super }} + + + + + + + + + + + + + + + {# djlint:off #} + + {# djlint:on #} + + + + + + + + {# djlint:off #} + + + {# djlint:on #} +{% endblock javascript %} diff --git a/gateway/sds_gateway/templates/users/components/asset_list_table.html b/gateway/sds_gateway/templates/users/components/asset_list_table.html new file mode 100644 index 000000000..445870574 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/asset_list_table.html @@ -0,0 +1,104 @@ +{% comment %} +Single source for the dataset list table (full page + AJAX refresh). + +Context: +- page_obj, sort_by, sort_order (required) +- asset_type: "dataset" | "capture" | "file" (default: "asset") +- table_headers: list of { label, col_class, aria_label?, text_align? } +- table_class: extra class on (e.g. capture-list-table) +- no_assets_message: message to display if no assets are found +- asset_row_template: template to render for each asset row +- ajax_fragment: True for AJAX partial (omit outer #dataset-list-ajax-wrapper) +{% endcomment %} +{% load tz %} + +{# Wrapper for ListRefreshManager; omitted when injecting into existing wrapper #} +{% if not ajax_fragment %}
{% endif %} + + {% if page_obj.object_list %} +
+ + {{ page_obj.paginator.count }} {{ asset_type|default:"asset" }}{{ page_obj.paginator.count|pluralize }} found + +
+ {% endif %} + +
+
+
+ {% if not page_obj.object_list %} +
+ + {% include "users/components/asset_list_table_thead.html" %} +
+ + {% else %} + + + {% include "users/components/asset_list_table_thead.html" %} + + {% for asset in page_obj %} + {% if "dataset_list_table_row" in asset_row_template %} + {% include asset_row_template with dataset=asset dropdown_menu_items=asset.dropdown_menu_items %} + {% else %} + {% include asset_row_template with capture=asset dropdown_menu_items=asset.dropdown_menu_items %} + {% endif %} + {% endfor %} + +
+ {% endif %} + + + + {% if page_obj and page_obj.has_other_pages %} + + {% endif %} + {% if not ajax_fragment %}{% endif %} diff --git a/gateway/sds_gateway/templates/users/components/asset_list_table_thead.html b/gateway/sds_gateway/templates/users/components/asset_list_table_thead.html new file mode 100644 index 000000000..634977335 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/asset_list_table_thead.html @@ -0,0 +1,12 @@ +{% comment %} +table_headers: list of { label, col_class, aria_label?, text_align? } +{% endcomment %} + + + {% for header in table_headers %} + {{ header.label }} + {% endfor %} + + diff --git a/gateway/sds_gateway/templates/users/components/badge.html b/gateway/sds_gateway/templates/users/components/badge.html deleted file mode 100644 index 35ba47896..000000000 --- a/gateway/sds_gateway/templates/users/components/badge.html +++ /dev/null @@ -1,5 +0,0 @@ -{% comment %} -Badge Component -Renders Bootstrap badge -{% endcomment %} -{{ text }} diff --git a/gateway/sds_gateway/templates/users/components/button.html b/gateway/sds_gateway/templates/users/components/button.html deleted file mode 100644 index 719d30baa..000000000 --- a/gateway/sds_gateway/templates/users/components/button.html +++ /dev/null @@ -1,16 +0,0 @@ -{% comment %} -Button Component -Renders Bootstrap button with optional icon and loading state -{% endcomment %} - diff --git a/gateway/sds_gateway/templates/users/components/capture_details_modal_body.html b/gateway/sds_gateway/templates/users/components/capture_details_modal_body.html new file mode 100644 index 000000000..cbf19bf8b --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/capture_details_modal_body.html @@ -0,0 +1,164 @@ +{% comment %} +Capture details modal body — rendered server-side for ModalManager injection. +{% endcomment %} +
+
+
+ Basic Information +
+
+
+ +
+ + + + +
+
Click the edit button to modify the capture name
+
+
+
+

+ Capture Type: + {{ capture.capture_type_display|default:capture.capture_type|default:"N/A" }} +

+

+ Origin: + {{ capture.origin|default:"N/A" }} +

+
+
+

+ Owner: + {{ owner_display }} +

+
+
+
+ {{ channel_label }}: + {{ channel_value }} +
+
+
+
+
+ Technical Details +
+
+
+
+

+ Scan Group: + {{ capture.scan_group|default:"N/A" }} +

+

+ Dataset: + {{ dataset_display }} +

+

+ Is Public: + {{ is_public_yesno }} +

+
+
+

+ Top Level Directory: + {{ capture.top_level_dir|default:"N/A" }} +

+

+ Center Frequency: + {{ center_frequency_display }} +

+
+
+
+
+
+
+ Timestamps +
+
+
+
+

+ Created At: +
+ {{ capture.formatted_created_at|default:capture.created_at }} +

+
+
+

+ Updated At: +
+ {{ capture.updated_at }} +

+
+
+
+{% if accordion_channels %} +
+
Channel Details
+
+ {% for ch in accordion_channels %} +
+

+ +

+
+
+
+ {% if ch.metadata_rows %} + {% for row in ch.metadata_rows %} +

+ {{ row.label }}: {{ row.value }} +

+ {% endfor %} + {% else %} + No metadata available + {% endif %} +
+
+
+
+ {% endfor %} +
+
+{% endif %} +
+ {% include "users/components/capture_files_summary_fragment.html" %} +
diff --git a/gateway/sds_gateway/templates/users/components/capture_files_summary_fragment.html b/gateway/sds_gateway/templates/users/components/capture_files_summary_fragment.html new file mode 100644 index 000000000..02fb87ca4 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/capture_files_summary_fragment.html @@ -0,0 +1,20 @@ +{% load humanize %} +
+
+
+ Files Summary +
+
+
+

+ Number of Files: + {{ files_count }} +

+
+
+

+ Total Size: + {{ total_size|filesizeformat }} +

+
+
diff --git a/gateway/sds_gateway/templates/users/components/capture_list_modals.html b/gateway/sds_gateway/templates/users/components/capture_list_modals.html new file mode 100644 index 000000000..9252d19a5 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/capture_list_modals.html @@ -0,0 +1,9 @@ +{% comment %} +Per-capture modals: share + web download (full page + AJAX list refresh). +{% endcomment %} +{% for cap in captures %} + {% if cap.capture %} + {% include "users/partials/share_modal.html" with item=cap item_type="capture" %} + {% include "users/partials/web_download_modal.html" with item=cap item_type="capture" %} + {% endif %} +{% endfor %} diff --git a/gateway/sds_gateway/templates/users/components/capture_list_table_row.html b/gateway/sds_gateway/templates/users/components/capture_list_table_row.html new file mode 100644 index 000000000..cbeb7b3d7 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/capture_list_table_row.html @@ -0,0 +1,58 @@ +{% comment %} +Single source for the capture list table (full page + AJAX refresh). + +Context: +- capture: capture object +- dropdown_menu_items: list of dropdown menu items +{% endcomment %} +{% load tz %} + + + + {% if capture.is_owner %} + + {% else %} + + {% endif %} + + + + {{ capture.name|default:"Unnamed Capture" }} + + {% if capture.is_shared_with_me %} + + + + {% endif %} + + {{ capture.top_level_dir|default:"-" }} + {{ capture.capture_type_display }} + + {% if capture.capture.created_at %} + {% localtime on %} +
+ {{ capture.capture.created_at|date:"Y-m-d" }} + {{ capture.capture.created_at|date:"H:i:s T" }} +
+ {% endlocaltime %} + {% else %} + - + {% endif %} + + + {% include "users/components/dropdown_menu.html" with items=dropdown_menu_items %} + + diff --git a/gateway/sds_gateway/templates/users/components/dataset_details_modal_body.html b/gateway/sds_gateway/templates/users/components/dataset_details_modal_body.html new file mode 100644 index 000000000..f7a24b5e3 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/dataset_details_modal_body.html @@ -0,0 +1,163 @@ +{% load tz %} +
+
+
+
+
+
+ Dataset Information +
+
+
+
+
+
+ +
+

{{ dataset.name }} (v{{ dataset.version }})

+ +
+
+
+ +

+ {% if dataset.authors %} + {% for author in dataset.authors %} + {% firstof author.name author %} + {% if not forloop.last %}, {% endif %} + {% endfor %} + {% else %} + No authors specified + {% endif %} +

+
+
+
+
+ +

+ {% if dataset.status == "final" %} + Final + {% elif dataset.status == "draft" %} + Draft + {% else %} + Unknown + {% endif %} +

+
+
+ +

+ {% if dataset.created_at %} + {{ dataset.created_at }} + {% else %} + — + {% endif %} +

+
+
+ +

+ {% if dataset_updated_at %} + {% localtime on %} + {{ dataset_updated_at|date:"M j, Y, g:i A" }} + {% endlocaltime %} + {% else %} + — + {% endif %} +

+
+
+
+
+ +

{{ dataset.description|default:"No description provided" }}

+
+
+ +
+ {% if dataset.keywords %} + {% for keyword in dataset.keywords %} + {{ keyword }} + {% endfor %} + {% else %} + No keywords + {% endif %} +
+
+
+
+
+
+
+
+
+
+
+ Files and Captures +
+
+
+
+
+
+
+
Total Files
+

{{ statistics.total_files }}

+
+
+
+
+
+
+
Capture Files
+

{{ statistics.captures }}

+
+
+
+
+
+
+
Artifact Files
+

{{ statistics.artifacts }}

+
+
+
+
+
+
+
Total Size
+

{{ statistics.total_size|filesizeformat }}

+
+
+
+
+
+ + + + + + + + + + + + {% include "users/components/modal_file_tree.html" with rows=tree_rows only %} + +
NameTypeSizeCreated At
+
+
+
+
+
+
diff --git a/gateway/sds_gateway/templates/users/components/dataset_list_modals.html b/gateway/sds_gateway/templates/users/components/dataset_list_modals.html index d9475ea8f..c9223469e 100644 --- a/gateway/sds_gateway/templates/users/components/dataset_list_modals.html +++ b/gateway/sds_gateway/templates/users/components/dataset_list_modals.html @@ -4,10 +4,11 @@ Context: page_obj (paginated dataset list) {% endcomment %} {% for dataset in page_obj %} - {% include "users/partials/dataset_details_modal.html" with dataset=dataset %} {% include "users/partials/web_download_modal.html" with item=dataset item_type="dataset" %} - {% include "users/partials/share_modal.html" with item=dataset item_type="dataset" %} {% include "users/partials/sdk_download_modal.html" with dataset=dataset %} + {% if dataset.is_owner or dataset.permission_level == 'co-owner' or dataset.permission_level == 'contributor' %} + {% include "users/partials/share_modal.html" with item=dataset item_type="dataset" %} + {% endif %} {% if dataset.is_owner or dataset.permission_level == 'co-owner' %} {% include "users/partials/dataset_version_control.html" with dataset=dataset %} {% if not dataset.dataset.status == 'final' or not dataset.is_public %} diff --git a/gateway/sds_gateway/templates/users/components/dataset_list_table.html b/gateway/sds_gateway/templates/users/components/dataset_list_table.html deleted file mode 100644 index 2257a7244..000000000 --- a/gateway/sds_gateway/templates/users/components/dataset_list_table.html +++ /dev/null @@ -1,257 +0,0 @@ -{% comment %} -Single source for the dataset list table (full page + AJAX refresh). - -Context: -- page_obj, sort_by, sort_order (required) -- ajax_fragment: True for AJAX partial (omit outer #dataset-list-ajax-wrapper) -{% endcomment %} -{% load tz %} - -{# Wrapper for ListRefreshManager; omitted when injecting into existing wrapper #} -{% if not ajax_fragment %}
{% endif %} - - {% if page_obj.object_list %} -
- - {{ page_obj.paginator.count }} dataset{{ page_obj.paginator.count|pluralize }} found - -
- {% endif %} - -
-
-
- {% if not page_obj %} - - - - - - - - - - -
- Dataset Name - - Author - - Created At - Actions
- - {% else %} - - - - - - - - - - - - {% for dataset in page_obj %} - - - - - - - {% endfor %} - -
- Dataset Name - - Author - - Created At - Actions
- {% if dataset.is_owner %} - {{ dataset.name }} - {% else %} - {{ dataset.name }} - {% endif %} - {% if dataset.status == 'draft' %} - {{ dataset.status_display }} - {% endif %} - {% if dataset.is_public %}{% endif %} - {% if dataset.is_shared_with_me %} - - - - {% endif %} - - {% if dataset.authors %} - {% for author in dataset.authors %} - {% if forloop.counter <= 2 %} - {% if author.name %} - {% if author.orcid_id %} - - {{ author.name }} - - - {% else %} - {{ author.name }} - {% endif %} - {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} - {% else %} - {{ author }} - {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% if dataset.authors|length > 2 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if dataset.dataset.created_at %} - {% localtime on %} -
- {{ dataset.dataset.created_at|date:"Y-m-d" }} - {{ dataset.dataset.created_at|date:"H:i:s T" }} -
- {% endlocaltime %} - {% else %} - - - {% endif %} - 		-
- -
    - {% if dataset.can_edit %} - {% if not dataset.dataset.status == 'final' and not dataset.is_public %} -
  • - -
    • - {% endif %} -
  • - -
    • - {% endif %} - {% if dataset.is_owner or dataset.permission_level == 'co-owner' %} - {% if not dataset.dataset.status == 'final' or not dataset.is_public %} -
  • - -
    • - {% endif %} -
  • - -
    • - {% endif %} -
  • - -
    • -
  • - -
    • -
-
-
- {% endif %} -
-
-
-{% if page_obj and page_obj.has_other_pages %} - -{% endif %} -{% if not ajax_fragment %}
{% endif %} diff --git a/gateway/sds_gateway/templates/users/components/dataset_list_table_row.html b/gateway/sds_gateway/templates/users/components/dataset_list_table_row.html new file mode 100644 index 000000000..767902d80 --- /dev/null +++ b/gateway/sds_gateway/templates/users/components/dataset_list_table_row.html @@ -0,0 +1,82 @@ +{% comment %} +Single source for the dataset list table (full page + AJAX refresh). + +Context: +- dataset: dataset object +- dropdown_menu_items: list of dropdown menu items +{% endcomment %} +{% load tz %} + + + + {% if dataset.is_owner %} + {{ dataset.name }} + {% else %} + {{ dataset.name }} + {% endif %} + {% if dataset.status == 'draft' %} + {{ dataset.status_display }} + {% endif %} + {% if dataset.is_public %}{% endif %} + {% if dataset.is_shared_with_me %} + + + + {% endif %} + + + {% if dataset.authors %} + {% for author in dataset.authors %} + {% if forloop.counter <= 2 %} + {% if author.name %} + {% if author.orcid_id %} + + {{ author.name }} + + + {% else %} + {{ author.name }} + {% endif %} + {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} + {% else %} + {{ author }} + {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} + {% endif %} + {% endif %} + {% endfor %} + {% if dataset.authors|length > 2 %}...{% endif %} + {% else %} + - + {% endif %} + + + {% if dataset.dataset.created_at %} + {% localtime on %} +
+ {{ dataset.dataset.created_at|date:"Y-m-d" }} + {{ dataset.dataset.created_at|date:"H:i:s T" }} +
+ {% endlocaltime %} + {% else %} + - + {% endif %} + +{% include "users/components/dropdown_menu.html" with items=dropdown_menu_items %} + diff --git a/gateway/sds_gateway/templates/users/components/dropdown_menu.html b/gateway/sds_gateway/templates/users/components/dropdown_menu.html index 569b1bdb4..c3afbb240 100644 --- a/gateway/sds_gateway/templates/users/components/dropdown_menu.html +++ b/gateway/sds_gateway/templates/users/components/dropdown_menu.html @@ -29,7 +29,6 @@ + + + {% endwith %} +{% elif presentation == "table" %} {% if message %} @@ -22,9 +31,8 @@ {% endif %} -{% elif format == 'alert' %} - {# Alert box error format #} - -{% elif format == 'list' %} - {# List error format #} +{% elif presentation == "visualization_panel" %} +
+

{{ message }}

+ {% if detail_line %} +

{{ detail_line }}

+ {% else %} +

+ {% endif %} +
+{% elif presentation == "list" %} {% else %} - {# Inline error format (default) #} {{ message|default:"Error loading data" }} {% endif %} diff --git a/gateway/sds_gateway/templates/users/components/modal_permissions.html b/gateway/sds_gateway/templates/users/components/modal_permissions.html deleted file mode 100644 index ae97c7cd8..000000000 --- a/gateway/sds_gateway/templates/users/components/modal_permissions.html +++ /dev/null @@ -1,18 +0,0 @@ -{% comment %} -Modal Permissions Component -Renders permissions list for dataset details modal -{% endcomment %} -{% for permission in permissions %} -
- - {% if permission.user_name %} - {{ permission.user_name }} ({{ permission.user_email }}) - {% else %} - {{ permission.user_email }} - {% endif %} - - {{ permission.display_name }} -
-{% empty %} - No shared permissions -{% endfor %} diff --git a/gateway/sds_gateway/templates/users/components/modal_technical_details.html b/gateway/sds_gateway/templates/users/components/modal_technical_details.html deleted file mode 100644 index 6df03d6c1..000000000 --- a/gateway/sds_gateway/templates/users/components/modal_technical_details.html +++ /dev/null @@ -1,11 +0,0 @@ -{% comment %} -Modal Technical Details Component -Renders technical details for capture details modal -{% endcomment %} -{% if details %} - -{% else %} - No technical details available -{% endif %} diff --git a/gateway/sds_gateway/templates/users/components/toast.html b/gateway/sds_gateway/templates/users/components/toast.html deleted file mode 100644 index 667f57726..000000000 --- a/gateway/sds_gateway/templates/users/components/toast.html +++ /dev/null @@ -1,24 +0,0 @@ -{% comment %} -Toast Component - Renders a single Bootstrap toast notification -Matches the format used by showAlert for unified UI - -Context: -- message: Toast message text -- type: Toast type (success, error/danger, warning, info) - maps to Bootstrap classes -{% endcomment %} -{% comment %} Map type to Bootstrap classes matching showAlert logic {% endcomment %} -{% with toast_type=type|default:""|lower %} - -{% endwith %} diff --git a/gateway/sds_gateway/templates/users/dataset_list.html b/gateway/sds_gateway/templates/users/dataset_list.html index 4ead29d05..7d8196670 100644 --- a/gateway/sds_gateway/templates/users/dataset_list.html +++ b/gateway/sds_gateway/templates/users/dataset_list.html @@ -26,56 +26,46 @@

Datasets

- {% include "users/components/dataset_list_table.html" %} + {% include "users/components/asset_list_table.html" with page_obj=page_obj asset_type=asset_type table_headers=table_headers no_assets_message=no_assets_message asset_row_template=asset_row_template ajax_fragment=ajax_fragment %} - - {% include "users/components/dataset_list_modals.html" with page_obj=page_obj %} + + {% include "users/partials/asset_details_modal.html" %} +
+ {% include "users/components/dataset_list_modals.html" with page_obj=page_obj %} +
{% endblock content %} {% block javascript %} {# djlint:off #} {{ block.super }} + + + + + + + + + + {# djlint:on #} diff --git a/gateway/sds_gateway/templates/users/file_list.html b/gateway/sds_gateway/templates/users/file_list.html deleted file mode 100644 index bfd9e9ccb..000000000 --- a/gateway/sds_gateway/templates/users/file_list.html +++ /dev/null @@ -1,533 +0,0 @@ -{# templates/users/file_list.html #} -{% extends "base.html" %} - -{% load static %} - -{% block bodyclass %} - hero-white-page -{% endblock bodyclass %} -{% block css %} - {{ block.super }} - - -{% endblock css %} -{% block body %} - - - - - - - - - - - {% csrf_token %} - - {% if system_notifications %} -
- {% for notification in system_notifications %} -
{{ notification.user_message }}
- {% endfor %} -
- {% endif %} - {% if messages %} -
- {% for message in messages %} - {% if message.tags == "error" %} - {% include "users/components/toast.html" with message=message type="error" %} - {% elif message.tags == "success" %} - {% include "users/components/toast.html" with message=message type="success" %} - {% elif message.tags == "warning" %} - {% include "users/components/toast.html" with message=message type="warning" %} - {% else %} - {% include "users/components/toast.html" with message=message type="info" %} - {% endif %} - {% endfor %} -
- {% endif %} -
-
- -
-
-

Captures

-
-
- -
- - - -
- - - -
- -

Searching captures...

-
- - - - - - {% include "users/partials/captures_page_table.html" %} -
-
-
- - {% include "users/partials/capture_modal.html" %} - - {% include "users/partials/quick_add_to_dataset_modal.html" %} - - {% for cap in captures %} - {% if cap.capture %} - {% include "users/partials/share_modal.html" with item=cap.capture item_type="capture" %} - {% include "users/partials/web_download_modal.html" with item=cap.capture item_type="capture" %} - {% endif %} - {% endfor %} -{% endblock body %} -{% block javascript %} - {{ block.super }} - - - - - - - - - - - - - {# djlint:off #} - - - {# djlint:on #} -{% endblock javascript %} diff --git a/gateway/sds_gateway/templates/users/files.html b/gateway/sds_gateway/templates/users/files.html index 44028e2e8..0561173f5 100644 --- a/gateway/sds_gateway/templates/users/files.html +++ b/gateway/sds_gateway/templates/users/files.html @@ -151,6 +151,8 @@

Files

  • - -
    - - - -
    - cloud_upload -
    Drag and drop your folder here
    -
    Or use the file picker above
    -
    -
    -
    Selected Files:
    -
      -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - 0% -
    - Checking files for duplicates... -
    - -
    - - -
    - DigitalRF: For .h5/.hdf5 files with channel-based structure -
    - RadioHound: For .rh.json files with scan group metadata -
    -
    - -
    - - -
    Required for DigitalRF captures
    -
    - -
    - - -
    For RadioHound captures, optional UUID
    -
    -
    -
    - - -
    - - - - - - + {% include "users/partials/upload_capture_modal.html" with show_upload_zone=True %} + {% include "users/partials/upload_result_modal.html" %} - - {% include "users/partials/capture_modal.html" %} + {% include "users/partials/asset_details_modal.html" %} {% for item in items %} {% if item.is_capture %} @@ -511,12 +370,21 @@ {% endfor %} {% endblock content %} {% block javascript %} - - - {# Fallback modal helpers provided by components.js; inline duplicates removed #} - - + {{ block.super }} + + + + + + + + + + + + + @@ -526,6 +394,21 @@ - - - + {% endblock javascript %} diff --git a/gateway/sds_gateway/templates/users/group_captures.html b/gateway/sds_gateway/templates/users/group_captures.html index f9f665208..e7f2e91f0 100644 --- a/gateway/sds_gateway/templates/users/group_captures.html +++ b/gateway/sds_gateway/templates/users/group_captures.html @@ -114,10 +114,15 @@
    {% block extra_js %} + + + + + diff --git a/gateway/sds_gateway/templates/users/partials/capture_modal.html b/gateway/sds_gateway/templates/users/partials/asset_details_modal.html similarity index 72% rename from gateway/sds_gateway/templates/users/partials/capture_modal.html rename to gateway/sds_gateway/templates/users/partials/asset_details_modal.html index 29366433b..53091eb0a 100644 --- a/gateway/sds_gateway/templates/users/partials/capture_modal.html +++ b/gateway/sds_gateway/templates/users/partials/asset_details_modal.html @@ -1,16 +1,15 @@ - +{# Shared shell for capture/dataset details (body from /users/details-modal///). #}
    aria-label="Close"> -
    - +
    @@ -42,7 +40,6 @@
    - -{% if VISUALIZATIONS_ENABLED %} +{% if VISUALIZATIONS_ENABLED and visualization_compatibility %} {% include "visualizations/partials/visualization_modal.html" with visualization_compatibility=visualization_compatibility %} {% endif %} diff --git a/gateway/sds_gateway/templates/users/partials/captures_page_table.html b/gateway/sds_gateway/templates/users/partials/captures_page_table.html deleted file mode 100644 index 94b9bbc3e..000000000 --- a/gateway/sds_gateway/templates/users/partials/captures_page_table.html +++ /dev/null @@ -1,262 +0,0 @@ -{% load custom_filters %} -{% load tz %} - - - - -
    -
    - -
    - -
    - - -
    -
    - - {% if captures %} - {{ captures|length }} capture{{ captures|length|pluralize }} found - {% else %} - 0 captures found - {% endif %} - -
    -
    - - - - - - - - - - - - - - {% if captures %} - {% for cap in captures %} - - - - - - - - - {% endfor %} - {% else %} - - - - {% endif %} - -
    SelectName - Directory - - Type - - Created - Actions
    - {% if cap.is_owner %} - - {% else %} - - {% endif %} - - - {{ cap.name|default:"Unnamed Capture" }} - - {% if cap.is_shared_with_me %} - - - - {% endif %} - {{ cap.top_level_dir|default:"-" }}{{ cap.capture_type_display }} - {% if cap.capture.created_at %} - {% localtime on %} -
    - {{ cap.capture.created_at|date:"Y-m-d" }} - {{ cap.capture.created_at|date:"H:i:s T" }} -
    - {% endlocaltime %} - {% else %} - - - {% endif %} -     		-
    - -
      - {% if cap.is_owner %} -
    • - -
      • -
    • - -
      • -
    • - -
      • - {% endif %} -
    • - -
      • - {% if cap.capture_type == 'drf' %} -
    • - -
      • - {% endif %} -
    -
    -
    - No captures found matching your search criteria. -
    -
    - -{% if captures and captures.paginator.num_pages > 1 %} - -{% endif %} -
    diff --git a/gateway/sds_gateway/templates/users/partials/dataset_details_modal.html b/gateway/sds_gateway/templates/users/partials/dataset_details_modal.html deleted file mode 100644 index a36e14192..000000000 --- a/gateway/sds_gateway/templates/users/partials/dataset_details_modal.html +++ /dev/null @@ -1,158 +0,0 @@ - - diff --git a/gateway/sds_gateway/templates/users/partials/search_published_datasets_tab.html b/gateway/sds_gateway/templates/users/partials/search_published_datasets_tab.html index 99e4cfa29..5f7e53f91 100644 --- a/gateway/sds_gateway/templates/users/partials/search_published_datasets_tab.html +++ b/gateway/sds_gateway/templates/users/partials/search_published_datasets_tab.html @@ -40,13 +40,17 @@

    No datasets found

    {% for dataset in page_obj %} - + {{ dataset.name }} {% if dataset.is_public %}{% endif %} diff --git a/gateway/sds_gateway/templates/users/partials/share_modal.html b/gateway/sds_gateway/templates/users/partials/share_modal.html index f39ce465a..646f12266 100644 --- a/gateway/sds_gateway/templates/users/partials/share_modal.html +++ b/gateway/sds_gateway/templates/users/partials/share_modal.html @@ -10,8 +10,10 @@ aria-hidden="true">
    -
    - +
    +
    Share {{ item_type|title }}: {{ item.name|default:"Unnamed" }}
    +
    +
    + + + {% if show_upload_zone %} + {% include "users/partials/upload_capture_modal_files_extras.html" %} + {% endif %} +
    +
    + +
    +
    +
    +
    +
    + 0% +
    + Processing files for upload... +
    +
    + + +
    + DigitalRF: For .h5/.hdf5 files with channel-based structure +
    + RadioHound: For .rh.json files with scan group metadata +
    +
    +
    + + +
    Required for DigitalRF captures
    +
    +
    + + +
    For RadioHound captures, optional UUID
    +
    +
    +
    + + +
    + +
    +
    +
    diff --git a/gateway/sds_gateway/templates/users/partials/upload_capture_modal_files_extras.html b/gateway/sds_gateway/templates/users/partials/upload_capture_modal_files_extras.html new file mode 100644 index 000000000..e9b55e6cb --- /dev/null +++ b/gateway/sds_gateway/templates/users/partials/upload_capture_modal_files_extras.html @@ -0,0 +1,13 @@ +{# Drag-and-drop zone and selected-file list (files page capture modal) #} +
    + cloud_upload +
    Drag and drop your folder here
    +
    Or use the file picker above
    +
    +
    +
    Selected Files:
    + +
    diff --git a/gateway/sds_gateway/templates/users/partials/upload_result_modal.html b/gateway/sds_gateway/templates/users/partials/upload_result_modal.html new file mode 100644 index 000000000..03be2abb1 --- /dev/null +++ b/gateway/sds_gateway/templates/users/partials/upload_result_modal.html @@ -0,0 +1,24 @@ + +
    +
    +
    +
    + + +
    +
    + +
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/gateway/sds_gateway/templates/users/partials/web_download_modal.html b/gateway/sds_gateway/templates/users/partials/web_download_modal.html index b3d60d0f1..aabac6141 100644 --- a/gateway/sds_gateway/templates/users/partials/web_download_modal.html +++ b/gateway/sds_gateway/templates/users/partials/web_download_modal.html @@ -3,7 +3,19 @@ id="webDownloadModal-{{ item.uuid }}" tabindex="-1" aria-labelledby="webDownloadModalLabel-{{ item.uuid }}" - aria-hidden="true"> + aria-hidden="true" + {% if item_type == "capture" %} + data-item-type="capture" + data-item-uuid="{{ item.uuid }}" + data-length-of-capture-ms="{{ item.length_of_capture_ms|default:0 }}" + data-file-cadence-ms="{{ item.file_cadence_ms|default:1000 }}" + data-per-data-file-size="{{ item.data_files_info.per_data_file_size|default:0 }}" + data-total-data-file-size="{{ item.data_files_info.total_size|default:0 }}" + data-total-size="{{ item.total_file_size|default:0 }}" + data-data-files-count="{{ item.data_files_info.count|default:0 }}" + data-total-files-count="{{ item.files|length|default:0 }}" + data-capture-start-epoch-sec="{{ item.capture_start_epoch_sec|default:0 }}" + {% endif %}>
    diff --git a/gateway/sds_gateway/templates/users/published_datasets_list.html b/gateway/sds_gateway/templates/users/published_datasets_list.html index 0de596706..884054ce0 100644 --- a/gateway/sds_gateway/templates/users/published_datasets_list.html +++ b/gateway/sds_gateway/templates/users/published_datasets_list.html @@ -25,11 +25,11 @@

    Search Published Datasets

    + {% include "users/partials/asset_details_modal.html" %} {% if page_obj %} {% for dataset in page_obj %} {% include "users/partials/web_download_modal.html" with item=dataset item_type="dataset" %} - {% include "users/partials/dataset_details_modal.html" with dataset=dataset %} {% include "users/partials/sdk_download_modal.html" with dataset=dataset %} {% endfor %} {% endif %} @@ -38,7 +38,9 @@

    Search Published Datasets

    {# djlint:off #} {{ block.super }} + + @@ -66,6 +68,8 @@

    Search Published Datasets

    // Initialize the page lifecycle manager window.pageLifecycleManager = new PageLifecycleManager(pageConfig); + window.ModalManager?.initializeModal?.({ detailsClickDelegation: true }); + // Initialize keyword chip input if (typeof KeywordChipInputInitializer !== 'undefined') { KeywordChipInputInitializer.autoInitialize(); diff --git a/gateway/sds_gateway/templates/users/search_datasets.html b/gateway/sds_gateway/templates/users/search_datasets.html deleted file mode 100644 index 988669349..000000000 --- a/gateway/sds_gateway/templates/users/search_datasets.html +++ /dev/null @@ -1,265 +0,0 @@ -{% extends "base.html" %} - -{% load static %} -{% load custom_filters %} -{% load tz %} - -{% block css %} - {{ block.super }} - -{% endblock css %} -{% block bodyclass %} - hero-white-page -{% endblock bodyclass %} -{% block content %} - {% csrf_token %} -
    -
    -
    -
    -

    Search Published Datasets

    -
    -
    - -
    -
    -
    -
    -
    - - {{ search_form.query }} - {% if search_form.query.help_text %} - {{ search_form.query.help_text }} - {% endif %} -
    -
    - - {{ search_form.keywords }} - {% if search_form.keywords.help_text %} - {{ search_form.keywords.help_text }} - {% endif %} -
    -
    - - {{ search_form.min_frequency }} - {% if search_form.min_frequency.help_text %} - {{ search_form.min_frequency.help_text }} - {% endif %} -
    -
    - - {{ search_form.max_frequency }} - {% if search_form.max_frequency.help_text %} - {{ search_form.max_frequency.help_text }} - {% endif %} -
    -
    - - - Clear - -
    -
    -
    -
    -
    - - {% if page_obj.object_list %} -
    - - {{ page_obj.paginator.count }} dataset{{ page_obj.paginator.count|pluralize }} found - -
    - {% endif %} - -
    -
    -
    - {% if not page_obj or not page_obj.object_list %} - - {% else %} - - - - - - - - - - - - - {% for dataset in page_obj %} - - - - - - - - {% endfor %} - -
    Dataset NameAuthorsKeywordsCreated AtActions
    - - {{ dataset.name }} - - {% if dataset.is_public %}{% endif %} - - {% if dataset.authors %} - {% for author in dataset.authors %} - {% if forloop.counter <= 2 %} - {% if author.name %} - {% if author.orcid_id %} - - {{ author.name }} - - - {% else %} - {{ author.name }} - {% endif %} - {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} - {% else %} - {{ author }} - {% if not forloop.last and forloop.counter < 2 and dataset.authors|length > 1 %},{% endif %} - {% endif %} - {% endif %} - {% endfor %} - {% if dataset.authors|length > 2 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if dataset.keywords %} - {% for keyword in dataset.keywords.all|slice:":3" %} - {{ keyword.name }} - {% endfor %} - {% if dataset.keywords.count > 3 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if dataset.dataset.created_at %} - {% localtime on %} -
    - {{ dataset.dataset.created_at|date:"Y-m-d" }} - {{ dataset.dataset.created_at|date:"H:i:s T" }} -
    - {% endlocaltime %} - {% else %} - - - {% endif %} -     		- -
    - {% endif %} -
    -
    - - {% if page_obj and page_obj.has_other_pages %} - - {% endif %} -
    -
    -
    -
    - -{% if page_obj %} - {% for dataset in page_obj %} - {% include "users/partials/dataset_details_modal.html" with dataset=dataset %} - {% endfor %} -{% endif %} -{% block javascript %} - {{ block.super }} - - -{% endblock javascript %} -{% endblock content %} diff --git a/gateway/sds_gateway/templates/users/share_group_list.html b/gateway/sds_gateway/templates/users/share_group_list.html index b8a2451d0..fc25de8fc 100644 --- a/gateway/sds_gateway/templates/users/share_group_list.html +++ b/gateway/sds_gateway/templates/users/share_group_list.html @@ -36,6 +36,7 @@
    {% translate "Your Share Groups" %}
    {% block javascript %} {{ block.super }} +