update

TabbyML · Apr 26, 2024 · 57b7a03 · 57b7a03
1 parent d9dbf71
commit 57b7a03
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/ee/tabby-webserver/graphql/schema.graphql b/ee/tabby-webserver/graphql/schema.graphql
@@ -1,3 +1,9 @@
+type Repository {
+  id: ID!
+  name: String!
+  kind: RepositoryKind!
+}
+
 input UpdateRepositoryProviderInput {
   id: ID!
   displayName: String!
@@ -283,7 +289,7 @@ type Query {
   networkSetting: NetworkSetting!
   securitySetting: SecuritySetting!
   gitRepositories(after: String, before: String, first: Int, last: Int): RepositoryConnection!
-  repositorySearch(repositoryName: String!, pattern: String!): [FileEntrySearchResult!]!
+  repositorySearch(kind: RepositoryKind!, id: ID!, pattern: String!): [FileEntrySearchResult!]!
   oauthCredential(provider: OAuthProvider!): OAuthCredential
   oauthCallbackUrl(provider: OAuthProvider!): String!
   serverInfo: ServerInfo!
@@ -293,6 +299,7 @@ type Query {
   dailyStats(start: DateTimeUtc!, end: DateTimeUtc!, users: [ID!], languages: [Language!]): [CompletionStats!]!
   userEvents(after: String, before: String, first: Int, last: Int, users: [ID!], start: DateTimeUtc!, end: DateTimeUtc!): UserEventConnection!
   diskUsageStats: DiskUsageStats!
+  repositoryList: [Repository!]!
 }
 
 input NetworkSettingInput {
@@ -336,6 +343,12 @@ type RepositoryConnection {
   pageInfo: PageInfo!
 }
 
+enum RepositoryKind {
+  GIT
+  GITHUB
+  GITLAB
+}
+
 input EmailSettingInput {
   smtpUsername: String!
   fromAddress: String!

diff --git a/ee/tabby-webserver/src/schema/repository.rs b/ee/tabby-webserver/src/schema/repository.rs
@@ -36,8 +36,8 @@ impl From<FileSearch> for FileEntrySearchResult {
 #[serde(rename_all = "lowercase")]
 pub enum RepositoryKind {
     Git,
-    GitHub,
-    GitLab,
+    Github,
+    Gitlab,
 }
 
 #[derive(GraphQLObject)]
@@ -66,7 +66,7 @@ impl From<GithubProvidedRepository> for Repository {
         Self {
             id: value.id,
             name: value.name,
-            kind: RepositoryKind::GitHub,
+            kind: RepositoryKind::Github,
             dir: RepositoryConfig::new(value.git_url).dir(),
         }
     }
@@ -77,7 +77,7 @@ impl From<GitlabProvidedRepository> for Repository {
         Self {
             id: value.id,
             name: value.name,
-            kind: RepositoryKind::GitLab,
+            kind: RepositoryKind::Gitlab,
             dir: RepositoryConfig::new(value.git_url).dir(),
         }
     }

diff --git a/ee/tabby-webserver/src/service/repository.rs b/ee/tabby-webserver/src/service/repository.rs
@@ -90,8 +90,8 @@ impl RepositoryService for RepositoryServiceImpl {
     async fn get(&self, kind: &RepositoryKind, id: &ID) -> Result<Repository> {
         match kind {
             RepositoryKind::Git => self.git().get_repository(id).await,
-            RepositoryKind::GitHub => self.github().get_repository(id).await,
-            RepositoryKind::GitLab => self.gitlab().get_repository(id).await,
+            RepositoryKind::Github => self.github().get_repository(id).await,
+            RepositoryKind::Gitlab => self.gitlab().get_repository(id).await,
         }
     }