Skip to content

Commit 9b085bb

Browse files
authored
Merge pull request #726 from data-integrations/ch-hidden-datasets
add option to show hidden datasets
2 parents 1d97cf7 + 1bdcfc7 commit 9b085bb

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

docs/BigQuery-connector.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ it can automatically be read from the environment. In other environments, the se
2626
auto-detect' when running on a Dataproc cluster. When running on other clusters, the file must be present on every
2727
node in the cluster.
2828

29-
* **JSON**: Contents of the service account JSON file.
29+
* **JSON**: Contents of the service account JSON file.
30+
31+
**Show Hidden Datasets:** Whether to show hidden datasets.

src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ private BrowseDetail listTables(BigQuery bigQuery, String datasetProject, String
195195
}
196196

197197
private BrowseDetail listDatasets(BigQuery bigQuery, Integer limit) {
198-
Page<Dataset> datasetPage = bigQuery.listDatasets(BigQuery.DatasetListOption.all());
198+
Page<Dataset> datasetPage = config.showHiddenDatasets() ?
199+
bigQuery.listDatasets(BigQuery.DatasetListOption.all()) : bigQuery.listDatasets();
199200
int countLimit = limit == null || limit <= 0 ? Integer.MAX_VALUE : limit;
200201
int count = 0;
201202
BrowseDetail.Builder browseDetailBuilder = BrowseDetail.builder();

src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorSpecificConfig.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,20 @@ public class BigQueryConnectorSpecificConfig extends BigQueryConnectorConfig {
2929
@Description("The root dataset to browse when a root path is given")
3030
protected String rootDataset;
3131

32+
@Nullable
33+
@Description("Whether to show hidden datasets")
34+
protected Boolean showHiddenDatasets;
35+
3236
public BigQueryConnectorSpecificConfig(@Nullable String project, @Nullable String datasetProject,
3337
@Nullable String serviceAccountType, @Nullable String serviceFilePath,
3438
@Nullable String serviceAccountJson,
3539
@Nullable String rootDataset) {
3640
super(project, datasetProject, serviceAccountType, serviceFilePath, serviceAccountJson);
3741
this.rootDataset = rootDataset;
42+
this.showHiddenDatasets = false;
43+
}
44+
45+
public boolean showHiddenDatasets() {
46+
return showHiddenDatasets == null ? false : showHiddenDatasets;
3847
}
3948
}

widgets/BigQuery-connector.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@
2626
{
2727
"widget-type": "hidden",
2828
"name": "rootDataset"
29+
},
30+
{
31+
"widget-type": "toggle",
32+
"label": "Show Hidden Datasets",
33+
"name": "showHiddenDatasets",
34+
"widget-attributes": {
35+
"on": {
36+
"value": "true",
37+
"label": "YES"
38+
},
39+
"off": {
40+
"value": "false",
41+
"label": "NO"
42+
},
43+
"default": "false"
44+
}
2945
}
3046
]
3147
},

0 commit comments

Comments
 (0)