feat(core,frontend): add alias logic

clidey · Jan 28, 2025 · f67f843 · f67f843
1 parent 3f6fcab
commit f67f843
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 19 deletions.
diff --git a/core/graph/generated.go b/core/graph/generated.go
diff --git a/core/graph/model/models_gen.go b/core/graph/model/models_gen.go
diff --git a/core/graph/schema.graphqls b/core/graph/schema.graphqls
@@ -6,6 +6,7 @@ enum DatabaseType {
   Redis,
   ElasticSearch,
   MariaDB,
+  ClickHouse,
 }
 
 type Column {
@@ -78,6 +79,7 @@ input LoginProfileInput {
 }
 
 type LoginProfile {
+  Alias: String
   Id: String!
   Type: DatabaseType!
   Database: String

diff --git a/core/graph/schema.resolvers.go b/core/graph/schema.resolvers.go
diff --git a/core/src/env/env.go b/core/src/env/env.go
@@ -34,6 +34,7 @@ func GetClideyQuickContainerImage() string {
 }
 
 type DatabaseCredentials struct {
+	Alias    string            `json:"alias"`
 	Hostname string            `json:"host"`
 	Username string            `json:"user"`
 	Password string            `json:"password"`

diff --git a/core/src/src.go b/core/src/src.go
@@ -29,24 +29,22 @@ func InitializeEngine() *engine.Engine {
 	return MainEngine
 }
 
-var profiles []env.DatabaseCredentials
-
 func GetLoginProfiles() []env.DatabaseCredentials {
-	if profiles != nil {
-		return profiles
-	}
+	profiles := []env.DatabaseCredentials{}
 	for _, plugin := range MainEngine.Plugins {
 		databaseProfiles := env.GetDefaultDatabaseCredentials(string(plugin.Type))
 		for _, databaseProfile := range databaseProfiles {
 			databaseProfile.Type = string(plugin.Type)
 			profiles = append(profiles, databaseProfile)
 		}
 	}
-
 	return profiles
 }
 
 func GetLoginProfileId(index int, profile env.DatabaseCredentials) string {
+	if len(profile.Alias) > 0 {
+		return profile.Alias
+	}
 	return fmt.Sprintf("#%v - %v@%v [%v]", index+1, profile.Username, profile.Hostname, profile.Database)
 }
 

diff --git a/frontend/src/components/sidebar/get-login-profiles.graphql b/frontend/src/components/sidebar/get-login-profiles.graphql
@@ -1,5 +1,6 @@
 query GetProfiles {
   Profiles {
+    Alias
     Id
     Type
     Database

diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
@@ -38,14 +38,14 @@ export type Column = {
 };
 
 export enum DatabaseType {
+  ClickHouse = 'ClickHouse',
   ElasticSearch = 'ElasticSearch',
   MariaDb = 'MariaDB',
   MongoDb = 'MongoDB',
   MySql = 'MySQL',
   Postgres = 'Postgres',
   Redis = 'Redis',
-  Sqlite3 = 'Sqlite3',
-  ClickHouse = 'ClickHouse'
+  Sqlite3 = 'Sqlite3'
 }
 
 export type GraphUnit = {
@@ -80,6 +80,7 @@ export type LoginCredentials = {
 
 export type LoginProfile = {
   __typename?: 'LoginProfile';
+  Alias?: Maybe<Scalars['String']['output']>;
   Database?: Maybe<Scalars['String']['output']>;
   Id: Scalars['String']['output'];
   Type: DatabaseType;
@@ -246,7 +247,7 @@ export type StorageUnit = {
 export type GetProfilesQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetProfilesQuery = { __typename?: 'Query', Profiles: Array<{ __typename?: 'LoginProfile', Id: string, Type: DatabaseType, Database?: string | null }> };
+export type GetProfilesQuery = { __typename?: 'Query', Profiles: Array<{ __typename?: 'LoginProfile', Alias?: string | null, Id: string, Type: DatabaseType, Database?: string | null }> };
 
 export type GetSchemaQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -388,6 +389,7 @@ export type UpdateStorageUnitMutation = { __typename?: 'Mutation', UpdateStorage
 export const GetProfilesDocument = gql`
     query GetProfiles {
   Profiles {
+    Alias
     Id
     Type
     Database

diff --git a/frontend/src/pages/auth/login.tsx b/frontend/src/pages/auth/login.tsx
@@ -295,7 +295,7 @@ export const LoginPage: FC = () => {
     }, [database, databaseType.id, databasesLoading, foundDatabases?.Database, handleHostNameChange, hostName, password, username]);
 
     const availableProfiles = useMemo(() => {
-        return profiles?.Profiles.map(profile => createDropdownItem(profile.Id, (Icons.Logos as Record<string, ReactElement>)[profile.Type])) ?? [];
+        return profiles?.Profiles.map(profile => createDropdownItem(profile.Alias ?? profile.Id, (Icons.Logos as Record<string, ReactElement>)[profile.Type])) ?? [];
     }, [profiles?.Profiles])
 
     if (loading || profilesLoading)  {