removed temporary file and changed initial materialized views setting for site/workbook_item to None

bzhang · bzhang · commit b9f04bb4341e · 2019-02-06T12:52:33.000-08:00
diff --git a/samples/materialize_workbooks.py b/samples/materialize_workbooks.py
@@ -255,7 +255,6 @@ def update_site(args, password, site_content_url):
 
 
 def create_materialized_views_config(args):
-    # TODO: if clean up now and enable all for site is both True, then abort
     materialized_views_config = dict()
     materialized_views_config['materialized_views_enabled'] = args.mode == "enable"
     materialized_views_config['run_materialization_now'] = True if args.materialize_now else False
diff --git a/samples/name.txt b/samples/name.txt
diff --git a/tableauserverclient/models/site_item.py b/tableauserverclient/models/site_item.py
@@ -17,7 +17,7 @@ class State:
 
     def __init__(self, name, content_url, admin_mode=None, user_quota=None, storage_quota=None,
                  disable_subscriptions=False, subscribe_others_enabled=True, revision_history_enabled=False,
-                 revision_limit=None, materialized_views_mode=False):
+                 revision_limit=None, materialized_views_mode=None):
         self._admin_mode = None
         self._id = None
         self._num_users = None
diff --git a/tableauserverclient/models/workbook_item.py b/tableauserverclient/models/workbook_item.py
@@ -24,8 +24,8 @@ def __init__(self, project_id, name=None, show_tabs=False):
         self.project_id = project_id
         self.show_tabs = show_tabs
         self.tags = set()
-        self.materialized_views_config = {'materialized_views_enabled': False,
-                                          'run_materialization_now': False}
+        self.materialized_views_config = {'materialized_views_enabled': None,
+                                          'run_materialization_now': None}
 
     @property
     def connections(self):
@@ -218,7 +218,7 @@ def _parse_element(workbook_xml, ns):
             views = ViewItem.from_xml_element(views_elem, ns)
 
         materialized_views_config = dict()
-        materialized_views_elem = workbook_xml.find('.//t:materializedViewsConfig', namespaces=ns)
+        materialized_views_elem = workbook_xml.find('.//t:materializedViewsEnablementConfig', namespaces=ns)
         if materialized_views_elem is not None:
             materialized_views_config = parse_materialized_views_config(materialized_views_elem)
 
diff --git a/tableauserverclient/server/request_factory.py b/tableauserverclient/server/request_factory.py
@@ -384,7 +384,7 @@ def update_req(self, workbook_item):
             owner_element.attrib['id'] = workbook_item.owner_id
         if workbook_item.materialized_views_config is not None:
             materialized_views_config = workbook_item.materialized_views_config
-            materialized_views_element = ET.SubElement(workbook_element, 'materializedViewsConfig')
+            materialized_views_element = ET.SubElement(workbook_element, 'materializedViewsEnablementConfig')
             materialized_views_element.attrib['materializedViewsEnabled'] = str(materialized_views_config
                                                                            ["materialized_views_enabled"]).lower()
             materialized_views_element.attrib['runMaterializationNow'] = str(materialized_views_config
diff --git a/test/assets/workbook_update.xml b/test/assets/workbook_update.xml
@@ -4,6 +4,6 @@
         <project id="1d0304cd-3796-429f-b815-7258370b9b74" name="Tableau" />
         <owner id="dd2239f6-ddf1-4107-981a-4cf94e415794" />
         <tags />
-        <materializedViewsConfig materializedViewsEnabled="true" runMaterializationNow="false" />
+        <materializedViewsEnablementConfig materializedViewsEnabled="true" runMaterializationNow="false" />
     </workbook>
 </tsResponse>
