Merge branch 'master' into unblock-neon-sandbox

dashboard/src/lib/hooks/useAuthWindow.ts

@@ -28,6 +28,7 @@ export const useAuthWindow = ({
         try {
           if (
             authWindow.location.hostname.includes("dashboard.getporter.dev") ||
+            authWindow.location.hostname.includes("cloud.porter.run") ||
             authWindow.location.hostname.includes("localhost")
           ) {
             authWindow.close();

dashboard/src/main/home/app-dashboard/app-view/AppHeader.tsx

@@ -184,7 +184,7 @@ const AppHeader: React.FC = () => {
                       }}
                     />
                     {deploymentTarget.is_preview
-                      ? deploymentTarget.namespace
+                      ? deploymentTarget.name
                       : s.git_branch}
                   </BranchTag>
                 </TagWrapper>
@@ -199,6 +199,25 @@ const AppHeader: React.FC = () => {
                 <Text size={13} color="helper">
                   {s.image.repository}
                 </Text>
+                {deploymentTarget.is_preview && (
+                  <>
+                    <Spacer inline x={1} />
+                    <TagWrapper preview>
+                      Preview
+                      <BranchTag preview>
+                        <PullRequestIcon
+                          styles={{
+                            height: "14px",
+                            opacity: "0.65",
+                            marginRight: "5px",
+                            fill: "",
+                          }}
+                        />
+                        {deploymentTarget.name}
+                      </BranchTag>
+                    </TagWrapper>
+                  </>
+                )}
               </>
             ))
             .otherwise(() => null)}

go.sum

@@ -1563,8 +1563,6 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw=
-github.com/porter-dev/api-contracts v0.2.158 h1:928I9vELiqntau4Yp8cVuX7FcLgo95Lv2uBVYj84is8=
-github.com/porter-dev/api-contracts v0.2.158/go.mod h1:VV5BzXd02ZdbWIPLVP+PX3GKawJSGQnxorVT2sUZALU=
 github.com/porter-dev/api-contracts v0.2.159 h1:Ze4K0rm8p6sRMxaFW4Nb3dJuzz4NEMQ+UMXMtOKKRQ4=
 github.com/porter-dev/api-contracts v0.2.159/go.mod h1:VV5BzXd02ZdbWIPLVP+PX3GKawJSGQnxorVT2sUZALU=
 github.com/porter-dev/switchboard v0.0.3 h1:dBuYkiVLa5Ce7059d6qTe9a1C2XEORFEanhbtV92R+M=