Skip to content

feat: improve mobile connection setup #1729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibuler merged 1 commit into from
Sep 22, 2026
Merged

feat: improve mobile connection setup #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 81 additions & 36 deletions ui/components/ConnectForm/connectForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ watch(
</script>

<template>
<div class="flex flex-col gap-4" :class="{ 'connect-form--island': modernIsland }">
<div class="connect-form flex min-h-0 flex-col gap-4" :class="{ 'connect-form--island': modernIsland }">
<div class="protocol-tabs-track">
<div class="protocol-tabs">
<button
Expand All @@ -197,53 +197,62 @@ watch(
</div>
</div>

<div class="flex flex-col gap-4">
<ConnectAccountFields
v-model:account="selectedAccount"
v-model:manual-username="localManualUsername"
v-model:manual-password="localManualPassword"
v-model:personal-credential-id="localPersonalCredentialId"
v-model:personal-credential-version="localPersonalCredentialVersion"
v-model:personal-credential-secret-type="localPersonalCredentialSecretType"
v-model:save-personal-credential="localSavePersonalCredential"
v-model:dynamic-password="localDynamicPassword"
v-model:remember-secret="localRememberSecret"
:accounts="accounts"
:asset-type="assetType"
:personal-credentials="personalCredentials || []"
:personal-credentials-loading="personalCredentialsLoading"
:personal-credentials-loaded="personalCredentialsLoaded"
:personal-credentials-load-failed="personalCredentialsLoadFailed"
/>
<ConnectMethodPicker
v-model:connect-method="localConnectMethod"
:protocol="selectedProtocol"
:methods="availableConnectMethods"
/>
<ConnectAdvancedOptions
v-model:connect-options="localConnectOptions"
:protocol="selectedProtocol"
:component="selectedConnectMethodComponent"
:connect-method="selectedConnectMethodValue"
:has-x-pack="props.hasXPack"
:applet-client-enabled="props.appletClientEnabled"
:connection-token-reusable="props.connectionTokenReusable"
/>
<div class="connect-form-body">
<div class="connect-form-controls flex flex-col gap-4">
<ConnectAccountFields
v-model:account="selectedAccount"
v-model:manual-username="localManualUsername"
v-model:manual-password="localManualPassword"
v-model:personal-credential-id="localPersonalCredentialId"
v-model:personal-credential-version="localPersonalCredentialVersion"
v-model:personal-credential-secret-type="localPersonalCredentialSecretType"
v-model:save-personal-credential="localSavePersonalCredential"
v-model:dynamic-password="localDynamicPassword"
v-model:remember-secret="localRememberSecret"
:accounts="accounts"
:asset-type="assetType"
:personal-credentials="personalCredentials || []"
:personal-credentials-loading="personalCredentialsLoading"
:personal-credentials-loaded="personalCredentialsLoaded"
:personal-credentials-load-failed="personalCredentialsLoadFailed"
/>
<ConnectMethodPicker
v-model:connect-method="localConnectMethod"
:protocol="selectedProtocol"
:methods="availableConnectMethods"
/>
<ConnectAdvancedOptions
v-model:connect-options="localConnectOptions"
:protocol="selectedProtocol"
:component="selectedConnectMethodComponent"
:connect-method="selectedConnectMethodValue"
:has-x-pack="props.hasXPack"
:applet-client-enabled="props.appletClientEnabled"
:connection-token-reusable="props.connectionTokenReusable"
/>
</div>
<slot />
</div>
</div>
</template>

<style scoped>
.protocol-tabs-track {
display: flex;
justify-content: flex-start;
align-items: center;
flex-shrink: 0;
gap: 0.75rem;
border-bottom: 1px solid var(--app-border);
}

.protocol-tabs {
display: inline-flex;
width: fit-content;
min-width: 0;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden;
align-self: stretch;
align-items: flex-end;
justify-content: flex-start;
gap: 0.25rem;
Expand All @@ -253,7 +262,7 @@ watch(
position: relative;
flex: 0 0 auto;
cursor: pointer;
margin-bottom: -1px;
margin-bottom: 0;
border: 0;
background: transparent;
padding: 0.25rem 1.25rem 0.375rem;
Expand All @@ -272,7 +281,7 @@ watch(
content: "";
position: absolute;
right: 0;
bottom: -1px;
bottom: 0;
left: 0;
height: 2px;
background: var(--ui-primary);
Expand All @@ -299,4 +308,40 @@ watch(
border-radius: var(--workspace-island-radius) var(--workspace-island-radius) 0 0;
background: var(--theme-accent);
}

@media (max-width: 767px), (max-height: 600px) {
.connect-form {
flex: 1;
gap: 0.5rem;
overflow: hidden;
}

.protocol-tabs {
flex: 1;
overscroll-behavior-x: contain;
}

.protocol-tab-button,
.connect-form--island .protocol-tab-button {
min-height: 44px;
padding-inline: 12px;
}

.connect-form-body {
min-height: 0;
overflow-y: auto;
overscroll-behavior-y: contain;
padding: 2px 2px 8px;
scroll-padding-block: 8px;
}

.connect-form-controls {
gap: 0.75rem;
}

.connect-form-controls :deep(input:not([type="checkbox"]):not([type="radio"])),
.connect-form-controls :deep(button[role="combobox"]) {
min-height: 44px;
}
}
</style>
2 changes: 1 addition & 1 deletion ui/components/ConnectForm/connectMethodPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ async function openProtocolApplicationSettings() {
orientation="horizontal"
:ui="{
fieldset: 'flex flex-wrap gap-2',
item: 'rounded-[length:var(--app-radius)] px-2 py-1.5 hover:bg-[var(--app-hover-soft)]'
item: 'items-center rounded-[length:var(--app-radius)] px-2 py-1.5 hover:bg-[var(--app-hover-soft)]'
}"
/>
<div
Expand Down
117 changes: 78 additions & 39 deletions ui/components/ConnectForm/fields.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const props = withDefaults(
submitLabel: string;
submitting?: boolean;
downloadingRdp?: boolean;
headerActionTarget?: HTMLElement | null;
}>(),
{
assetType: "assets",
Expand Down Expand Up @@ -246,7 +247,19 @@ watchDebounced(
</script>

<template>
<div @keydown.enter.prevent="submit">
<div class="connection-form-fields" @keydown.enter.prevent="submit">
<Teleport v-if="headerActionTarget" :to="headerActionTarget">
<UButton
:label="props.submitLabel"
:loading="props.submitting && !props.downloadingRdp"
:disabled="submitDisabled"
color="primary"
variant="outline"
size="xs"
class="connection-form-mobile-submit h-7 shrink-0 justify-center px-2.5"
@click="submit"
/>
</Teleport>
<ConnectForm
v-model:protocol="draft.protocol"
v-model:account="draft.account"
Expand All @@ -271,43 +284,69 @@ watchDebounced(
:has-x-pack="hasXPack"
:applet-client-enabled="appletClientEnabled === true"
:connection-token-reusable="connectionTokenReusable"
/>
<div class="mt-4">
<UCheckbox
v-model="draft.rememberSelection"
icon="i-lucide-check"
:label="t('EditModal.RememberSelection')"
:description="t('EditModal.RememberSelectionDescription')"
:ui="{ description: 'text-xs leading-5' }"
/>
</div>
<p v-if="methodDisabled" class="mt-4 text-xs text-[var(--app-muted)]">
{{ t("ConnectError.MethodDisabled") }}
</p>
<div class="mt-6 mb-2 flex flex-wrap gap-2">
<UButton
:label="submitLabel"
:loading="props.submitting && !props.downloadingRdp"
:disabled="submitDisabled"
:size="modernIsland ? 'md' : 'lg'"
class="flex-1 justify-center"
:class="modernIsland ? '' : 'uppercase tracking-[0.08em]'"
@click="submit"
/>
<UButton
v-if="rdpDownloadMethod"
type="button"
icon="i-lucide-download"
color="neutral"
variant="outline"
:label="t('EditModal.DownloadRdpFile')"
:loading="props.downloadingRdp"
:disabled="downloadDisabled"
:size="modernIsland ? 'md' : 'lg'"
class="flex-1 justify-center"
@keydown.enter.stop
@click="downloadRdp"
/>
</div>
>
<div class="connection-form-remember mt-4">
<UCheckbox
v-model="draft.rememberSelection"
icon="i-lucide-check"
:label="t('EditModal.RememberSelection')"
:description="t('EditModal.RememberSelectionDescription')"
:ui="{ description: 'text-xs leading-5' }"
/>
</div>
<p v-if="methodDisabled" class="mt-4 text-xs text-[var(--app-muted)]">
{{ t("ConnectError.MethodDisabled") }}
</p>
<div class="connection-form-actions mt-6 mb-2 flex flex-wrap gap-2">
<UButton
:label="submitLabel"
:loading="props.submitting && !props.downloadingRdp"
:disabled="submitDisabled"
:size="modernIsland ? 'md' : 'lg'"
class="connection-form-submit flex-1 justify-center"
:class="modernIsland ? '' : 'uppercase tracking-[0.08em]'"
@click="submit"
/>
<UButton
v-if="rdpDownloadMethod"
type="button"
icon="i-lucide-download"
color="neutral"
variant="outline"
:label="t('EditModal.DownloadRdpFile')"
:loading="props.downloadingRdp"
:disabled="downloadDisabled"
:size="modernIsland ? 'md' : 'lg'"
class="flex-1 justify-center"
@keydown.enter.stop
@click="downloadRdp"
/>
</div>
</ConnectForm>
</div>
</template>

<style scoped>
.connection-form-mobile-submit {
display: none;
}

@media (max-width: 767px), (max-height: 600px) {
.connection-form-fields {
display: flex;
flex: 1;
min-height: 0;
flex-direction: column;
overflow: hidden;
}

.connection-form-mobile-submit {
display: inline-flex;
}

.connection-form-remember,
.connection-form-actions {
margin-top: 0.75rem;
}
}
</style>
Loading
Loading