Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/move support to customize X-ray rules from experimental to general availability (#5408)

Thomas Kaul795609e03ac9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 918d4d82bf..bb3bd6d3cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Moved the support to customize rules in the _X-ray_ section from experimental to general availability
- Improved the create or update activity dialog’s asset sub class selector for valuables to update the options dynamically based on the selected asset class
- Randomized the minutes of the hourly data gathering cron job
- Refactored the dialog footer component to standalone
diff --git a/apps/client/src/app/components/access-table/access-table.component.html b/apps/client/src/app/components/access-table/access-table.component.html
index 44aee16440..be374db9cb 100644
--- a/apps/client/src/app/components/access-table/access-table.component.html
+++ b/apps/client/src/app/components/access-table/access-table.component.html
@@ -67,12 +67,18 @@
<mat-menu #transactionMenu="matMenu" xPosition="before">
@if (element.type === 'PUBLIC') {
<button mat-menu-item (click)="onCopyUrlToClipboard(element.id)">
- <ng-container i18n>Copy link to clipboard</ng-container>
+ <span class="align-items-center d-flex">
+ <ion-icon class="mr-2" name="copy-outline" />
+ <span i18n>Copy link to clipboard</span>
+ </span>
</button>
<hr class="my-0" />
}
<button mat-menu-item (click)="onDeleteAccess(element.id)">
- <ng-container i18n>Revoke</ng-container>
+ <span class="align-items-center d-flex">
+ <ion-icon class="mr-2" name="remove-circle-outline" />
+ <span i18n>Revoke</span>
+ </span>
</button>
</mat-menu>
</td>
diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts
index c94f86df1a..9f32be650a 100644
--- a/apps/client/src/app/components/access-table/access-table.component.ts
+++ b/apps/client/src/app/components/access-table/access-table.component.ts
@@ -22,10 +22,12 @@ import { RouterModule } from '@angular/router';
import { IonIcon } from '@ionic/angular/standalone';
import { addIcons } from 'ionicons';
import {
+ copyOutline,
ellipsisHorizontal,
linkOutline,
lockClosedOutline,
- lockOpenOutline
+ lockOpenOutline,
+ removeCircleOutline
} from 'ionicons/icons';
import ms from 'ms';
@@ -62,10 +64,12 @@ export class GfAccessTableComponent implements OnChanges {
private snackBar: MatSnackBar
) {
addIcons({
+ copyOutline,
ellipsisHorizontal,
linkOutline,
lockClosedOutline,
- lockOpenOutline
+ lockOpenOutline,
+ removeCircleOutline
});
}
diff --git a/apps/client/src/app/components/rule/rule.component.html b/apps/client/src/app/components/rule/rule.component.html
index 7cea512e3b..239beb733e 100644
--- a/apps/client/src/app/components/rule/rule.component.html
+++ b/apps/client/src/app/components/rule/rule.component.html
@@ -64,14 +64,24 @@
<mat-menu #rulesMenu="matMenu" xPosition="before">
@if (rule?.isActive && rule?.configuration) {
<button mat-menu-item (click)="onCustomizeRule(rule)">
- <ng-container i18n>Customize</ng-container>...
+ <span class="align-items-center d-flex">
+ <ion-icon class="mr-2" name="options-outline" />
+ <span><ng-container i18n>Customize</ng-container>...</span>
+ </span>
</button>
+ <hr class="my-0" />
}
<button mat-menu-item (click)="onUpdateRule(rule)">
@if (rule?.isActive) {
- <ng-container i18n>Deactivate</ng-container>
+ <span class="align-items-center d-flex">
+ <ion-icon class="mr-2" name="remove-circle-outline" />
+ <span i18n>Deactivate</span>
+ </span>
} @else {
- <ng-container i18n>Activate</ng-container>
+ <span class="align-items-center d-flex">
+ <ion-icon class="mr-2" name="add-circle-outline" />
+ <span i18n>Activate</span>
+ </span>
}
</button>
</mat-menu>
diff --git a/apps/client/src/app/components/rule/rule.component.ts b/apps/client/src/app/components/rule/rule.component.ts
index 4ea7d0ec6f..6243389157 100644
--- a/apps/client/src/app/components/rule/rule.component.ts
+++ b/apps/client/src/app/components/rule/rule.component.ts
@@ -16,8 +16,10 @@ import {
import { MatDialog } from '@angular/material/dialog';
import { addIcons } from 'ionicons';
import {
+ addCircleOutline,
checkmarkCircleOutline,
ellipsisHorizontal,
+ optionsOutline,
removeCircleOutline,
warningOutline
} from 'ionicons/icons';
@@ -50,8 +52,10 @@ export class RuleComponent implements OnInit {
private dialog: MatDialog
) {
addIcons({
+ addCircleOutline,
checkmarkCircleOutline,
ellipsisHorizontal,
+ optionsOutline,
removeCircleOutline,
warningOutline
});
diff --git a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
index e309fbaea3..ce55c4fff6 100644
--- a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
+++ b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
@@ -73,9 +73,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="liquidityRules"
@@ -97,9 +95,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="emergencyFundRules"
@@ -121,9 +117,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="currencyClusterRiskRules"
@@ -145,9 +139,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="assetClassClusterRiskRules"
@@ -169,9 +161,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="accountClusterRiskRules"
@@ -193,9 +183,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="economicMarketClusterRiskRules"
@@ -217,9 +205,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="regionalMarketClusterRiskRules"
@@ -241,9 +227,7 @@
</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="feeRules"
@@ -256,9 +240,7 @@
<h4 class="m-0" i18n>Inactive</h4>
<gf-rules
[hasPermissionToUpdateUserSettings]="
- !hasImpersonationId &&
- hasPermissionToUpdateUserSettings &&
- user?.settings?.isExperimentalFeatures
+ !hasImpersonationId && hasPermissionToUpdateUserSettings
"
[isLoading]="isLoading"
[rules]="inactiveRules"