Add github repo info to project tile

czezi · czezi · commit 0c88ada16d21 · 2024-07-23T12:23:54.000+05:30
diff --git a/app/db/migrations/20240718105113_create_integrations_table.down.sql b/app/db/migrations/20240718105113_create_integrations_table.down.sql
@@ -1 +1 @@
-DROP TABLE IF EXISTS integrations;
+DROP TABLE integrations;
diff --git a/app/db/migrations/20240718105113_create_integrations_table.up.sql b/app/db/migrations/20240718105113_create_integrations_table.up.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS integrations
+CREATE TABLE integrations
 (
     id               SERIAL PRIMARY KEY,
     created_at       TIMESTAMP    NOT NULL,
diff --git a/app/db/migrations/20240723060635_add_repository_column_to_projects.down.sql b/app/db/migrations/20240723060635_add_repository_column_to_projects.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE projects DROP repository;
+ALTER TABLE projects DROP repository_url;
diff --git a/app/db/migrations/20240723060635_add_repository_column_to_projects.up.sql b/app/db/migrations/20240723060635_add_repository_column_to_projects.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE projects ADD repository VARCHAR(1024);
+ALTER TABLE projects ADD repository_url VARCHAR(1024);
diff --git a/app/models/project.go b/app/models/project.go
@@ -13,6 +13,8 @@ type Project struct {
 	Name              string    `gorm:"type:varchar(100);"`
 	BackendFramework  string    `gorm:"type:varchar(100);not null"`
 	FrontendFramework string    `gorm:"type:varchar(100);not null"`
+	Repository        *string   `gorm:"type:varchar(1024);"`
+	RepositoryUrl     *string   `gorm:"type:varchar(1024);"`
 	Description       string    `gorm:"type:text"`
 	OrganisationID    uint      `gorm:"not null"`
 	CreatedAt         time.Time `gorm:"autoCreateTime"`
diff --git a/app/services/project_service.go b/app/services/project_service.go
@@ -66,6 +66,7 @@ func (s *ProjectService) GetAllProjectsOfOrganisation(organisationId int) ([]res
 			ProjectBackendURL:        project.BackendURL,
 			ProjectFrontendURL:       project.FrontendURL,
 			PullRequestCount:         len(projectPullRequestMap[int(project.ID)]),
+			ProjectRepository:        project.Repository,
 		})
 	}
 
@@ -112,6 +113,8 @@ func (s *ProjectService) CreateProjectFromGit(userId uint, orgId uint, requestDa
 		Url:               url,
 		BackendURL:        backend_url,
 		FrontendURL:       frontend_url,
+		Repository:        requestData.Repository,
+		RepositoryUrl:     requestData.RepositoryUrl,
 	}
 
 	organisation, err := s.organisationRepository.GetOrganisationByID(uint(int(project.OrganisationID)))
@@ -132,7 +135,7 @@ func (s *ProjectService) CreateProjectFromGit(userId uint, orgId uint, requestDa
 	_, err = s.workspaceServiceClient.ImportGitRepository(
 		&request.ImportGitRepository{
 			WorkspaceId:  hashID,
-			Repository:   *requestData.Repository,
+			Repository:   *requestData.RepositoryUrl,
 			Username:     integrationDetails.GithubUserId,
 			Password:     integrationDetails.AccessToken,
 			RemoteURL:    remoteGitURL,
diff --git a/app/types/request/create_project_request.go b/app/types/request/create_project_request.go
@@ -6,4 +6,5 @@ type CreateProjectRequest struct {
 	FrontendFramework string  `json:"frontend_framework"`
 	Description       string  `json:"description"`
 	Repository        *string `json:"repository"`
+	RepositoryUrl     *string `json:"repository_url"`
 }
diff --git a/app/types/response/get_all_projects_response.go b/app/types/response/get_all_projects_response.go
@@ -1,14 +1,15 @@
 package response
 
 type GetAllProjectsResponse struct {
-	ProjectId          		 uint   `json:"project_id"`
-	ProjectName        		 string `json:"project_name"`
-	ProjectDescription 		 string `json:"project_description"`
-	ProjectFramework   		 string `json:"project_framework"`
-	ProjectFrontendFramework 	 string `json:"project_frontend_framework"`
-	ProjectHashID      		 string `json:"project_hash_id"`
-	ProjectUrl         	 	 string `json:"project_url"`
-	ProjectBackendURL  		 string `json:"project_backend_url"`
-	ProjectFrontendURL 		 string `json:"project_frontend_url"`
-	PullRequestCount   		 int    `json:"pull_request_count"`
+	ProjectId                uint    `json:"project_id"`
+	ProjectName              string  `json:"project_name"`
+	ProjectDescription       string  `json:"project_description"`
+	ProjectFramework         string  `json:"project_framework"`
+	ProjectFrontendFramework string  `json:"project_frontend_framework"`
+	ProjectHashID            string  `json:"project_hash_id"`
+	ProjectUrl               string  `json:"project_url"`
+	ProjectBackendURL        string  `json:"project_backend_url"`
+	ProjectFrontendURL       string  `json:"project_frontend_url"`
+	PullRequestCount         int     `json:"pull_request_count"`
+	ProjectRepository        *string `json:"project_repository"`
 }
diff --git a/gui/src/app/projects/page.tsx b/gui/src/app/projects/page.tsx
@@ -78,7 +78,19 @@ export default function Projects() {
                       </span>
                     </div>
 
+
                     <div className={'flex flex-row items-center gap-3'}>
+                      {project.project_repository && (
+                        <div className="flex items-center">
+                          <div className="w-3.5 h-3.5 -mt-1 mr-2">
+                            <svg viewBox="0 0 24 24" className="fill-current">
+                              <path
+                                d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
+                            </svg>
+                          </div>
+                          <span className="text-[11px] secondary_color font-normal">{project.project_repository.split("/").join(" / ")}</span>
+                        </div>
+                      )}
                       <CustomTextImage
                         gap={'gap-1'}
                         textCSS={'text-[11px] secondary_color font-normal'}
diff --git a/gui/src/components/HomeComponents/CreateOrEditProjectBody.tsx b/gui/src/components/HomeComponents/CreateOrEditProjectBody.tsx
@@ -76,7 +76,7 @@ export default function CreateOrEditProjectBody({
   const [isExternalGitIntegration, setIsExternalGitIntegration] = useState<boolean>(false);
   const [useExternalGit, setUseExternalGit] = useState<boolean>(false);
   const [repositories, setRepositories] = useState<any[]>([]);
-  const [selectedRepository, setSelectedRepository] = useState<string | null>(null);
+  const [selectedRepository, setSelectedRepository] = useState<{ label: string, value: string } | null>(null);
 
   async function redirectToGithubIntegration() {
     setIntegrationLoading(true);
@@ -113,6 +113,10 @@ export default function CreateOrEditProjectBody({
   const handleCreateNewProject = async () => {
     setIsLoading(true);
     const projectErrors = [
+      {
+        validation: selectedRepository === null && useExternalGit,
+        message: 'Please select a github repository to import.',
+      },
       {
         validation: handleProjectDuplicationCheck(),
         message: 'A project with the name entered already exists.',
@@ -148,7 +152,8 @@ export default function CreateOrEditProjectBody({
         framework: selectedBackendFramework,
         frontend_framework: selectedFrontendFramework,
         description: projectDescription,
-        repository: useExternalGit ? selectedRepository : undefined,
+        repository: useExternalGit ? selectedRepository.label : undefined,
+        repository_url: useExternalGit ? selectedRepository.value : undefined,
       };
       await toCreateNewProject(newProjectPayload);
     }
@@ -351,7 +356,7 @@ export default function CreateOrEditProjectBody({
           {(useExternalGit && isExternalGitIntegration) && (
             <>
               <Select
-                onChange={(e) => setSelectedRepository(e.value)}
+                onChange={(e) => setSelectedRepository(e)}
                 className="text-white" styles={customStyles}
                 options={repositories}
               />
diff --git a/gui/types/projectsTypes.ts b/gui/types/projectsTypes.ts
@@ -18,6 +18,7 @@ export interface ProjectTypes {
   project_description: string;
   project_hash_id: string;
   project_url: string;
+  project_repository: string | undefined;
   project_backend_url: string;
   project_frontend_url: string;
   pull_request_count: number;
diff --git a/server.go b/server.go
@@ -545,9 +545,8 @@ func main() {
 		authentication.POST("/sign_in", auth.SignIn)
 		authentication.POST("/sign_up", auth.SignUp)
 
-		integrations := api.Group("/integrations", middleware.AuthenticateJWT())
-
-		githubIntegration := integrations.Group("/github")
+		integrationsGroup := api.Group("/integrations", middleware.AuthenticateJWT())
+		githubIntegration := integrationsGroup.Group("/github")
 
 		githubIntegration.GET("", githubIntegrationController.CheckIfIntegrationExists)
 		githubIntegration.DELETE("", githubIntegrationController.DeleteIntegration)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-DROP TABLE IF EXISTS integrations;`
	`1`	`+DROP TABLE integrations;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE TABLE IF NOT EXISTS integrations`
	`1`	`+CREATE TABLE integrations`
`2`	`2`	`(`
`3`	`3`	`id SERIAL PRIMARY KEY,`
`4`	`4`	`created_at TIMESTAMP NOT NULL,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTER TABLE projects DROP repository;`
	`2`	`+ALTER TABLE projects DROP repository_url;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTER TABLE projects ADD repository VARCHAR(1024);`
	`2`	`+ALTER TABLE projects ADD repository_url VARCHAR(1024);`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@ type CreateProjectRequest struct {`
`6`	`6`	FrontendFramework string `json:"frontend_framework"`
`7`	`7`	Description string `json:"description"`
`8`	`8`	Repository *string `json:"repository"`
	`9`	+ RepositoryUrl *string `json:"repository_url"`
`9`	`10`	`}`