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

remove files only used in v1 #4601

Merged
merged 11 commits into from
May 3, 2024
Merged

remove files only used in v1 #4601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d430473
remove files only used in v1
May 2, 2024
07a635b
more dependencies
May 2, 2024
5c538a8
fix dependencies
May 2, 2024
9fdc9e3
Merge branch 'master' into delete-v1-files
May 2, 2024
b797638
fix import
May 2, 2024
10b78ce
Merge branch 'master' into delete-v1-files
May 2, 2024
55635ba
undo unintended changes
May 2, 2024
00cd0de
re-add stuff
May 2, 2024
602a173
re-add stuff
May 2, 2024
8483953
re-add stuff
May 2, 2024
691e5f1
Merge branch 'master' into delete-v1-files
May 2, 2024
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
6 changes: 0 additions & 6 deletions dashboard/src/components/porter/InputSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import styled from 'styled-components';
import { withStyles } from '@material-ui/core/styles';
import Text from './Text';
import Spacer from './Spacer';
import SmartOptModal from 'main/home/app-dashboard/new-app-flow/tabs/SmartOptModal';
import NodeInfoModal from 'main/home/app-dashboard/new-app-flow/tabs/NodeInfoModal';

type InputSliderProps = {
label?: string;
Expand Down Expand Up @@ -127,10 +125,6 @@ const InputSlider: React.FC<InputSliderProps> = ({
>
help_outline
</StyledIcon></>}
{showNeedHelpModal &&
<NodeInfoModal
setModalVisible={setShowNeedHelpModal}
/>}
{isExceedingLimit &&
<><Spacer inline x={1} /><Label color="#FFBF00"> Value is not optimal for cost</Label></>}
</>
Expand Down
84 changes: 29 additions & 55 deletions dashboard/src/main/home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const Home: React.FC<Props> = (props) => {
} else {
setHasFinishedOnboarding(true);
}
} catch (error) { }
} catch (error) {}
};

useEffect(() => {
Expand Down Expand Up @@ -460,37 +460,21 @@ const Home: React.FC<Props> = (props) => {

<Switch>
<Route path="/apps/new/app">
{currentProject?.validate_apply_v2 ? (
<ClusterContextProvider
clusterId={currentCluster?.id}
refetchInterval={0}
>
<CreateApp />
</ClusterContextProvider>
) : (
<NewAppFlow />
)}
<ClusterContextProvider
clusterId={currentCluster?.id}
refetchInterval={0}
>
<CreateApp />
</ClusterContextProvider>
</Route>
<Route path="/apps/:appName/:tab">
{currentProject?.validate_apply_v2 ? (
<AppView />
) : (
<ExpandedApp />
)}
<AppView />
</Route>
<Route path="/apps/:appName">
{currentProject?.validate_apply_v2 ? (
<AppView />
) : (
<ExpandedApp />
)}
<AppView />
</Route>
<Route path="/apps">
{currentProject?.validate_apply_v2 ? (
<Apps />
) : (
<AppDashboard />
)}
<Apps />
</Route>

<Route path="/environment-groups/new">
Expand Down Expand Up @@ -524,8 +508,8 @@ const Home: React.FC<Props> = (props) => {

<Route path="/addons/new">
{currentProject?.capi_provisioner_enabled &&
currentProject?.simplified_view_enabled &&
currentProject?.beta_features_enabled ? (
currentProject?.simplified_view_enabled &&
currentProject?.beta_features_enabled ? (
<AddonTemplates />
) : (
<LegacyNewAddOnFlow />
Expand All @@ -539,8 +523,8 @@ const Home: React.FC<Props> = (props) => {
</Route>
<Route path="/addons">
{currentProject?.capi_provisioner_enabled &&
currentProject?.simplified_view_enabled &&
currentProject?.beta_features_enabled ? (
currentProject?.simplified_view_enabled &&
currentProject?.beta_features_enabled ? (
<AddonDashboard />
) : (
<LegacyAddOnDashboard />
Expand Down Expand Up @@ -590,9 +574,6 @@ const Home: React.FC<Props> = (props) => {
"/jobs",
"/env-groups",
"/datastores",
...(!currentProject?.validate_apply_v2
? ["/preview-environments"]
: []),
"/stacks",
]}
render={() => {
Expand Down Expand Up @@ -625,28 +606,21 @@ const Home: React.FC<Props> = (props) => {
path={"/project-settings"}
render={() => <GuardedProjectSettings />}
/>
{currentProject?.validate_apply_v2 && (
<>
<Route exact path="/preview-environments/configure">
<SetupApp />
</Route>
<Route
exact
path={`/preview-environments/apps/:appName/:tab`}
>
<AppView preview />
</Route>
<Route exact path="/preview-environments/apps/:appName">
<AppView preview />
</Route>
<Route exact path={`/preview-environments/apps`}>
<Apps />
</Route>
<Route exact path={`/preview-environments`}>
<PreviewEnvs />
</Route>
</>
)}
<Route exact path="/preview-environments/configure">
<SetupApp />
</Route>
<Route exact path={`/preview-environments/apps/:appName/:tab`}>
<AppView preview />
</Route>
<Route exact path="/preview-environments/apps/:appName">
<AppView preview />
</Route>
<Route exact path={`/preview-environments/apps`}>
<Apps />
</Route>
<Route exact path={`/preview-environments`}>
<PreviewEnvs />
</Route>
<Route path={"*"} render={() => <LaunchWrapper />} />
</Switch>
</ViewWrapper>
Expand Down
Loading
Loading