chore: wire up Cypress Studio #23413
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,14 +23,16 @@ | |
| > | ||
| <i-cy-crosshairs_x16 :class="[selectorPlaygroundStore.show ? 'icon-dark-indigo-500' : 'icon-dark-gray-500']" /> | ||
| </Button> | ||
| <input | ||
|
There was a problem hiding this comment. Here is the There was a problem hiding this comment. Why did we need to change this to an input? I think I missed the reason There was a problem hiding this comment. This is here: #23413 (comment) I think it was an input in Cypress 9, which I always didn't really love - I'm hoping when we clean up the UX for this, this will only render an input when it is actually editable in studio mode, and will render a plain old link the rest of the time. There was a problem hiding this comment. I guess I had a ton of problems with tailwind doing weird things - for some reason the sizing changes between |
||
| target="_blank" | ||
| :value="autUrl" | ||
| data-cy="aut-url-input" | ||
| class="mr-12px leading-normal max-w-100% text-indigo-500 self-center hocus-link-default truncate flex flex-grow" | ||
| @input="setStudioUrl" | ||
| @click="openInNewTab" | ||
| > | ||
| </div> | ||
|
|
||
| <div | ||
| v-else | ||
| class="flex-grow" | ||
|
|
@@ -129,6 +131,8 @@ | |
| :event-manager="eventManager" | ||
| /> | ||
|
|
||
| <StudioControls v-if="studioStore.isActive" /> | ||
|
|
||
| <Alert | ||
| v-model="showAlert" | ||
| status="success" | ||
|
|
@@ -160,11 +164,13 @@ import SelectorPlayground from './selector-playground/SelectorPlayground.vue' | |
| import ExternalLink from '@packages/frontend-shared/src/gql-components/ExternalLink.vue' | ||
| import Alert from '@packages/frontend-shared/src/components/Alert.vue' | ||
| import Button from '@packages/frontend-shared/src/components/Button.vue' | ||
| import StudioControls from './StudioControls.vue' | ||
| import VerticalBrowserListItems from '@packages/frontend-shared/src/gql-components/topnav/VerticalBrowserListItems.vue' | ||
| import InlineCodeFragment from '@packages/frontend-shared/src/components/InlineCodeFragment.vue' | ||
| import SpecRunnerDropdown from './SpecRunnerDropdown.vue' | ||
| import { allBrowsersIcons } from '@packages/frontend-shared/src/assets/browserLogos' | ||
| import BookIcon from '~icons/cy/book_x16' | ||
| import { useStudioStore } from '../store/studio-store' | ||
|
|
||
| gql` | ||
| fragment SpecRunnerHeader on CurrentProject { | ||
|
|
@@ -189,6 +195,8 @@ const specStore = useSpecStore() | |
|
|
||
| const route = useRoute() | ||
|
|
||
| const studioStore = useStudioStore() | ||
|
|
||
| const props = defineProps<{ | ||
| gql: SpecRunnerHeaderFragment | ||
| eventManager: EventManager | ||
|
|
@@ -209,6 +217,14 @@ const displayScale = computed(() => { | |
| return autStore.scale < 1 ? `${Math.round(autStore.scale * 100) }%` : 0 | ||
| }) | ||
|
|
||
| const autUrl = computed(() => { | ||
| if (studioStore.isActive && studioStore.url) { | ||
| return studioStore.url | ||
| } | ||
|
|
||
| return autStore.url | ||
| }) | ||
|
|
||
| const selectorPlaygroundStore = useSelectorPlaygroundStore() | ||
|
|
||
| const togglePlayground = () => _togglePlayground(autIframe) | ||
|
|
@@ -220,4 +236,17 @@ const activeSpecPath = specStore.activeSpec?.absolute | |
|
|
||
| const isDisabled = computed(() => autStore.isRunning || autStore.isLoading) | ||
|
|
||
| function setStudioUrl (event: Event) { | ||
| const url = (event.currentTarget as HTMLInputElement).value | ||
|
|
||
| studioStore.setUrl(url) | ||
| } | ||
|
|
||
| function openInNewTab () { | ||
| if (!autStore.url || studioStore.isActive) { | ||
| return | ||
| } | ||
|
|
||
| window.open(autStore.url, '_blank')?.focus() | ||
| } | ||
| </script> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <template> | ||
|
There was a problem hiding this comment. This is not final, just some placeholder until #23337 lands |
||
| <div v-if="!studioStore.url && studioStore.isActive"> | ||
|
There was a problem hiding this comment. We are missing tests for this component. There was a problem hiding this comment. Yep, thanks for calling this out -- DM'd you, gonna merge this to the feature branch and add a bunch of tests here: #23461 |
||
| <b>Please enter a valid URL to visit.</b> | ||
| </div> | ||
|
|
||
| <button | ||
| v-if="studioStore.url && studioStore.isActive" | ||
| @click="visitUrl" | ||
| > | ||
| Go ➜ | ||
| </button> | ||
|
|
||
| <div> | ||
| <b>Studio Beta</b> | ||
| </div> | ||
|
|
||
| <button | ||
| :disabled="studioStore.isLoading" | ||
| @click="handleShowCommands" | ||
| > | ||
| Available Commands | ||
| </button> | ||
|
|
||
| <a | ||
| href="https://on.cypress.io/studio-beta" | ||
| target="_blank" | ||
| >Give feedback</a> | ||
|
|
||
| <div> | ||
| <!-- these are the buttons that do the things --> | ||
| <button | ||
| :disabled="studioStore.isLoading" | ||
| @click="handleClose" | ||
| > | ||
| Close Studio | ||
| </button> | ||
|
|
||
| <button | ||
| :disabled="studioStore.isLoading" | ||
| @click="handleRestart" | ||
| > | ||
| Restart | ||
| </button> | ||
|
|
||
| <button | ||
| :disabled="studioStore.isLoading || studioStore.isEmpty" | ||
| @click="handleCopyCommands" | ||
| > | ||
| Copy Commands | ||
| </button> | ||
|
|
||
| <button | ||
| :disabled="studioStore.isLoading || studioStore.isEmpty" | ||
| @click="handleSaveCommands" | ||
| > | ||
| Save Commands | ||
| </button> | ||
|
|
||
| <input | ||
| v-if="studioStore.saveModalIsOpen" | ||
| v-model="testName" | ||
| style="border: 1px solid black" | ||
| > | ||
| <button | ||
| :disabled="!testName" | ||
| @click="handleSave" | ||
| > | ||
| Save Test | ||
| </button> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { ref } from 'vue' | ||
| import { getEventManager } from '.' | ||
| import { useStudioStore } from '../store/studio-store' | ||
|
|
||
| const studioStore = useStudioStore() | ||
|
|
||
| function handleShowCommands () { | ||
| // TODO: Show modal with available commands' | ||
| } | ||
|
|
||
| function handleSave () { | ||
| studioStore.save(testName.value) | ||
| } | ||
|
|
||
| const eventManager = getEventManager() | ||
|
|
||
| const testName = ref('') | ||
|
|
||
| function handleClose () { | ||
| eventManager.emit('studio:cancel', undefined) | ||
| } | ||
|
|
||
| function handleRestart () { | ||
| studioStore.reset() | ||
| eventManager.emit('restart', undefined) | ||
| } | ||
|
|
||
| function handleCopyCommands () { | ||
| eventManager.emit('studio:copy:to:clipboard', () => { | ||
| // optional callback - do we need this? | ||
| }) | ||
| } | ||
|
|
||
| function handleSaveCommands () { | ||
| studioStore.startSave() | ||
| } | ||
|
|
||
| function visitUrl () { | ||
| if (!studioStore.url) { | ||
| throw Error('Cannot visit blank url') | ||
| } | ||
|
|
||
| studioStore.visitUrl(studioStore.url) | ||
| } | ||
| </script> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed the
<a>for the AUT URL to be an<input> so we can type into it to navigate to a URL for Cypress Studio, and for some reason the wrapping break points forflex-wrapis slightly different. I have no idea why and was quite stuck on this, but for all intensive purposes the UI is the same, except things wrap in the AUT header slightly earlier if you have your Cypress window really small.We can probably revisit this in the final pass if needed, but I don't think it makes any difference.