diff --git a/CHANGELOG.md b/CHANGELOG.md
index d829f3a..e62f349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,21 @@
-## v0.5.20 (2020-09-20)
+## v0.5.24
+
+* Eliminate overwrite error in cli
+
+## v0.5.23
+
+* Fix cli initial pull in empty workspace
+* Fix cli default to CACHE_TOKENS = True
+
+## v0.5.22 (2020-10-13)
+
+* Add events handling to widgets with nested iframes
+
+## v0.5.21 (2020-10-13)
+
+* Fix page css clases
+
+## v0.5.20 (2020-10-13)
* Fix json encoder in `presalytics.lib.widgets.datatable.DataTableWidget`
* update Story Api Endpoints
diff --git a/presalytics/cli.py b/presalytics/cli.py
index 6639ab5..815b6bb 100644
--- a/presalytics/cli.py
+++ b/presalytics/cli.py
@@ -371,6 +371,8 @@ def main():
#load story outline from file
if config:
set_dict = {} if not args.set else parse_vars(args.set)
+ if 'CACHE_TOKENS' not in set_dict.keys():
+ set_dict['CACHE_TOKENS'] = True
presalytics.lib.tools.workflows.create_config_file(args.username,
password=args.password,
set_dict=set_dict,
@@ -385,8 +387,14 @@ def main():
if os.path.exists(abs_filename):
filename = abs_filename
else:
- logger.error("Could not find file: {}".format(filename))
- return
+ if pull and args.id:
+ outline = presalytics.lib.tools.workflows.pull_outline(args.id, username=args.username, password=args.password)
+ _dump(outline, filename, args.overwrite, args.json)
+ pull = False
+ write = False
+ else:
+ logger.error("Could not find file: {}".format(filename))
+ return
outline = _load_file(filename)
except Exception:
logger.error("Error handling file: {}".format(filename))
diff --git a/presalytics/lib/plugins/css/flex-row.css b/presalytics/lib/plugins/css/flex-row.css
index 7ee62ea..0cbfcc1 100644
--- a/presalytics/lib/plugins/css/flex-row.css
+++ b/presalytics/lib/plugins/css/flex-row.css
@@ -1,5 +1,4 @@
.page {
- padding: 2vw;
width: 100%;
display: flex;
flex-direction: column;
diff --git a/presalytics/lib/plugins/external.py b/presalytics/lib/plugins/external.py
index 696ed52..5bb199b 100644
--- a/presalytics/lib/plugins/external.py
+++ b/presalytics/lib/plugins/external.py
@@ -135,6 +135,7 @@ class ApprovedExternalScripts(presalytics.lib.plugins.base.ScriptPlugin):
'mpld3': '{0}/static/mpld3/mpld3.min.js'.format(site_host),
'ooxml': '{0}/static/js/ooxml.js'.format(site_host),
'mpl-responsive': '{0}/static/js/mpl-responsive.js'.format(site_host),
+ 'events': '{0}/static/js/events.js'.format(site_host),
'jquery': 'https://code.jquery.com/jquery-3.4.1.min.js',
'popper': 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js',
'bootstrap4': 'https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js',
diff --git a/presalytics/lib/widgets/chart.py b/presalytics/lib/widgets/chart.py
index 549ea3e..25621d9 100644
--- a/presalytics/lib/widgets/chart.py
+++ b/presalytics/lib/widgets/chart.py
@@ -113,7 +113,7 @@ def create_container(self, **kwargs):
'scrolling': "auto",
'class': 'd3-responsive-frame',
'style': 'max-height: none; max-width: none; height:100%; width: 100%;',
- 'sandbox': 'allow-scripts'
+ 'sandbox': 'allow-scripts allow-same-origin'
})
empty_parent_div.append(frame)
return lxml.html.tostring(empty_parent_div).decode('utf-8')
@@ -185,7 +185,8 @@ def standalone_html(self) -> str:
-
+
+
+
{{ html_fragment }}
@@ -205,6 +208,7 @@ def standalone_html(self) -> str:
"popper_url": presalytics.lib.plugins.external.ApprovedExternalScripts().attr_dict.flatten().get('popper'),
"boostrap_table_js_url": presalytics.lib.plugins.external.ApprovedExternalScripts().attr_dict.flatten().get('bootstrap-table'),
"d3_url": presalytics.lib.plugins.external.ApprovedExternalScripts().attr_dict.flatten().get('d3'),
+ "events_url": presalytics.lib.plugins.external.ApprovedExternalScripts().attr_dict.flatten().get('events'),
"data": data,
"css": extra_css
}
diff --git a/presalytics/lib/widgets/matplotlib.py b/presalytics/lib/widgets/matplotlib.py
index c40bd28..dfc7e89 100644
--- a/presalytics/lib/widgets/matplotlib.py
+++ b/presalytics/lib/widgets/matplotlib.py
@@ -224,6 +224,7 @@ def standalone_html(self) -> str:
+