From b8626c2086b06f82c30a24b85ca0315ee45860a4 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 21 Oct 2023 10:25:05 +0200
Subject: [PATCH] Feature/change fees interest and search to general
 availability (#2525)

* Change features to general availability

* Fees on account level
* Interest on account level
* Search for a holding

* Update changelog

* Add documentation for experimental features
---
 CHANGELOG.md                                         |  3 +++
 DEVELOPMENT.md                                       | 12 ++++++++++++
 apps/api/src/app/user/user.service.ts                |  8 ++++----
 .../create-or-update-activity-dialog.html            | 10 ++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27f5aaedc..e32a20c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Moved the fees on account level feature from experimental to general availability
+- Moved the interest on account level feature from experimental to general availability
+- Moved the search for a holding from experimental to general availability
 - Improved the error message in the activities import for `csv` files
 - Removed the application version from the client
 - Allowed to edit today’s historical market data in the asset profile details dialog of the admin control panel
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index a950e5672..ea581c8cf 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,5 +1,17 @@
 # Ghostfolio Development Guide
 
+## Experimental Features
+
+New functionality can be enabled using a feature flag switch from the user settings.
+
+### Backend
+
+Remove permission in `UserService` using `without()`
+
+### Frontend
+
+Use `*ngIf="user?.settings?.isExperimentalFeatures"` in HTML template
+
 ## Git
 
 ### Rebase
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index a176c43f3..91490528e 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -164,10 +164,10 @@ export class UserService {
     let currentPermissions = getPermissions(user.role);
 
     if (!(user.Settings.settings as UserSettings).isExperimentalFeatures) {
-      currentPermissions = without(
-        currentPermissions,
-        permissions.accessAssistant
-      );
+      // currentPermissions = without(
+      //   currentPermissions,
+      //   permissions.xyz
+      // );
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
index 4e600b110..c28f87d93 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@@ -21,10 +21,7 @@
               >Stocks, ETFs, bonds, cryptocurrencies, commodities</small
             >
           </mat-option>
-          <mat-option
-            *ngIf="data.user?.settings?.isExperimentalFeatures"
-            value="FEE"
-          >
+          <mat-option value="FEE">
             <span><b>{{ typesTranslationMap['FEE'] }}</b></span>
             <small class="d-block line-height-1 text-muted text-nowrap" i18n
               >One-time fee, annual account fees</small
@@ -36,10 +33,7 @@
               >Distribution of corporate earnings</small
             >
           </mat-option>
-          <mat-option
-            *ngIf="data.user?.settings?.isExperimentalFeatures"
-            value="INTEREST"
-          >
+          <mat-option value="INTEREST">
             <span><b>{{ typesTranslationMap['INTEREST'] }}</b></span>
             <small class="d-block line-height-1 text-muted text-nowrap" i18n
               >Revenue for lending out money</small