Added relevant tags for project

rbaul · Jan 18, 2024 · 36d9ccf · 36d9ccf
1 parent 474beea
commit 36d9ccf
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 8 deletions.
diff --git a/microservice-visualization-webapp/src/app/api/project-api.model.ts b/microservice-visualization-webapp/src/app/api/project-api.model.ts
@@ -19,6 +19,7 @@ export interface ProjectDto {
     applications: ApplicationLiteDto[],
     groups?: ApplicationGroupDto[],
     owners?: OwnerDto[],
+    tags?: string[],
     // connections?: Map<String, String[]>,
     connections?: any,
     dependencies?: any,

diff --git a/microservice-visualization-webapp/src/app/project-view/project-view.component.html b/microservice-visualization-webapp/src/app/project-view/project-view.component.html
@@ -22,11 +22,13 @@
   <ng-template pTemplate="caption">
     <div class="flex">
       <button pButton label="Clear" class="p-button-outlined" icon="pi pi-filter-slash" (click)="clear(dt1)"></button>
-      <span class="p-input-icon-left ml-auto">
+      <span class="p-input-icon-left">
         <i class="pi pi-search"></i>
         <input #filterInput pInputText type="text" (input)="dt1.filterGlobal(filterInput.value, 'contains')"
           placeholder="Search keyword" />
       </span>
+      <p-multiSelect class="to-end" [options]="tagOptions" [(ngModel)]="selectedTags" selectedItemsLabel="{0} columns selected"
+        [style]="{'min-width': '250px'}" placeholder="Choose Columns"></p-multiSelect>
     </div>
 
   </ng-template>
@@ -55,7 +57,7 @@
         Type
         <p-sortIcon field="type"></p-sortIcon>
       </th>
-      @for (tag of tags; track $index) {
+      @for (tag of selectedTags; track $index) {
       <th pSortableColumn="tags.{{tag}}">
         <p-columnFilter type="text" field="tags.{{tag}}" display="menu"></p-columnFilter>
         {{tag}}
@@ -77,7 +79,7 @@
         <p-tag value="{{app.type | lowercase}}" severity="success"></p-tag>
         }
       </td>
-      @for (tag of tags; track $index) {
+      @for (tag of selectedTags; track $index) {
       <td>
         {{app.tags[tag]}}
       </td>
@@ -115,4 +117,4 @@ <h3>Sidebar</h3>
     Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
   </p>
 </p-sidebar>
-<!-- </div> -->
+<!-- </div> -->
diff --git a/microservice-visualization-webapp/src/app/project-view/project-view.component.scss b/microservice-visualization-webapp/src/app/project-view/project-view.component.scss
@@ -20,3 +20,11 @@ app-project-topology {
     color: $fontColor;
     text-decoration: none;
 }
+
+.to-end {
+    margin-left: auto;
+}
+
+.flex {
+    display: flex;
+}
diff --git a/microservice-visualization-webapp/src/app/project-view/project-view.component.ts b/microservice-visualization-webapp/src/app/project-view/project-view.component.ts
@@ -19,6 +19,7 @@ import { ProjectTopologyComponent, TopologyType } from '../project-topology/proj
 
 import { get } from 'lodash';
 import { DropdownModule } from 'primeng/dropdown';
+import { MultiSelectModule } from 'primeng/multiselect';
 
 @Component({
   selector: 'app-project-view',
@@ -35,7 +36,8 @@ import { DropdownModule } from 'primeng/dropdown';
     InputTextModule,
     ButtonModule,
     TagModule,
-    DropdownModule
+    DropdownModule,
+    MultiSelectModule
   ],
   templateUrl: './project-view.component.html',
   styleUrls: ['./project-view.component.scss'],
@@ -56,11 +58,12 @@ export class ProjectViewComponent implements OnInit, OnDestroy {
   };
 
   types: AppType[] = [
-    {label: 'Library', value: ApplicationType.LIBRARY},
-    {label: 'Microservice', value: ApplicationType.MICROSERVICE}  
+    { label: 'Library', value: ApplicationType.LIBRARY },
+    { label: 'Microservice', value: ApplicationType.MICROSERVICE }
   ];
 
-  tags: string[] = ['java', 'Spring Boot', 'Spring Cloud', 'gradle'];
+  selectedTags: string[] = ['java', 'Spring Boot', 'Spring Cloud', 'gradle'];
+  tagOptions: string[] = []
 
   globalFilterFields: string[] = [];
 
@@ -86,6 +89,7 @@ export class ProjectViewComponent implements OnInit, OnDestroy {
       if (projectId) {
         this.projectApi.get(projectId).subscribe(result => {
           this.data = result;
+          this.tagOptions = this.data.tags || [];
         });
       }
     });

diff --git a/...ation/src/main/java/com/github/rbaul/microservice_visualization/domain/model/Project.java b/...ation/src/main/java/com/github/rbaul/microservice_visualization/domain/model/Project.java
@@ -60,6 +60,10 @@ public class Project {
 	@ToString.Exclude
 	@ElementCollection
 	private List<Owner> owners;
+
+	@ToString.Exclude
+	@ElementCollection
+	private Set<String> tags;
 
 	@ToString.Exclude
 	@ManyToOne(fetch = FetchType.LAZY)

diff --git a/...ava/com/github/rbaul/microservice_visualization/service/loaders/ProjectLoaderService.java b/...ava/com/github/rbaul/microservice_visualization/service/loaders/ProjectLoaderService.java
@@ -125,6 +125,14 @@ protected Map<String, List<String>> createDependenciesMap(Project project) {
         return appConnections;
     }
 
+    protected Set<String> createProjectRelevantTags(Project project) {
+        Set<String> tags = new HashSet<>();
+
+        project.getApplications().forEach(application -> tags.addAll(application.getTags().keySet()));
+
+        return tags;
+    }
+
     protected Application convertApplicationDependencyToApplication(ApplicationDependency applicationDependency, ApplicationType type) {
         Application application = new Application();
         application.setName(applicationDependency.name());
@@ -196,6 +204,8 @@ protected void setApplicationToProject(Project project, ProjectConfig projectCon
         project.setConnections(createTopology(project, projectConfig.getApplicationPostfix(), projectConfig.getApplicationApiPostfixes()));
         // Dependencies
         project.setDependencies(createDependenciesMap(project));
+        // Relevant Tags
+        project.setTags(createProjectRelevantTags(project));
         if (!CollectionUtils.isEmpty(projectConfig.getGroups())) {
             List<ApplicationGroup> groups = getGroups(projectConfig.getGroups());
             List<ApplicationGroup> filteredGroups = groups.stream()

diff --git a/...ization/src/main/java/com/github/rbaul/microservice_visualization/web/dto/ProjectDto.java b/...ization/src/main/java/com/github/rbaul/microservice_visualization/web/dto/ProjectDto.java
@@ -9,6 +9,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @NoArgsConstructor
 @AllArgsConstructor
@@ -28,6 +29,8 @@ public class ProjectDto {
 	private List<ApplicationGroupDto> groups;
 
 	private List<OwnerDto> owners;
+
+	private Set<String> tags;
 
 	private ProjectVersionLiteDto projectVersion;
 }