Ability to disable GAB filters.
Filters for preconfigured columns can be disabled using props.
(Should be merged after 'Dynamic columns in GAB table')
Change-Id: Id740ceb211c3978499b9c69197929a43e61e9cdc
Issue-ID: SDC-2234
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
diff --git a/catalog-ui/src/app/models/paths-and-names.ts b/catalog-ui/src/app/models/paths-and-names.ts
index 4313637..7304d96 100644
--- a/catalog-ui/src/app/models/paths-and-names.ts
+++ b/catalog-ui/src/app/models/paths-and-names.ts
@@ -19,5 +19,5 @@
*/
export class PathsAndNamesDefinition {
- constructor(public path: string, public friendlyName: string, public searchable: boolean) {}
+ constructor(public path: string, public friendlyName: string, public searchable: boolean = true) {}
}
\ No newline at end of file
diff --git a/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.html b/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.html
index ad1ebcb..41ecaa8 100644
--- a/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.html
+++ b/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.html
@@ -38,6 +38,7 @@
</span>
<br/>
<input
+ *ngIf="isSearchable(col.name)"
type='text'
class="datattable-input-filter"
placeholder='Filter column...'
diff --git a/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.ts b/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.ts
index 7e704e1..4de7ff0 100644
--- a/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.ts
+++ b/catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.ts
@@ -105,6 +105,13 @@
this.addNewColumn = true;
}
+ isSearchable(columnName){
+ let selectedPathAndName = this.pathsandnames.filter(function(pathandname){
+ return pathandname.friendlyName === columnName;
+ })[0];
+ return selectedPathAndName.searchable;
+ }
+
updateColumnFilter(event, column) {
const val = event.target.value.toLowerCase();
this.columnsFilters.set(column, val);
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts
index 5ada3d0..fc3de6e 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts
@@ -301,7 +301,7 @@
let pathsandnames: PathsAndNamesDefinition[] = [];
if(typeof uiConfiguration.gab === 'undefined') {
- noConfig = true
+ noConfig = true;
} else {
const gabConfig: GabConfig = uiConfiguration.gab
.find(config => config.artifactType === artifact.artifactType);