Support searching artifacts by specified tag name (goharbor#18175)

1.Fixes goharbor#18082 2.Update CSS Signed-off-by: AllForNothing <[email protected]> Signed-off-by: Stephan Hohn <[email protected]>
mcsage · Feb 16, 2023 · acbb734 · acbb734
1 parent 394f9ed
commit acbb734
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 4 deletions.
diff --git a/...-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.html b/...-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.html
@@ -36,11 +36,13 @@
                 <div class="clr-control-container" *ngIf="!selectedValue">
                     <div class="clr-input-wrapper">
                         <input
-                            readonly
+                            [readonly]="filterByType !== 'tags'"
                             placeholder="{{
                                 'ARTIFACT.FILTER_FOR_ARTIFACTS' | translate
                             }}"
-                            class="clr-input" />
+                            [(ngModel)]="inputTag"
+                            (keyup)="searchByInputTag()"
+                            class="clr-input no-outline" />
                     </div>
                 </div>
                 <span *ngIf="selectedValue">

diff --git a/...-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.scss b/...-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.scss
@@ -35,3 +35,8 @@
 .search-dropdown-toggle {
   margin-right: 5px;
 }
+
+.no-outline:focus {
+  border: none;
+  background: none;
+}
diff --git a/...ct-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.ts b/...ct-list-page/artifact-list/artifact-list-tab/artifact-filter/artifact-filter.component.ts
@@ -3,19 +3,23 @@ import {
     ElementRef,
     EventEmitter,
     Input,
+    OnDestroy,
+    OnInit,
     Output,
     Renderer2,
     ViewChild,
 } from '@angular/core';
 import { ArtifactFilterEvent, multipleFilter } from '../../../../artifact';
 import { Label } from '../../../../../../../../../../ng-swagger-gen/models/label';
+import { Subject, Subscription } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
     selector: 'app-artifact-filter',
     templateUrl: './artifact-filter.component.html',
     styleUrls: ['./artifact-filter.component.scss'],
 })
-export class ArtifactFilterComponent {
+export class ArtifactFilterComponent implements OnInit, OnDestroy {
     @Input()
     withDivider: boolean = false;
     @ViewChild('filterArea')
@@ -31,6 +35,9 @@ export class ArtifactFilterComponent {
     filterEvent = new EventEmitter<ArtifactFilterEvent>();
     readonly searchId: string = 'search-btn';
     readonly typeSelectId: string = 'type-select';
+    inputTag: string;
+    private _keyupEventSubject: Subject<string> = new Subject();
+    private _keyupEventSubscription: Subscription;
     constructor(private renderer: Renderer2) {
         // click  outside, then close dropdown
         this.renderer.listen('window', 'click', (e: Event) => {
@@ -45,6 +52,26 @@ export class ArtifactFilterComponent {
             }
         });
     }
+    ngOnInit(): void {
+        if (!this._keyupEventSubscription) {
+            this._keyupEventSubscription = this._keyupEventSubject
+                .pipe(debounceTime(500))
+                .subscribe(inputTag => {
+                    this.filterEvent.emit({
+                        type: this.filterByType,
+                        isLabel: false,
+                        isInputTag: true,
+                        stringValue: inputTag,
+                    });
+                });
+        }
+    }
+    ngOnDestroy(): void {
+        if (this._keyupEventSubscription) {
+            this._keyupEventSubscription.unsubscribe();
+            this._keyupEventSubscription = null;
+        }
+    }
 
     selectFilterType() {
         this.selectedValue = null;
@@ -87,4 +114,7 @@ export class ArtifactFilterComponent {
         }
         return [];
     }
+    searchByInputTag() {
+        this._keyupEventSubject.next(this.inputTag);
+    }
 }
diff --git a/...rtifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts b/...rtifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
@@ -816,7 +816,12 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
             }
         } else {
             if (e?.stringValue) {
-                this.filters.push(`${e.type}=${e?.stringValue}`);
+                if (e?.isInputTag) {
+                    // for input tag, use fuzzy match
+                    this.filters.push(`${e.type}=~${e?.stringValue}`);
+                } else {
+                    this.filters.push(`${e.type}=${e?.stringValue}`);
+                }
             }
         }
         this.refresh();

diff --git a/src/portal/src/app/base/project/repository/artifact/artifact.ts b/src/portal/src/app/base/project/repository/artifact/artifact.ts
@@ -130,5 +130,6 @@ export interface ArtifactFilterEvent {
     type?: string;
     stringValue?: string;
     isLabel?: boolean;
+    isInputTag?: boolean;
     label?: Label;
 }