archive-gh-me/gitpod
1
0
Fork 0
mirror of https://github.com/gitpod-io/gitpod.git synced 2025-12-08 17:36:30 +00:00
Code Issues Projects Releases Wiki Activity

[dashboard] Remove superfluous usage_view feature flag (#17285)

Browse Source
This commit is contained in:
Gero Posmyk-Leinemann 2023-04-19 11:15:51 +02:00 committed by GitHub
parent ae37d8c1ab
commit 0058d68f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/dashboard/src/contexts/FeatureFlagContext.tsx
View File

@ -20,7 +20,6 @@ type FeatureFlagsType = {
const defaultFeatureFlags = { const defaultFeatureFlags = {
startWithOptions: false, startWithOptions: false,
showUsageView: false,
showUseLastSuccessfulPrebuild: false, showUseLastSuccessfulPrebuild: false,
usePublicApiWorkspacesService: false, usePublicApiWorkspacesService: false,
enablePersonalAccessTokens: false, enablePersonalAccessTokens: false,
@ -40,7 +39,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
const { project } = useContext(ProjectContext); const { project } = useContext(ProjectContext);
const currentOrg = useCurrentOrg(); const currentOrg = useCurrentOrg();
const [startWithOptions, setStartWithOptions] = useState<boolean>(false); const [startWithOptions, setStartWithOptions] = useState<boolean>(false);
const [showUsageView, setShowUsageView] = useState<boolean>(false);
const [showUseLastSuccessfulPrebuild, setShowUseLastSuccessfulPrebuild] = useState<boolean>(false); const [showUseLastSuccessfulPrebuild, setShowUseLastSuccessfulPrebuild] = useState<boolean>(false);
const [enablePersonalAccessTokens, setPersonalAccessTokensEnabled] = useState<boolean>(false); const [enablePersonalAccessTokens, setPersonalAccessTokensEnabled] = useState<boolean>(false);
const [usePublicApiWorkspacesService, setUsePublicApiWorkspacesService] = useState<boolean>(false); const [usePublicApiWorkspacesService, setUsePublicApiWorkspacesService] = useState<boolean>(false);
@ -55,7 +53,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
(async () => { (async () => {
const featureFlags: FeatureFlagConfig = { const featureFlags: FeatureFlagConfig = {
start_with_options: { defaultValue: false, setter: setStartWithOptions }, start_with_options: { defaultValue: false, setter: setStartWithOptions },
usage_view: { defaultValue: false, setter: setShowUsageView },
showUseLastSuccessfulPrebuild: { defaultValue: false, setter: setShowUseLastSuccessfulPrebuild }, showUseLastSuccessfulPrebuild: { defaultValue: false, setter: setShowUseLastSuccessfulPrebuild },
personalAccessTokensEnabled: { defaultValue: false, setter: setPersonalAccessTokensEnabled }, personalAccessTokensEnabled: { defaultValue: false, setter: setPersonalAccessTokensEnabled },
publicApiExperimentalWorkspaceService: { publicApiExperimentalWorkspaceService: {
@ -107,7 +104,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
const flags = useMemo(() => { const flags = useMemo(() => {
return { return {
startWithOptions, startWithOptions,
showUsageView,
showUseLastSuccessfulPrebuild, showUseLastSuccessfulPrebuild,
enablePersonalAccessTokens, enablePersonalAccessTokens,
usePublicApiWorkspacesService, usePublicApiWorkspacesService,
@ -123,7 +119,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
newSignupFlow, newSignupFlow,
oidcServiceEnabled, oidcServiceEnabled,
orgGitAuthProviders, orgGitAuthProviders,
showUsageView,
showUseLastSuccessfulPrebuild, showUseLastSuccessfulPrebuild,
startWithOptions, startWithOptions,
usePublicApiWorkspacesService, usePublicApiWorkspacesService,

4
components/dashboard/src/menu/OrganizationSelector.tsx
View File

@ -10,7 +10,6 @@ import { OrgIcon, OrgIconProps } from "../components/org-icon/OrgIcon";
import { useCurrentUser } from "../user-context"; import { useCurrentUser } from "../user-context";
import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode"; import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
import { useUserBillingMode } from "../data/billing-mode/user-billing-mode-query"; import { useUserBillingMode } from "../data/billing-mode/user-billing-mode-query";
import { useFeatureFlags } from "../contexts/FeatureFlagContext";
import { useCurrentOrg, useOrganizations } from "../data/organizations/orgs-query"; import { useCurrentOrg, useOrganizations } from "../data/organizations/orgs-query";
import { useOrgBillingMode } from "../data/billing-mode/org-billing-mode-query"; import { useOrgBillingMode } from "../data/billing-mode/org-billing-mode-query";
import { useLocation } from "react-router"; import { useLocation } from "react-router";
@ -23,7 +22,6 @@ export default function OrganizationSelector(p: OrganizationSelectorProps) {
const currentOrg = useCurrentOrg(); const currentOrg = useCurrentOrg();
const { data: userBillingMode } = useUserBillingMode(); const { data: userBillingMode } = useUserBillingMode();
const { data: orgBillingMode } = useOrgBillingMode(); const { data: orgBillingMode } = useOrgBillingMode();
const { showUsageView } = useFeatureFlags();
const getOrgURL = useGetOrgURL(); const getOrgURL = useGetOrgURL();
const userFullName = user?.fullName || user?.name || "..."; const userFullName = user?.fullName || user?.name || "...";
@ -74,7 +72,7 @@ export default function OrganizationSelector(p: OrganizationSelectorProps) {
BillingMode.showUsageBasedBilling(userBillingMode) && BillingMode.showUsageBasedBilling(userBillingMode) &&
!user?.additionalData?.isMigratedToTeamOnlyAttribution; !user?.additionalData?.isMigratedToTeamOnlyAttribution;
const showUsageForOrg = currentOrg.data?.isOwner && (orgBillingMode?.mode === "usage-based" || showUsageView); const showUsageForOrg = currentOrg.data?.isOwner && orgBillingMode?.mode === "usage-based";
if (showUsageForPersonalAccount || showUsageForOrg) { if (showUsageForPersonalAccount || showUsageForOrg) {
linkEntries.push({ linkEntries.push({