Browse Source

ui updates

Ian Edwards 2 years ago
parent
commit
e054c5b20e

+ 0 - 2
dashboard/src/components/repo-selector/RepoList.tsx

@@ -181,11 +181,9 @@ const RepoList: React.FC<Props> = ({
 
   useEffect(() => {
     if (repos.length && !selectedRepo && defaultRepo) {
-      console.log('all repos', repos)
       const repo = repos.find(
         (repo) => repo.Kind === "github" && repo.FullName === defaultRepo
       );
-      console.log('repo', repo)
       if (repo) {
         setRepo(repo);
       }

+ 0 - 2
dashboard/src/main/home/app-dashboard/expanded-app/PreviewEnvSettings.tsx

@@ -40,8 +40,6 @@ export const PreviewEnvSettings: React.FC<Props> = ({ appName, repoName }) => {
     }
   );
 
-  console.log("repoName", repoName);
-
   const [
     showPreviewDisabledBanner,
     setShowPreviewDisabledBanner,

+ 11 - 13
dashboard/src/main/home/cluster-dashboard/preview-environments/ConnectNewRepo.tsx

@@ -224,7 +224,7 @@ const ConnectNewRepo: React.FC = () => {
                           return prev;
                         }
 
-                        return prev + 1;
+                        return prev + 2;
                       });
                     }
                   }}
@@ -236,7 +236,7 @@ const ConnectNewRepo: React.FC = () => {
                   <DocsHelper
                     disableMargin
                     tooltipText="A Porter YAML file is a declarative set of resources that Porter uses to build and update your preview environment deployments."
-                    link="https://docs.porter.run/preview-environments/porter-yaml-reference"
+                    link="https://docs.porter.run/standard/deploying-applications/writing-porter-yaml"
                   />
                 </HelperContainer>
               </>,
@@ -262,19 +262,17 @@ const ConnectNewRepo: React.FC = () => {
                   />
                 </CheckboxWrapper>
               </>,
+              <SaveButton
+                text="Add repository"
+                disabled={actionConfig.git_repo_id ? false : true}
+                onClick={addRepo}
+                makeFlush={true}
+                clearPosition={true}
+                status={status}
+                statusPosition={"left"}
+              />,
             ]}
           />
-          <ActionContainer>
-            <SaveButton
-              text="Add repository"
-              disabled={actionConfig.git_repo_id ? false : true}
-              onClick={addRepo}
-              makeFlush={true}
-              clearPosition={true}
-              status={status}
-              statusPosition={"left"}
-            />
-          </ActionContainer>
         </Div>
       </CenterWrapper>
     );

+ 20 - 21
dashboard/src/main/home/sidebar/Sidebar.tsx

@@ -109,7 +109,12 @@ class Sidebar extends Component<PropsType, StateType> {
 
   renderProjectContents = () => {
     let { currentView } = this.props;
-    let { currentProject, user, currentCluster, hasFinishedOnboarding } = this.context;
+    let {
+      currentProject,
+      user,
+      currentCluster,
+      hasFinishedOnboarding,
+    } = this.context;
     if (!currentProject?.simplified_view_enabled) {
       return (
         <ScrollWrapper>
@@ -156,11 +161,9 @@ class Sidebar extends Component<PropsType, StateType> {
           <br />
 
           <SidebarLabel>
-            {currentProject?.capi_provisioner_enabled ? (
-              "Your team"
-            ) : (
-              "Clusters"
-            )}
+            {currentProject?.capi_provisioner_enabled
+              ? "Your team"
+              : "Clusters"}
           </SidebarLabel>
           <Clusters
             setWelcome={this.props.setWelcome}
@@ -188,6 +191,13 @@ class Sidebar extends Component<PropsType, StateType> {
             <Img src={addOns} />
             Add-ons
           </NavButton>
+          <Clusters
+            setWelcome={this.props.setWelcome}
+            currentView={currentView}
+            isSelected={false}
+            forceRefreshClusters={this.props.forceRefreshClusters}
+            setRefreshClusters={this.props.setRefreshClusters}
+          />
           {this.props.isAuthorized("integrations", "", [
             "get",
             "create",
@@ -207,9 +217,7 @@ class Sidebar extends Component<PropsType, StateType> {
             <NavButton
               path={"/cluster-dashboard"}
               targetClusterName={currentCluster?.name}
-              active={
-                window.location.pathname.startsWith("/cluster-dashboard")
-              }
+              active={window.location.pathname.startsWith("/cluster-dashboard")}
             >
               <Img src={infra} />
               Infrastructure
@@ -225,15 +233,6 @@ class Sidebar extends Component<PropsType, StateType> {
               Project settings
             </NavButton>
           )}
-
-          {/* Hacky workaround for setting currentCluster with legacy method */}
-          <Clusters
-            setWelcome={this.props.setWelcome}
-            currentView={currentView}
-            isSelected={false}
-            forceRefreshClusters={this.props.forceRefreshClusters}
-            setRefreshClusters={this.props.setRefreshClusters}
-          />
         </ScrollWrapper>
       );
     }
@@ -317,7 +316,7 @@ const NavButton = styled(SidebarLink)`
   margin: 5px 15px;
   padding: 0 30px 2px 6px;
   font-size: 13px;
-  color: ${props => props.theme.text.primary};
+  color: ${(props) => props.theme.text.primary};
   cursor: ${(props: { disabled?: boolean }) =>
     props.disabled ? "not-allowed" : "pointer"};
 
@@ -361,14 +360,14 @@ const SidebarBg = styled.div`
   top: 0;
   left: 0;
   width: 100%;
-  background-color: ${props => props.theme.bg};
+  background-color: ${(props) => props.theme.bg};
   height: 100%;
   z-index: -1;
   border-right: 1px solid #383a3f;
 `;
 
 const SidebarLabel = styled.div`
-  color: ${props => props.theme.text.primary};
+  color: ${(props) => props.theme.text.primary};
   padding: 5px 23px;
   margin-bottom: 5px;
   font-size: 13px;