From e1eccc2d9331ba4e33019a6109bc0368d718397c Mon Sep 17 00:00:00 2001 From: Henri Courdent <122811744+hcourdent@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:05:18 +0200 Subject: [PATCH] fix: Small fixes UI & Slack OAuth tuto (#2398) * Small fixes frontend * Fixes after Ruben's comments * Small fixes UI and Slack OAuth tuto * Fix okta logo --- frontend/src/lib/components/OAuthSetting.svelte | 17 ++++++++++++----- .../flows/content/FlowSettings.svelte | 2 +- .../lib/components/icons/MicrosoftIcon.svelte | 15 +++++++++++++++ .../src/lib/components/icons/OktaIcon.svelte | 7 +++++++ frontend/src/lib/components/icons/index.ts | 10 ++++++++-- .../src/lib/init_scripts/python_init_code.ts | 2 +- 6 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 frontend/src/lib/components/icons/MicrosoftIcon.svelte create mode 100644 frontend/src/lib/components/icons/OktaIcon.svelte diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte index 59e9367e47..d32ff638fc 100644 --- a/frontend/src/lib/components/OAuthSetting.svelte +++ b/frontend/src/lib/components/OAuthSetting.svelte @@ -85,22 +85,29 @@
Create a new OAuth 2.0 Client in google consolein Google console and set the redirect URI to BASE_URL/user/login_callback/google where BASE_URL is what you configured as core BASE_URL
{:else if name == 'slack'} - Read more about Slack OAuth on the docs + +
+ Create a new App in Slack API Console. + Pick "From an app manifest", then YAML and paste manifest template found on Windmill Docs and then paste Client ID and Client Secret here. +
+ {:else if name == 'microsoft'}
Create a new OAuth 2.0 Client in microsoft portalin Microsoft portal "Add" {'->'} "App Registration" -> "Accounts in this organizational directory only (Default Directory only - Single tenant)", and in the "Authentication" tab, set the redirect URI to diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte index d2633c1be2..4224f4aa68 100644 --- a/frontend/src/lib/components/flows/content/FlowSettings.svelte +++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte @@ -210,7 +210,7 @@ documentationLink="https://www.windmill.dev/docs/core_concepts/scheduling" > Flows can be triggered by any schedules, their webhooks or their UI but they have only - one primary schedulfs with which they share the same path. The primary schedule can be + one primary schedule with which they share the same path. The primary schedule can be set here.
diff --git a/frontend/src/lib/components/icons/MicrosoftIcon.svelte b/frontend/src/lib/components/icons/MicrosoftIcon.svelte new file mode 100644 index 0000000000..d62b0ae3d9 --- /dev/null +++ b/frontend/src/lib/components/icons/MicrosoftIcon.svelte @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/frontend/src/lib/components/icons/OktaIcon.svelte b/frontend/src/lib/components/icons/OktaIcon.svelte new file mode 100644 index 0000000000..c001e63f20 --- /dev/null +++ b/frontend/src/lib/components/icons/OktaIcon.svelte @@ -0,0 +1,7 @@ + + oktaddd-svg + + + \ No newline at end of file diff --git a/frontend/src/lib/components/icons/index.ts b/frontend/src/lib/components/icons/index.ts index d0538b84fb..58b5e3029b 100644 --- a/frontend/src/lib/components/icons/index.ts +++ b/frontend/src/lib/components/icons/index.ts @@ -38,6 +38,7 @@ import LinkdingIconSvelte from './LinkdingIcon.svelte' import AwsIcon from './AwsIcon.svelte' import BcryptIcon from './BcryptIcon.svelte' import GoogleIcon from './GoogleIcon.svelte' +import MicrosoftIcon from './MicrosoftIcon.svelte' import HackernewsIcon from './HackernewsIcon.svelte' import MongodbIcon from './MongodbIcon.svelte' import RedditIcon from './RedditIcon.svelte' @@ -63,6 +64,7 @@ import BigQueryIcon from './BigQueryIcon.svelte' import GraphqlIcon from './GraphqlIcon.svelte' import NocoDbIcon from './NocoDbIcon.svelte' import AzureIcon from './AzureIcon.svelte' +import OktaIcon from './OktaIcon.svelte' export const APP_TO_ICON_COMPONENT = { postgresql: PostgresIcon, @@ -105,6 +107,7 @@ export const APP_TO_ICON_COMPONENT = { appwrite: AppwriteIcon, linkding: LinkdingIconSvelte, aws: AwsIcon, + microsoft: MicrosoftIcon, bcrypt: BcryptIcon, google: GoogleIcon, hackernews: HackernewsIcon, @@ -132,7 +135,8 @@ export const APP_TO_ICON_COMPONENT = { bigquery: BigQueryIcon, graphql: GraphqlIcon, nocodb: NocoDbIcon, - azure: AzureIcon + azure: AzureIcon, + okta: OktaIcon } as const export { @@ -196,5 +200,7 @@ export { BigQueryIcon, GraphqlIcon, NocoDbIcon, - AzureIcon + AzureIcon, + MicrosoftIcon, + OktaIcon } diff --git a/frontend/src/lib/init_scripts/python_init_code.ts b/frontend/src/lib/init_scripts/python_init_code.ts index 246d80ba25..2179323f02 100644 --- a/frontend/src/lib/init_scripts/python_init_code.ts +++ b/frontend/src/lib/init_scripts/python_init_code.ts @@ -2,7 +2,7 @@ export default `import os import wmill # You can import any PyPi package. -# See here for more info: https://www.windmill.dev/docs/advanced/imports#python +# See here for more info: https://www.windmill.dev/docs/advanced/imports#imports-in-python # you can use typed resources by doing a type alias to dict #postgresql = dict