Преглед изворни кода

Merge branch 'beta.3.integration-frontend' into main

sunguroku пре 5 година
родитељ
комит
32ee037443

+ 0 - 3
dashboard/src/main/Register.tsx

@@ -5,7 +5,6 @@ import logo from '../assets/logo.png';
 import api from '../shared/api';
 import { emailRegex } from '../shared/regex';
 import { Context } from '../shared/Context';
-import { handleSubmitFeedback } from '../shared/feedback'; 
 
 type PropsType = {
   authenticate: () => void
@@ -61,8 +60,6 @@ export default class Register extends Component<PropsType, StateType> {
         email: email,
         password: password
       }, {}, (err: any, res: any) => {
-        let msg = '📡 ' + email + ' registered for Porter.';
-        handleSubmitFeedback(msg);
         setUser(res?.data?.id, res?.data?.email)
         err ? setCurrentError(err.response.data.errors[0]) : authenticate();
       });

+ 0 - 3
dashboard/src/main/home/Home.tsx

@@ -5,7 +5,6 @@ import ReactModal from 'react-modal';
 import { Context } from '../../shared/Context';
 import api from '../../shared/api';
 import { InfraType } from '../../shared/types';
-import { handleSubmitFeedback } from '../../shared/feedback';
 
 import Sidebar from './sidebar/Sidebar';
 import Dashboard from './dashboard/Dashboard';
@@ -92,8 +91,6 @@ export default class Home extends Component<PropsType, StateType> {
   }
 
   componentDidMount() {
-    let msg = '👋 ' + this.context.user.email + ' logged in.';
-    handleSubmitFeedback(msg);
     this.getProjects();
   }
 

+ 4 - 1
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx

@@ -468,7 +468,10 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
         return
       }
       console.log(res.data)
-      this.setState({url: `http://${res.data?.status?.loadBalancer?.ingress[0]?.hostname}` })
+      
+      if (res.data?.status?.loadBalancer?.ingress) {
+        this.setState({url: `http://${res.data?.status?.loadBalancer?.ingress[0]?.hostname}` })
+      }
     })
   }
 

+ 3 - 3
dashboard/src/main/home/cluster-dashboard/expanded-chart/status/ControllerTab.tsx

@@ -80,8 +80,8 @@ export default class ControllerTab extends Component<PropsType, StateType> {
   }
 
   getPodStatus = (status: any) => {
-    if (status?.phase == 'Pending') {
-      return status?.containerStatuses[0].state.waiting.reason
+    if (status?.phase == 'Pending' && status?.containerStatuses) {
+      return status.containerStatuses[0].state.waiting.reason
       // return 'waiting'
     }
 
@@ -92,7 +92,7 @@ export default class ControllerTab extends Component<PropsType, StateType> {
     if (status?.phase == 'Running') {
       let collatedStatus = 'running';
 
-      status.containerStatuses.forEach((s: any) => {
+      status?.containerStatuses?.forEach((s: any) => {
         if (s.state?.waiting) {
           collatedStatus = 'waiting'
         } else if (s.state?.terminated) {

+ 0 - 6
dashboard/src/main/home/new-project/NewProject.tsx

@@ -6,7 +6,6 @@ import close from '../../../assets/close.png';
 import api from '../../../shared/api';
 import { Context } from '../../../shared/Context';
 import { integrationList } from '../../../shared/common';
-import { handleSubmitFeedback } from '../../../shared/feedback';
 import { ProjectType } from '../../../shared/types';
 
 import InputRow from '../../../components/values-form/InputRow';
@@ -50,8 +49,6 @@ export default class NewProject extends Component<PropsType, StateType> {
   }
 
   handleSelectProvider = (provider: string) => {
-    let msg = '🤔 ' + this.context.user.email + ' selected ' + provider + '.';
-    handleSubmitFeedback(msg);
     this.setState({ selectedProvider: provider });
   }
 
@@ -277,9 +274,6 @@ export default class NewProject extends Component<PropsType, StateType> {
 
   createProject = () => {
     this.setState({ status: 'loading' });
-    let msg = '🏗️ ' + this.context.user.email + ' began provisioning.';
-    handleSubmitFeedback(msg);
-
     api.createProject('<token>', {
       name: this.state.projectName
     }, {}, (err: any, res: any) => {

+ 0 - 3
dashboard/src/main/home/new-project/Provisioner.tsx

@@ -4,7 +4,6 @@ import styled from 'styled-components';
 import api from '../../../shared/api';
 import { Context } from '../../../shared/Context';
 import ansiparse from '../../../shared/ansiparser'
-import { handleSubmitFeedback } from '../../../shared/feedback';
 import loading from '../../../assets/loading.gif';
 import warning from '../../../assets/warning.png';
 
@@ -189,8 +188,6 @@ export default class Provisioner extends Component<PropsType, StateType> {
   }
 
   onEnd = () => {
-    let msg = '🛠️ ' + this.context.user.email + ' completed provisioning.';
-    handleSubmitFeedback(msg);
     let myInterval = setInterval(() => {
       api.getClusters('<token>', {}, { id: this.context.currentProject.id }, (err: any, res: any) => {
         if (err) {

+ 1 - 1
internal/config/config.go

@@ -29,7 +29,7 @@ type ServerConf struct {
 	IsLocal        bool          `env:"IS_LOCAL,default=false"`
 	IsTesting      bool          `env:"IS_TESTING,default=false"`
 
-	DefaultHelmRepoURL string `env:"HELM_REPO_URL,default=https://porter-dev.github.io/chart-repo/"`
+	DefaultHelmRepoURL string `env:"HELM_REPO_URL,default=https://porter-dev.github.io/chart-repo-dev/"`
 
 	GithubClientID     string `env:"GITHUB_CLIENT_ID"`
 	GithubClientSecret string `env:"GITHUB_CLIENT_SECRET"`