Explorar o código

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

sunguroku %!s(int64=5) %!d(string=hai) anos
pai
achega
725938c470

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

@@ -489,7 +489,12 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
 
 
   renderUrl = () => {
   renderUrl = () => {
     if (this.state.url) {
     if (this.state.url) {
-      return <Url href={this.state.url} target='_blank'> <i className="material-icons">link</i> {this.state.url}</Url>;
+      return (
+        <Url href={this.state.url} target='_blank'>
+          <i className="material-icons">link</i>
+          {this.state.url}
+        </Url>
+      );
     } else {
     } else {
       let serviceName = null as string
       let serviceName = null as string
       let serviceNamespace = null as string
       let serviceNamespace = null as string
@@ -501,7 +506,12 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
         }
         }
       })
       })
 
 
-      return <Url><i className="material-icons">link</i>{`${serviceName}.${serviceNamespace}.namespace.svc.cluster.local`}</Url>
+      return (
+        <Url>
+          <Bolded>Internal URI:</Bolded>
+          {`${serviceName}.${serviceNamespace}.namespace.svc.cluster.local`}
+        </Url>
+      );
     }
     }
   }
   }
 
 
@@ -574,11 +584,18 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
 
 
 ExpandedChart.contextType = Context;
 ExpandedChart.contextType = Context;
 
 
+const Bolded = styled.div`
+  font-weight: 500;
+  color: #ffffff44;
+  margin-right: 6px;
+`;
+
 const Url = styled.a`
 const Url = styled.a`
   display: block;
   display: block;
-  margin-left: 1px;
+  margin-left: 2px;
   font-size: 13px;
   font-size: 13px;
-  margin-top: 15px;
+  margin-top: 16px;
+  user-select: all;
   margin-bottom: -5px;
   margin-bottom: -5px;
   user-select: text;
   user-select: text;
   display: flex;
   display: flex;

+ 2 - 4
dashboard/src/main/home/new-project/NewProject.tsx

@@ -277,6 +277,8 @@ export default class NewProject extends Component<PropsType, StateType> {
 
 
   createProject = () => {
   createProject = () => {
     this.setState({ status: 'loading' });
     this.setState({ status: 'loading' });
+    let msg = '🏗️ ' + this.context.user.email + ' began provisioning.';
+    handleSubmitFeedback(msg);
 
 
     api.createProject('<token>', {
     api.createProject('<token>', {
       name: this.state.projectName
       name: this.state.projectName
@@ -317,10 +319,6 @@ export default class NewProject extends Component<PropsType, StateType> {
         if (res.data.length > 0) {
         if (res.data.length > 0) {
           let proj = res.data.find((el: ProjectType) => el.name === this.state.projectName);
           let proj = res.data.find((el: ProjectType) => el.name === this.state.projectName);
           this.context.setCurrentProject(proj);
           this.context.setCurrentProject(proj);
-          
-          let msg = '🏗️ ' + this.context.user.email + ' began provisioning.';
-          handleSubmitFeedback(msg);
-
           if (this.state.selectedProvider === 'aws') {
           if (this.state.selectedProvider === 'aws') {
             this.provisionECR(proj, this.provisionEKS)
             this.provisionECR(proj, this.provisionEKS)
 
 

+ 9 - 1
dashboard/src/shared/feedback.tsx

@@ -1,7 +1,15 @@
 import axios from 'axios';
 import axios from 'axios';
 
 
+const ignoreUsers = [
+  'justin@getporter.dev',
+  'trevor@getporter.dev',
+  'belanger@getporter.dev',
+  'seanr112593@gmail.com',
+];
+
 export const handleSubmitFeedback = (msg: string, callback?: (err: any, res: any) => void) => {
 export const handleSubmitFeedback = (msg: string, callback?: (err: any, res: any) => void) => {
-  if (!window.location.href.includes('localhost:8080')) {
+  let splits = msg.split(' ');
+  if (!window.location.href.includes('localhost:8080') && !ignoreUsers.includes(splits[1])) {
     axios.post(process.env.FEEDBACK_ENDPOINT, {
     axios.post(process.env.FEEDBACK_ENDPOINT, {
       key: process.env.DISCORD_KEY,
       key: process.env.DISCORD_KEY,
       cid: process.env.DISCORD_CID,
       cid: process.env.DISCORD_CID,