Merge pull request #924 from traPtitech/impr/create-app-repo-view

アプリ作成画面で選択可能なリポジトリ一覧を正しく取得

.github/workflows/ci-protoc.yaml

@@ -21,7 +21,7 @@ jobs:
           go-version-file: ./go.mod
       - uses: arduino/setup-protoc@v3
         with:
-          version: "25.3"
+          version: "27.1"
       - name: Install proto tools
         run: make init-protoc-tools
       - name: Generate code

Makefile

@@ -1,4 +1,4 @@
-PROTOC_VERSION := 27.0
+PROTOC_VERSION := 27.1
 TBLS_VERSION := 1.75.0
 
 GO_REPO_ROOT_PACKAGE := "github.com/traPtitech/neoshowcase"

api/proto/neoshowcase/protobuf/gateway.proto

@@ -341,9 +341,10 @@ message CreateRepositoryRequest {
 message GetRepositoriesRequest {
   enum Scope {
     MINE = 0;
-    PUBLIC = 1;
+    CREATABLE = 1;
+    PUBLIC = 2;
     // admin only
-    ALL = 2;
+    ALL = 3;
   }
   Scope scope = 1;
 }

dashboard/src/api/neoshowcase/protobuf/gateway_pb.ts

@@ -2429,22 +2429,28 @@ export enum GetRepositoriesRequest_Scope {
   MINE = 0,
 
   /**
-   * @generated from enum value: PUBLIC = 1;
+   * @generated from enum value: CREATABLE = 1;
    */
-  PUBLIC = 1,
+  CREATABLE = 1,
+
+  /**
+   * @generated from enum value: PUBLIC = 2;
+   */
+  PUBLIC = 2,
 
   /**
    * admin only
    *
-   * @generated from enum value: ALL = 2;
+   * @generated from enum value: ALL = 3;
    */
-  ALL = 2,
+  ALL = 3,
 }
 // Retrieve enum metadata with: proto3.getEnumType(GetRepositoriesRequest_Scope)
 proto3.util.setEnumType(GetRepositoriesRequest_Scope, "neoshowcase.protobuf.GetRepositoriesRequest.Scope", [
   { no: 0, name: "MINE" },
-  { no: 1, name: "PUBLIC" },
-  { no: 2, name: "ALL" },
+  { no: 1, name: "CREATABLE" },
+  { no: 2, name: "PUBLIC" },
+  { no: 3, name: "ALL" },
 ]);
 
 /**

dashboard/src/pages/apps/new.tsx

@@ -190,7 +190,7 @@ const RepositoryStep: Component<{
 }> = (props) => {
   const [repos] = createResource(() =>
     client.getRepositories({
-      scope: GetRepositoriesRequest_Scope.MINE,
+      scope: GetRepositoriesRequest_Scope.CREATABLE,
     }),
   )
   const [apps] = createResource(() => client.getApplications({ scope: GetApplicationsRequest_Scope.ALL }))

pkg/domain/repository.go

@@ -144,10 +144,11 @@ type EnvironmentRepository interface {
 }
 
 type GetRepositoryCondition struct {
-	IDs             optional.Of[[]string]
-	URLs            optional.Of[[]string]
-	PublicOrOwnedBy optional.Of[string]
-	UserID          optional.Of[string]
+	IDs                optional.Of[[]string]
+	URLs               optional.Of[[]string]
+	CreatableOrOwnedBy optional.Of[string]
+	PublicOrOwnedBy    optional.Of[string]
+	UserID             optional.Of[string]
 }
 
 type UpdateRepositoryArgs struct {