solve merge conflicts

This commit is contained in:
x
2025-04-25 19:11:00 -04:00
184 changed files with 3938 additions and 489 deletions
+4 -1
View File
@@ -16,6 +16,7 @@ import {
MsSqlConnectionMethod,
PostgresConnectionMethod,
TAppConnection,
TeamCityConnectionMethod,
TerraformCloudConnectionMethod,
VercelConnectionMethod,
WindmillConnectionMethod
@@ -45,7 +46,8 @@ export const APP_CONNECTION_MAP: Record<
[AppConnection.Camunda]: { name: "Camunda", image: "Camunda.png" },
[AppConnection.Windmill]: { name: "Windmill", image: "Windmill.png" },
[AppConnection.Auth0]: { name: "Auth0", image: "Auth0.png", size: 40 },
[AppConnection.HCVault]: { name: "Hashicorp Vault", image: "Vault.png" }
[AppConnection.HCVault]: { name: "Hashicorp Vault", image: "Vault.png" },
[AppConnection.TeamCity]: { name: "TeamCity", image: "TeamCity.png" }
};
export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => {
@@ -74,6 +76,7 @@ export const getAppConnectionMethodDetails = (method: TAppConnection["method"])
case MsSqlConnectionMethod.UsernameAndPassword:
return { name: "Username & Password", icon: faLock };
case HCVaultConnectionMethod.AccessToken:
case TeamCityConnectionMethod.AccessToken:
case WindmillConnectionMethod.AccessToken:
return { name: "Access Token", icon: faKey };
case Auth0ConnectionMethod.ClientCredentials: