Merge pull request #62 from UST-QuAntiL/feature/plugin-id-filters

Feature: plugin id filters
UST-QuAntiL · Sep 13, 2023 · 73d05f0 · 73d05f0
2 parents 9bf2ecb + 0394190
commit 73d05f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/app/components-small/plugin-filter-editor/plugin-filter-editor.component.html b/src/app/components-small/plugin-filter-editor/plugin-filter-editor.component.html
@@ -26,9 +26,11 @@ <h3 class="editor-description">Filter Editor</h3>
 
             <i>Enter a filter string as JSON object. Filter strings have the following keys:</i>
             <dl>
-                <dt>name</dt> <dd>Represents the name of a plugin.</dd>
+                <dt>id</dt> <dd>Filters for a plugin id (<code>@&lt;version&gt;</code> not required).</dd>
+                <dt>name</dt> <dd>Filters for a plugin name.</dd>
                 <dt>tag</dt> <dd>Allows filtering elements by their assigned tags.</dd>
                 <dt>version</dt> <dd>Uses PEP 440 version specifier to filter elements based on specific versions or version ranges.</dd>
+                <dt>type</dt> <dd>Filters for plugin types (e.g. processing, visualization, ...)</dd>
                 <dt>not</dt> <dd>Specifies a filter string to exclude certain elements.</dd>
                 <dt>and</dt> <dd>Includes multiple filter strings, with elements passing all conditions included in the filtered results (intersection).</dd>
                 <dt>or</dt> <dd>Includes multiple filter strings, with elements meeting at least one condition included in the filtered results (union).</dd>

diff --git a/src/app/components-small/plugin-filter-node/plugin-filter-node.component.html b/src/app/components-small/plugin-filter-node/plugin-filter-node.component.html
@@ -52,15 +52,23 @@
                 <mat-form-field class="inner-form-field">
                     <mat-label>Filter Type:</mat-label>
                     <mat-select [value]="type" (valueChange)="changeType($event)">
+                        <mat-option value="id">Plugin ID</mat-option>
                         <mat-option value="name">Name</mat-option>
                         <mat-option value="tag">Tag</mat-option>
                         <mat-option value="version">Version</mat-option>
+                        <mat-option value="type">Type</mat-option>
                     </mat-select>
                 </mat-form-field>
                 <mat-form-field class="form-field">
                     <mat-label>Filter String:</mat-label>
-                    <textarea matInput [value]="value" (focusout)="updateFilterString($event)" cdkTextareaAutosize #autosize="cdkTextareaAutosize"
-                    cdkAutosizeMinRows="1" cdkAutosizeMaxRows="15"></textarea>
+                    <input matInput [value]="value" (focusout)="updateFilterString($event)" list="plugin-types">
+                    <datalist *ngIf="type === 'type'" id="plugin-types">
+                        <option value="processing"></option>
+                        <option value="visualization"></option>
+                        <option value="conversion"></option>
+                        <option value="dataloader"></option>
+                        <option value="interaction"></option>
+                    </datalist>
                 </mat-form-field>
                 <button mat-raised-button type="button" (click)="delete.emit()">
                     <mat-icon>delete</mat-icon>

diff --git a/src/app/components-small/plugin-filter-node/plugin-filter-node.component.ts b/src/app/components-small/plugin-filter-node/plugin-filter-node.component.ts
@@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@
 // Define filter types ('not' excluded)
 // The PluginFilterNodeComponent component is designed to encapsulate a filter object and the information wether the filter is inverted ('not').
 // When the filter is inverted, the filter object is wrapped in a 'not' object and the 'inverted' property is set to true.
-const filterTypes = ['and', 'or', 'name', 'tag', 'version'] as const;
+const filterTypes = ['and', 'or', 'id', 'name', 'tag', 'version', 'type'] as const;
 type FilterType = (typeof filterTypes)[number];
 const isFilterType = (x: any): x is FilterType => filterTypes.includes(x);