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

MNTOR-3893 - Fix qa custom broker tool #5647

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

MNTOR-3893 - Fix qa custom broker tool #5647

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e99bd3d
add new custom broker with the same type as real data
codemist Feb 19, 2025
e1c7266
update type
codemist Feb 20, 2025
e80940a
add flag for mocked scan results
codemist Feb 20, 2025
545ff31
add dashboard state
codemist Feb 20, 2025
306a23f
lint
codemist Feb 20, 2025
a8e14a5
add feature flag blocker
codemist Feb 20, 2025
edb93b6
fix post req
codemist Feb 21, 2025
9015002
remove changes to pageloadevent
codemist Feb 21, 2025
d766eaf
remove mocked brokers addition to util func
codemist Feb 21, 2025
b4ec90f
fixes
codemist Feb 21, 2025
000bb67
more fixes
codemist Feb 21, 2025
6de72c3
fix build
codemist Feb 21, 2025
ddc7c74
Merge branch 'main' into mntor-3893-2
codemist Feb 21, 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
16 changes: 13 additions & 3 deletions ...p/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/components/FlagEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ import { Button } from "../../../../../../components/client/Button";
import { CreateFeatureFlagRequestBody } from "../../../../../../api/v1/admin/feature-flags/route";
import { FeatureFlagName } from "../../../../../../../db/tables/featureFlags";

export const NewFlagEditor = (props: { flagName: FeatureFlagName }) => {
export const NewFlagEditor = (props: {
flagName: FeatureFlagName;
adminOnly: boolean;
}) => {
return (
<FlagEditor
adminOnly={props.adminOnly}
flagName={props.flagName}
isEnabled={false}
onToggleEnable={async (isEnabled) => {
Expand All @@ -45,9 +49,13 @@ export const NewFlagEditor = (props: { flagName: FeatureFlagName }) => {
);
};

export const ExistingFlagEditor = (props: { flag: FeatureFlagRow }) => {
export const ExistingFlagEditor = (props: {
flag: FeatureFlagRow;
adminOnly: boolean;
}) => {
return (
<FlagEditor
adminOnly={props.adminOnly}
flagName={props.flag.name}
isEnabled={props.flag.is_enabled}
onToggleEnable={async (isEnabled) => {
Expand Down Expand Up @@ -82,6 +90,7 @@ type Props = {
isEnabled: boolean;
onToggleEnable: (isEnabled: boolean) => Promise<void>;
allowList: string[];
adminOnly: boolean;
onUpdateAllowlist: (allowList: string[]) => Promise<void>;
};
const FlagEditor = (props: Props) => {
Expand Down Expand Up @@ -114,8 +123,9 @@ const FlagEditor = (props: Props) => {
variant="secondary"
onPress={() => void setIsEnabled(true)}
small
disabled={props.adminOnly}
>
Enable for everyone
{props.adminOnly ? "Allow list only" : "Enable for everyone"}
</Button>
)}
</div>
Expand Down
14 changes: 12 additions & 2 deletions src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
FeatureFlagName,
featureFlagNames,
getAllFeatureFlags,
isFeatureFlagAdminOnly,
} from "../../../../../../db/tables/featureFlags";
import { isAdmin } from "../../../../../api/utils/auth";
import { Toolbar } from "../../../../../components/client/toolbar/Toolbar";
Expand Down Expand Up @@ -77,11 +78,16 @@ export default async function FeatureFlagPage() {
<div className={styles.flagList}>
{disabledFlags.map((flagOrFlagName) => {
return typeof flagOrFlagName === "string" ? (
<NewFlagEditor key={flagOrFlagName} flagName={flagOrFlagName} />
<NewFlagEditor
key={flagOrFlagName}
flagName={flagOrFlagName}
adminOnly={isFeatureFlagAdminOnly(flagOrFlagName)}
/>
) : (
<ExistingFlagEditor
key={flagOrFlagName.name}
flag={flagOrFlagName}
adminOnly={isFeatureFlagAdminOnly(flagOrFlagName.name)}
/>
);
})}
Expand All @@ -95,7 +101,11 @@ export default async function FeatureFlagPage() {
featureFlagNames.includes(flag.name as FeatureFlagName),
)
.map((flag) => (
<ExistingFlagEditor key={flag.name} flag={flag} />
<ExistingFlagEditor
key={flag.name}
flag={flag}
adminOnly={isFeatureFlagAdminOnly(flag.name)}
/>
))}
</div>
</div>
Expand Down
Loading
Loading