From 2ac367db8cb4012203f5e5bb4678365382302e68 Mon Sep 17 00:00:00 2001 From: Henri Courdent <122811744+hcourdent@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:57:47 +0100 Subject: [PATCH] Git sync frontend improvements & tooltip (#2816) --- frontend/src/lib/components/AppConnect.svelte | 5 +++++ .../(root)/(logged)/workspace_settings/+page.svelte | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/AppConnect.svelte b/frontend/src/lib/components/AppConnect.svelte index b63deba996..69ecbfe2ab 100644 --- a/frontend/src/lib/components/AppConnect.svelte +++ b/frontend/src/lib/components/AppConnect.svelte @@ -24,6 +24,11 @@ 'Find "API Token"' ] }, + git_repository: { + instructions: [ + 'Only token-based authentication it supported for this resource type right now. When authentication is needed, the username and token can be included directly in the URL (i.e. https://[USERNAME]:[TOKEN]@github.com/[ORG|USER]/[REPO_NAME].git).' + ] + }, mailchimp: { img: '/mailchimp_connect.png', instructions: [ diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte index c6e584216f..f02e3e975a 100644 --- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte @@ -369,7 +369,7 @@
Connect workspace to Slack
- Connect your windmill workspace to your slack workspace to trigger a script or a flow + Connect your Windmill workspace to your Slack workspace to trigger a script or a flow with a '/windmill' command or to configure Slack error handlers.
@@ -660,7 +660,14 @@ title="Git sync" primary={false} tooltip="Connect the Windmill workspace to a Git repository to automatically commit and push scripts, flows and apps to the repository on each deploy." + documentationLink="https://www.windmill.dev/docs/advanced/git_sync" /> +
+
+ Connect the Windmill workspace to a Git repository to automatically commit and push scripts, flows and apps to the repository on each deploy. +
+
+
{#if !$enterpriseLicense} Automatically saving scripts to a Git repository on each deploy is a Windmill EE feature. @@ -669,7 +676,7 @@ All scripts, flows and apps located in the workspace will be pushed to the Git repository, except the ones that are saved in private user folders (i.e. where the path starts with - `u/`). + `u/`, use those with `f/` instead).
{#key s3ResourceInitialPath}