]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Fix: hide other filtering buttons, fix e2e test paths
authorshamoon <4887959+shamoon@users.noreply.github.com>
Mon, 9 Dec 2024 05:23:41 +0000 (21:23 -0800)
committershamoon <4887959+shamoon@users.noreply.github.com>
Mon, 9 Dec 2024 05:23:41 +0000 (21:23 -0800)
src-ui/e2e/admin/settings.spec.ts
src-ui/e2e/dashboard/dashboard.spec.ts
src-ui/e2e/document-detail/document-detail.spec.ts
src-ui/e2e/document-list/document-list.spec.ts
src-ui/e2e/permissions/global-permissions.spec.ts
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html

index e90bd7d82367cf0adc29ec867fbd4a867fec19cc..ed651fd5d3f83902a46f231ba3b95f3f50878a77 100644 (file)
@@ -1,6 +1,7 @@
 import { test, expect } from '@playwright/test'
+import path from 'node:path'
 
-const REQUESTS_HAR = 'e2e/admin/requests/api-settings.har'
+const REQUESTS_HAR = path.join(__dirname, 'requests/api-settings.har')
 
 test('should activate / deactivate save button when settings change', async ({
   page,
index 7d397c459031fe8f27a9f0b4c2e12efaaef392a1..f062b63e74534503a568fd432e60269aadc06af3 100644 (file)
@@ -1,9 +1,10 @@
 import { test, expect } from '@playwright/test'
+import path from 'node:path'
 
-const REQUESTS_HAR1 = 'e2e/dashboard/requests/api-dashboard1.har'
-const REQUESTS_HAR2 = 'e2e/dashboard/requests/api-dashboard2.har'
-const REQUESTS_HAR3 = 'e2e/dashboard/requests/api-dashboard3.har'
-const REQUESTS_HAR4 = 'e2e/dashboard/requests/api-dashboard4.har'
+const REQUESTS_HAR1 = path.join(__dirname, 'requests/api-dashboard1.har')
+const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-dashboard2.har')
+const REQUESTS_HAR3 = path.join(__dirname, 'requests/api-dashboard3.har')
+const REQUESTS_HAR4 = path.join(__dirname, 'requests/api-dashboard4.har')
 
 test('dashboard inbox link', async ({ page }) => {
   await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' })
index 7f5b28c47f0d3c5a802feb46688f494b3f5c8cca..39e503ffff9fd9b7dfa61811fa95d28a8eedd35f 100644 (file)
@@ -1,7 +1,8 @@
 import { test, expect } from '@playwright/test'
+import path from 'node:path'
 
-const REQUESTS_HAR = 'e2e/document-detail/requests/api-document-detail.har'
-const REQUESTS_HAR2 = 'e2e/document-detail/requests/api-document-detail2.har'
+const REQUESTS_HAR = path.join(__dirname, 'requests/api-document-detail.har')
+const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-document-detail2.har')
 
 test('should activate / deactivate save button when changes are saved', async ({
   page,
index 7cacdfcd028d7012946267333a5055d05b3e0f1f..d624a92ad06bbfd1981931543ab4925d5f95ac59 100644 (file)
@@ -1,11 +1,12 @@
 import { test, expect } from '@playwright/test'
+import path from 'node:path'
 
-const REQUESTS_HAR1 = 'e2e/document-list/requests/api-document-list1.har'
-const REQUESTS_HAR2 = 'e2e/document-list/requests/api-document-list2.har'
-const REQUESTS_HAR3 = 'e2e/document-list/requests/api-document-list3.har'
-const REQUESTS_HAR4 = 'e2e/document-list/requests/api-document-list4.har'
-const REQUESTS_HAR5 = 'e2e/document-list/requests/api-document-list5.har'
-const REQUESTS_HAR6 = 'e2e/document-list/requests/api-document-list6.har'
+const REQUESTS_HAR1 = path.join(__dirname, 'requests/api-document-list1.har')
+const REQUESTS_HAR2 = path.join(__dirname, 'requests/api-document-list2.har')
+const REQUESTS_HAR3 = path.join(__dirname, 'requests/api-document-list3.har')
+const REQUESTS_HAR4 = path.join(__dirname, 'requests/api-document-list4.har')
+const REQUESTS_HAR5 = path.join(__dirname, 'requests/api-document-list5.har')
+const REQUESTS_HAR6 = path.join(__dirname, 'requests/api-document-list6.har')
 
 test('basic filtering', async ({ page }) => {
   await page.routeFromHAR(REQUESTS_HAR1, { notFound: 'fallback' })
index 69c6f94d1e5ce4151090eb442424d2238d92d9e5..5cbc0df46bb484deae4678efef77485610075516 100644 (file)
@@ -1,6 +1,7 @@
 import { test, expect } from '@playwright/test'
+import path from 'node:path'
 
-const REQUESTS_HAR = 'e2e/permissions/requests/api-global-permissions.har'
+const REQUESTS_HAR = path.join(__dirname, 'requests/api-global-permissions.har')
 
 test('should not allow user to edit settings', async ({ page }) => {
   await page.routeFromHAR(REQUESTS_HAR, { notFound: 'fallback' })
index 39e51a1232c3e1613970d00cfa6bb857fbd08c53..da789aaf679b93ce2733e5d9fe38c9db19c1366d 100644 (file)
@@ -35,7 +35,7 @@
   <div class="col-auto">
     <div class="d-flex flex-wrap gap-3">
       <div class="d-flex flex-wrap gap-2">
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag) && tags.length > 0) {
           <pngx-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title
           filterPlaceholder="Filter tags" i18n-filterPlaceholder
           [items]="tags"
@@ -48,7 +48,7 @@
           [disabled]="disabled"
           shortcutKey="t"></pngx-filterable-dropdown>
         }
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && correspondents.length > 0) {
           <pngx-filterable-dropdown class="flex-fill" title="Correspondent" icon="person-fill" i18n-title
           filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
           [items]="correspondents"
@@ -60,7 +60,7 @@
           [disabled]="disabled"
           shortcutKey="y"></pngx-filterable-dropdown>
         }
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType) && documentTypes.length > 0) {
             <pngx-filterable-dropdown class="flex-fill" title="Document type" icon="file-earmark-fill" i18n-title
             filterPlaceholder="Filter document types" i18n-filterPlaceholder
             [items]="documentTypes"