Просмотр исходного кода

Merge pull request #1281 from porter-dev/master

Styling quick fixes -> staging
abelanger5 4 лет назад
Родитель
Сommit
cb70052c87

+ 1 - 3
dashboard/src/main/home/cluster-dashboard/chart/Chart.tsx

@@ -97,9 +97,7 @@ const Chart: React.FunctionComponent<Props> = ({
         let urlParams = new URLSearchParams(location.search);
         let cluster = urlParams.get("cluster");
         let route = `${match.url}/${cluster}/${chart.namespace}/${chart.name}`;
-        pushFiltered({ location, history }, route, ["project_id"], {
-          chart_revision: chart.version,
-        });
+        pushFiltered({ location, history }, route, ["project_id"]);
       }}
     >
       <Title>

+ 7 - 5
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChartWrapper.tsx

@@ -33,15 +33,17 @@ class ExpandedChartWrapper extends Component<PropsType, StateType> {
     let { namespace, chartName } = match.params as any;
     let { currentProject, currentCluster } = this.context;
     if (currentProject && currentCluster) {
-      // TODO: add query for retrieving max revision #
-      const lastCheckedRevision = getQueryParam(this.props, "chart_revision");
-
       api
         .getChart(
           "<token>",
+          {},
           {
-          },
-          { id: currentProject.id, namespace: namespace, cluster_id: currentCluster.id ,name: chartName, revision: Number(lastCheckedRevision), }
+            id: currentProject.id,
+            namespace: namespace,
+            cluster_id: currentCluster.id,
+            name: chartName,
+            revision: 0,
+          }
         )
         .then((res) => {
           this.setState({ currentChart: res.data, loading: false });

+ 0 - 2
dashboard/src/main/home/launch/launch-flow/SettingsPage.tsx

@@ -54,8 +54,6 @@ class SettingsPage extends Component<PropsType, StateType> {
   };
 
   componentDidMount() {
-    window.scrollBy(0, -window.innerHeight);
-
     // Retrieve tab options
     let tabOptions = [] as ChoiceType[];
     this.props.form?.tabs.map((tab: any, i: number) => {

+ 2 - 2
dashboard/src/main/home/provisioner/AWSFormSection.tsx

@@ -200,8 +200,8 @@ const AWSFormSectionFC: React.FC<PropsType> = (props) => {
         "<token>",
         {
           aws_region: awsRegion,
-          aws_access_key_id: awsAccessId,
-          aws_secret_access_key: awsSecretKey,
+          aws_access_key_id: awsAccessId.trim(),
+          aws_secret_access_key: awsSecretKey.trim(),
           aws_cluster_id: clusterName,
         },
         { id: currentProject.id }