8000 Clean up hidden_views by making it an attribute of WorkbookItem (#617) · jorwoods/server-client-python@31d420f · GitHub
[go: up one dir, main page]
Skip to content

Commit 31d420f

Browse files
scumljacalata
scuml
and
jacalata
authored
Clean up hidden_views by making it an attribute of WorkbookItem (tableau#617)
* Clean up hidden views and make it an attribute of workbookitem * Pycodestyle error fix for one letter variable Co-authored-by: Jac <jacalata@users.noreply.github.com> Co-authored by: Stephen Mitchell https://github.com/scuml
1 parent 7443f68 commit 31d420f

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

‎tableauserverclient/models/workbook_item.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def __init__(self, project_id: str, name: str = None, show_tabs: bool = False) -
3939
self.owner_id: Optional[str] = None
4040
self.project_id = project_id
4141
self.show_tabs = show_tabs
42+
self.hidden_views = None
4243
self.tags: Set[str] = set()
4344
self.data_acceleration_config = {
4445
"acceleration_enabled": None,

‎tableauserverclient/server/endpoint/workbooks_endpoint.py

Lines changed: 0 additions & 3 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ def publish(
306306
connection_credentials: Optional["ConnectionCredentials"] = None,
307307
connections: Optional[Sequence[ConnectionItem]] = None,
308308
as_job: bool = False,
309-
hidden_views: Optional[Sequence[str]] = None,
310309
skip_connection_check: bool = False,
311310
):
312311

@@ -388,7 +387,6 @@ def publish(
388387
workbook_item,
389388
connection_credentials=conn_creds,
390389
connections=connections,
391-
hidden_views=hidden_views,
392390
)
393391
else:
394392
logger.info("Publishing {0} to server".format(filename))
@@ -410,7 +408,6 @@ def publish(
410408
file_contents,
411409
connection_credentials=conn_creds,
412410
connections=connections,
413-
hidden_views=hidden_views,
414411
)
415412
logger.debug("Request xml: {0} ".format(xml_request[:1000]))
416413

‎tableauserverclient/server/request_factory.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,6 @@ def _generate_xml(
771771
workbook_item,
772772
connection_credentials=None,
773773
connections=None,
774-
hidden_views=None,
775774
):
776775
xml_request = ET.Element("tsRequest")
777776
workbook_element = ET.SubElement(xml_request, "workbook")
@@ -792,9 +791,9 @@ def _generate_xml(
792791
for connection in connections:
793792
_add_connections_element(connections_element, connection)
794793

795-
if hidden_views is not None:
796-
views_element = ET.SubElement(workbook_element, "views")
797-
for view_name in hidden_views:
794+
if workbook_item.hidden_views is not None:
795+
views_element = ET.SubElement(workbook_element, 'views')
796+
for view_name in workbook_item.hidden_views:
798797
_add_hiddenview_element(views_element, view_name)
799798

800799
return ET.tostring(xml_request)
@@ -832,13 +831,11 @@ def publish_req(
832831
file_contents,
833832
connection_credentials=None,
834833
connections=None,
835-
hidden_views=None,
836834
):
837835
xml_request = self._generate_xml(
838836
workbook_item,
839837
connection_credentials=connection_credentials,
840838
connections=connections,
841-
hidden_views=hidden_views,
842839
)
843840

844841
parts = {
@@ -852,13 +849,11 @@ def publish_req_chunked(
852849
workbook_item,
853850
connection_credentials=None,
854851
connections=None,
855-
hidden_views=None,
856852
):
857853
xml_request = self._generate_xml(
858854
workbook_item,
859855
connection_credentials=connection_credentials,
860856
connections=connections,
861-
hidden_views=hidden_views,
862857
)
863858

864859
parts = {"request_payload": ("", xml_request, "text/xml")}

‎test/test_workbook.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -591,11 +591,10 @@ def test_publish_with_hidden_view(self) -> None:
591591
sample_workbook = os.path.join(TEST_ASSET_DIR, 'SampleWB.twbx')
592592
publish_mode = self.server.PublishMode.CreateNew
593593

594-
new_workbook = self.server.workbooks.publish(new_workbook,
595-
sample_workbook,
596-
publish_mode,
597-
hidden_views=['GDP per capita'])
598-
594+
new_workbook.hidden_views = ['GDP per capita']
595+
new_workbook = self.server.workbooks.publish(
596+
new_workbook, sample_workbook, publish_mode
597+
)
599598
request_body = m._adapter.request_history[0]._request.body
600599
# order of attributes in xml is unspecified
601600
self.assertTrue(re.search(rb'<views><view.*?hidden=\"true\".*?\/><\/views>', request_body))

0 commit comments

Comments
 (0)
0