Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply filters on catalog import for matrices and mapping #1335

Merged
merged 4 commits into from
Jan 8, 2025
+7 −7
Merged

Apply filters on catalog import for matrices and mapping #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
369259d
Apply filter on catalog import
ab-smith Jan 7, 2025
a1ef4ff
Merge branch 'main' into improve_catalog_links
ab-smith Jan 8, 2025
9dc9c35
ci: update hasUrl()
Mohamed-Hacene Jan 8, 2025
92b3d0e
fix: typo
Mohamed-Hacene Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
{/if}
{:else if URLModel === 'risk-matrices'}
<a
href="/libraries"
href="/libraries?objectType=risk_matrix"
class="inline-block p-3 btn-mini-primary w-12 focus:relative"
data-testid="add-button"
title={m.importMatrices()}><i class="fa-solid fa-file-import mr-2" /></a
Expand All @@ -145,7 +145,7 @@
>
{:else if URLModel === 'requirement-mapping-sets'}
<a
href="/libraries"
href="/libraries?objectType=requirement_mapping_set"
class="inline-block p-3 btn-mini-primary w-12 focus:relative"
data-testid="add-button"
title={m.importMappings()}><i class="fa-solid fa-file-import mr-2" /></a
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
{/if}
{:else if URLModel === 'risk-matrices'}
<a
href="/libraries"
href="/libraries?objectType=risk_matrix"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMatrices()}><i class="fa-solid fa-file-import mr-2" /></a
Expand All @@ -89,7 +89,7 @@
>
{:else if URLModel === 'requirement-mapping-sets'}
<a
href="/libraries"
href="/libraries?objectType=requirement_mapping_set"
class="inline-block p-3 text-gray-50 bg-pink-500 hover:bg-pink-400 w-12 focus:relative"
data-testid="add-button"
title={m.importMappings()}><i class="fa-solid fa-file-import mr-2" /></a
Expand Down
2 changes: 1 addition & 1 deletion frontend/tests/functional/user-route.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ test('user usual routine actions are working correctly', async ({
await pages.riskMatricesPage.hasTitle();

await pages.riskMatricesPage.addButton.click();
await pages.librariesPage.hasUrl();
await pages.librariesPage.hasUrl(true, '/libraries?objectType=risk_matrix');
await pages.librariesPage.hasTitle();

await pages.librariesPage.importLibrary(vars.matrix.name, vars.matrix.urn);
Expand Down
4 changes: 2 additions & 2 deletions frontend/tests/utils/base-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export abstract class BasePage {
* Otherwise, it checks if the browser's URL starts with `this.url`.
* @returns {void}
*/
async hasUrl(strict: boolean = true) {
const URLPattern = strict ? this.url : new RegExp(escapeRegex(this.url) + '.*');
async hasUrl(strict: boolean = true, url: string = this.url) {
const URLPattern = strict ? url : new RegExp(escapeRegex(url) + '.*');
await expect(this.page).toHaveURL(URLPattern);
}

Expand Down
Loading