Skip to content

Commit c78b170

Browse files
Support feature flags info (#1326)
* Support feature flags info
1 parent 4b86fc2 commit c78b170

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

dependencies.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"jetBrainsPluginVersion": "2.0.410",
3-
"visualStudioExtensionVersion": "1.2.3",
2+
"jetBrainsPluginVersion": "2.0.411",
3+
"visualStudioExtensionVersion": "1.2.4",
44
"jaegerUIVersion": "1.29.1-digma.1.1.2",
55
"jaegerVersion": "1.45.0"
66
}

src/components/Main/Authentication/index.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { forwardRef, useEffect, useState } from "react";
22
import { SLACK_WORKSPACE_URL } from "../../../constants";
3-
import { getFeatureFlagValue } from "../../../featureFlags";
43
import { useResendConfirmationEmailMutation } from "../../../redux/services/digma";
54
import { useConfigSelector } from "../../../store/config/useConfigSelector";
6-
import { FeatureFlag } from "../../../types";
75
import { openURLInDefaultBrowser } from "../../../utils/actions/openURLInDefaultBrowser";
86
import { sendTrackingEvent } from "../../../utils/actions/sendTrackingEvent";
97
import { SlackLogoIcon } from "../../common/icons/16px/SlackLogoIcon";
@@ -23,10 +21,9 @@ const AuthenticationComponent = () => {
2321
const [emailToConfirm, setEmailToConfirm] = useState<string>();
2422
const [resend] = useResendConfirmationEmailMutation();
2523
const { backendInfo } = useConfigSelector();
26-
const isEmailConfirmationEnabled = getFeatureFlagValue(
27-
backendInfo,
28-
FeatureFlag.IsEmailConfirmationEnabled
29-
);
24+
25+
const isEmailConfirmationEnabled =
26+
backendInfo?.features?.EmailVerificationEnabled === "True";
3027

3128
const handleRegister = (email: string) => {
3229
setOption("login");

src/components/common/App/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { ReactNode } from "react";
22
import type { Theme } from "../../../globals";
33
import type {
44
Environment,
5+
Features,
56
IssueCriticality
67
} from "../../../redux/services/types";
78
import type { ScopeChangeEvent } from "../../../types";
@@ -32,6 +33,7 @@ export interface BackendInfo {
3233
deploymentType: DeploymentType;
3334
centralize: boolean;
3435
site?: string;
36+
features?: Features;
3537
}
3638

3739
export enum DeploymentType {

src/featureFlags.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ export const featureFlagMinBackendVersions: Record<FeatureFlag, string> = {
3232
[FeatureFlag.IsHttpGetMethodSpanPercentilesHistogramEnabled]: "0.3.199",
3333
[FeatureFlag.IsInsightSeveritySortingEnabled]: "0.3.204",
3434
[FeatureFlag.IsUserIdEnabled]: "0.3.212",
35-
[FeatureFlag.IsIssuesCriticalityLevelsFilterEnabled]: "0.3.214",
36-
[FeatureFlag.IsEmailConfirmationEnabled]: "0.3.264-alpha.1"
35+
[FeatureFlag.IsIssuesCriticalityLevelsFilterEnabled]: "0.3.214"
3736
};
3837

3938
export const getFeatureFlagValue = (

src/redux/services/types.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@ export interface Environment {
3232
type: EnvironmentType;
3333
}
3434

35+
export interface Features {
36+
EmailVerificationEnabled: "True" | "False";
37+
}
38+
3539
export interface GetAboutResponse {
3640
applicationVersion: string;
3741
deploymentType: DeploymentType;
3842
isCentralize: boolean;
3943
site?: string;
44+
features?: Features;
4045
}
4146

4247
export interface GetAssetsFiltersPayload {

src/types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ export enum FeatureFlag {
2929
IsInsightSeveritySortingEnabled,
3030
IsHttpGetMethodSpanPercentilesHistogramEnabled,
3131
IsUserIdEnabled,
32-
IsIssuesCriticalityLevelsFilterEnabled,
33-
IsEmailConfirmationEnabled
32+
IsIssuesCriticalityLevelsFilterEnabled
3433
}
3534

3635
export enum InsightType {

0 commit comments

Comments
 (0)