Inicio Explorar Axuda
Iniciar sesión
akillibulut
/
porter
réplica de https://github.com/porter-dev/porter
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

read from prod chart-repo and disable button iff chart hasSource

sunguroku %!s(int64=5) %!d(string=hai) anos
pai
32ee037443
achega
cc08f90d70
Modificáronse 9 ficheiros con 23 adicións e 9 borrados
Dividir vista Mostrar estatísticas de Diff
  1. BIN=BIN
      dashboard/src/assets/My Health Connection - Appointment Details.pdf
  2. 15 0
      dashboard/src/index.html
  3. 3 2
      dashboard/src/main/Main.tsx
  4. 1 3
      dashboard/src/main/home/cluster-dashboard/expanded-chart/status/ControllerTab.tsx
  5. 1 0
      dashboard/src/main/home/new-project/NewProject.tsx
  6. 1 1
      dashboard/src/main/home/templates/Templates.tsx
  7. 0 1
      dashboard/src/main/home/templates/expanded-template/ExpandedTemplate.tsx
  8. 1 1
      dashboard/src/main/home/templates/expanded-template/LaunchTemplate.tsx
  9. 1 1
      internal/config/config.go

BIN=BIN
dashboard/src/assets/My Health Connection - Appointment Details.pdf
Ver ficheiro


+ 15 - 0
dashboard/src/index.html
Ver ficheiro 

@@ -1,5 +1,10 @@
 
 <!DOCTYPE html>
 
 <html lang="en">
 
+  <script>
 
+    !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
 
+    posthog.init('XHhXMIA5YlgR4l9QV3Ydm5ZasEyyjvPvGCb33_QVLNc',{api_host:'https://posthog-porter.herokuapp.com'})
 
+  </script>
 
+
 
   <head>
 
     <title>Porter | Dashboard</title>
 
 
@@ -19,5 +24,15 @@
 
   </head>
 
 <body>
 
   <div id="output"></div>
 
+  <script>
 
+    window.intercomSettings = {
 
+      app_id: "gq56g49i"
 
+    };
 
+  </script>
 
+
 
+  <script>
 
+  // We pre-filled your app ID in the widget URL: 'https://widget.intercom.io/widget/gq56g49i'
 
+  (function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',w.intercomSettings);}else{var d=document;var i=function(){i.c(arguments);};i.q=[];i.c=function(args){i.q.push(args);};w.Intercom=i;var l=function(){var s=d.createElement('script');s.type='text/javascript';s.async=true;s.src='https://widget.intercom.io/widget/gq56g49i';var x=d.getElementsByTagName('script')[0];x.parentNode.insertBefore(s,x);};if(w.attachEvent){w.attachEvent('onload',l);}else{w.addEventListener('load',l,false);}}})();
 
+  </script>
 
 </body>
 
 </html>

+ 3 - 2
dashboard/src/main/Main.tsx
Ver ficheiro 

@@ -31,8 +31,9 @@ export default class Main extends Component<PropsType, StateType> {
 
 
   componentDidMount() {
 
     let { setUser } = this.context;
 
-    api.checkAuth('', {}, {}, (err: any, res: any) => {      
-      if (err && err.response.status == 403) {
 
+    api.checkAuth('', {}, {}, (err: any, res: any) => {    
+      console.log(err)  
+      if (err && err.response?.status == 403) {
 
         this.setState({ isLoggedIn: false, loading: false })
 
       }

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

@@ -80,7 +80,7 @@ export default class ControllerTab extends Component<PropsType, StateType> {
 
   }
 
 
   getPodStatus = (status: any) => {
 
-    if (status?.phase == 'Pending' && status?.containerStatuses) {
 
+    if (status?.phase == 'Pending' && status?.containerStatuses !== undefined) {
 
       return status.containerStatuses[0].state.waiting.reason
 
       // return 'waiting'
 
     }
 
@@ -105,10 +105,8 @@ export default class ControllerTab extends Component<PropsType, StateType> {
 
 
   render() {
 
     let { controller, selectedPod, isLast, selectPod } = this.props;
 
-    console.log(controller)
 
     let [available, total] = this.getAvailability(controller.kind, controller);
 
     let status = (available == total) ? 'running' : 'waiting'
 
-    console.log('state', this.state)
 
     return (
 
       <ResourceTab
 
         label={controller.kind}

+ 1 - 0
dashboard/src/main/home/new-project/NewProject.tsx
Ver ficheiro 

@@ -75,6 +75,7 @@ export default class NewProject extends Component<PropsType, StateType> {
 
   // TODO: split this out into a separate component
 
   renderProvisioners = () => {
 
     if (this.state.selectedProvider === 'aws') {
 
+
 
       return (
 
         <FormSection>
 
           <CloseButton onClick={() => {

+ 1 - 1
dashboard/src/main/home/templates/Templates.tsx
Ver ficheiro 

@@ -17,6 +17,7 @@ const tabOptions = [
 
 const hardcodedNames: any = {
 
   'postgresql': 'PostgreSQL',
 
   'docker': 'Docker',
 
+  'https-issuer': 'HTTPS Issuer'
 
 };
 
 
 type PropsType = {
 
@@ -46,7 +47,6 @@ export default class Templates extends Component<PropsType, StateType> {
 
         this.setState({ loading: false, error: true });
 
       } else {
 
         this.setState({ porterTemplates: res.data, loading: false, error: false });
 
-        console.log(res.data)
 
       }
 
     });
 
   }

+ 0 - 1
dashboard/src/main/home/templates/expanded-template/ExpandedTemplate.tsx
Ver ficheiro 

@@ -45,7 +45,6 @@ export default class ExpandedTemplate extends Component<PropsType, StateType> {
 
         this.setState({ loading: false, error: true });
 
       } else {
 
         let { form, values, markdown, metadata } = res.data;
 
-        console.log(form)
 
         let keywords = metadata.keywords;
 
         this.setState({ form, values, markdown, keywords, loading: false, error: false });
 
       }

+ 1 - 1
dashboard/src/main/home/templates/expanded-template/LaunchTemplate.tsx
Ver ficheiro 

@@ -123,7 +123,7 @@ export default class LaunchTemplate extends Component<PropsType, StateType> {
 
         formTabs={this.props.form?.tabs}
 
         onSubmit={this.onSubmit}
 
         saveValuesStatus={this.state.saveValuesStatus}
 
-        disabled={!this.state.selectedImageUrl}
 
+        disabled={!this.state.selectedImageUrl && this.props.form?.hasSource}
 
       >
 
         {(metaState: any, setMetaState: any) => {
 
           return this.props.form?.tabs.map((tab: any, i: number) => {

+ 1 - 1
internal/config/config.go
Ver ficheiro 

@@ -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-dev/"`
 
+	DefaultHelmRepoURL string `env:"HELM_REPO_URL,default=https://porter-dev.github.io/chart-repo/"`
 
 
 	GithubClientID     string `env:"GITHUB_CLIENT_ID"`
 
 	GithubClientSecret string `env:"GITHUB_CLIENT_SECRET"`