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

Flux Runtime config draft #4177

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Flux Runtime config draft #4177

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20df9e
Smth. like that should work.
opudrovs Dec 19, 2023
7e31598
just my grain of salt of the pr
enekofb Dec 19, 2023
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
107 changes: 56 additions & 51 deletions ui/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import AppContextProvider, {
} from "./contexts/AppContext";
import AuthContextProvider, { AuthCheck } from "./contexts/AuthContext";
import CoreClientContextProvider from "./contexts/CoreClientContext";
import { useFeatureFlags } from "./hooks/featureflags";
import useNavigation from "./hooks/navigation";
import { useInDarkMode } from "./hooks/theme";
import { Core } from "./lib/api/core/core.pb";
Expand All @@ -40,6 +41,7 @@ import Error from "./pages/Error";
import SignIn from "./pages/SignIn";
import Automations from "./pages/v2/Automations";
import BucketDetail from "./pages/v2/BucketDetail";
import FluxRuntime from "./pages/v2/FluxRuntime";
import GitRepositoryDetail from "./pages/v2/GitRepositoryDetail";
import HelmChartDetail from "./pages/v2/HelmChartDetail";
import HelmReleasePage from "./pages/v2/HelmReleasePage";
Expand All @@ -66,60 +68,63 @@ function withSearchParams(Cmp) {
}

// gets the right runtime navigation item based on the feature WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME
// function getRuntimeConfiguration() {
// const { isFlagEnabled } = useFeatureFlags();
//
// if (isFlagEnabled("WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME")) {
// return {
// label: "Runtime",
// route: V2Routes.Runtime,
// component: {Runtime},
// };
// }
// return {
// label: "Flux Runtime",
// route: V2Routes.FluxRuntime,
// component: {FluxRuntime},
// };
// }
function getRuntimeConfiguration(isNewRuntimeEnabled: boolean): NavItem {
if (isNewRuntimeEnabled) {
return {
label: "Runtime",
link: { value: V2Routes.Runtime },
icon: IconType.FluxIcon,
}
}

// const runtimeConfiguration = getRuntimeConfiguration();

const navItems: NavItem[] = [
{
label: "Applications",
link: { value: V2Routes.Automations },
icon: IconType.ApplicationsIcon,
},
{
label: "Sources",
link: { value: V2Routes.Sources },
icon: IconType.SourcesIcon,
},
{
label: "Image Automation",
link: { value: V2Routes.ImageAutomation },
icon: IconType.ImageAutomationIcon,
},
{
label: "Policies",
link: { value: V2Routes.Policies },
icon: IconType.PoliciesIcon,
},
{
label: "Runtime",
link: { value: V2Routes.Runtime },
return {
label: "Flux Runtime",
link: { value: V2Routes.FluxRuntime },
icon: IconType.FluxIcon,
},
{
label: "Notifications",
link: { value: V2Routes.Notifications },
icon: IconType.NotificationsIcon,
},
];
}
}

const App = () => {
const dark = useInDarkMode();

const { isFlagEnabled } = useFeatureFlags();

const isNewRuntimeEnabled = isFlagEnabled("WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME");

// TODO: remove debug message
console.log("WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME:")
console.log(isNewRuntimeEnabled)

const runtimeNavItem: NavItem = getRuntimeConfiguration(isNewRuntimeEnabled);

const navItems: NavItem[] = [
{
label: "Applications",
link: { value: V2Routes.Automations },
icon: IconType.ApplicationsIcon,
},
{
label: "Sources",
link: { value: V2Routes.Sources },
icon: IconType.SourcesIcon,
},
{
label: "Image Automation",
link: { value: V2Routes.ImageAutomation },
icon: IconType.ImageAutomationIcon,
},
{
label: "Policies",
link: { value: V2Routes.Policies },
icon: IconType.PoliciesIcon,
},
runtimeNavItem,
{
label: "Notifications",
link: { value: V2Routes.Notifications },
icon: IconType.NotificationsIcon,
}];

const [collapsed, setCollapsed] = React.useState<boolean>(false);
const { currentPage } = useNavigation();
const value = getParentNavRouteValue(currentPage);
Expand Down Expand Up @@ -163,8 +168,8 @@ const App = () => {
path={V2Routes.ImagePolicyDetails}
component={withSearchParams(ImagePolicyDetails)}
/>
// TODO should be configurable based on feature flag
<Route path={V2Routes.Runtime} component={Runtime} />
{/* TODO should be configurable based on feature flag */}
{isNewRuntimeEnabled ? <Route path={V2Routes.Runtime} component={Runtime} /> : <Route path={V2Routes.FluxRuntime} component={FluxRuntime} />}
<Route
path={V2Routes.GitRepo}
component={withSearchParams(GitRepositoryDetail)}
Expand Down