summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-04-11 10:21:52 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-04-30 17:19:26 +0000
commit20d930a11a1a08722bde76378696e7fae1ba1e5e (patch)
tree06c963e0d55e6dd616c25faba9a5951a1a033887 /catalog-ui/src/app
parent0e7f223397e1bd8b5c62b7cdc1b1c7ac2eb1cc4c (diff)
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>
Diffstat (limited to 'catalog-ui/src/app')
-rw-r--r--catalog-ui/src/app/models/paths-and-names.ts2
-rw-r--r--catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.html1
-rw-r--r--catalog-ui/src/app/ng2/components/logic/generic-artifact-browser/generic-artifact-browser.component.ts7
-rw-r--r--catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts2
4 files changed, 10 insertions, 2 deletions
diff --git a/catalog-ui/src/app/models/paths-and-names.ts b/catalog-ui/src/app/models/paths-and-names.ts
index 43136378c0..7304d9641f 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 ad1ebcb094..41ecaa899e 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 7e704e1927..4de7ff07d9 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 @@ export class GenericArtifactBrowserComponent {
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 5ada3d0a69..fc3de6e9e1 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 @@ export class DeploymentArtifactsViewModel {
let pathsandnames: PathsAndNamesDefinition[] = [];
if(typeof uiConfiguration.gab === 'undefined') {
- noConfig = true
+ noConfig = true;
} else {
const gabConfig: GabConfig = uiConfiguration.gab
.find(config => config.artifactType === artifact.artifactType);