Commit 6900195c authored by Roque's avatar Roque

erp5_officejs: update exporter app to use new precache storage to generate the app zip files

parent e594e132
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script src="zipfilestorage-with-jszip.js"></script> <script src="zipfilestorage-with-jszip.js"></script>
<script src="jio_filesystemstorage.js"></script> <script src="jio_filesystemstorage.js"></script>
<script src="jio_appcachestorage.js"></script> <script src="jio_appcachestorage.js"></script>
<script src="jio_precachestorage.js"></script>
</head> </head>
......
...@@ -149,11 +149,13 @@ ...@@ -149,11 +149,13 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -197,16 +199,20 @@ ...@@ -197,16 +199,20 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -229,7 +235,7 @@ ...@@ -229,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>970.27017.22588.52565</string> </value> <value> <string>979.3226.30420.13465</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -247,7 +253,7 @@ ...@@ -247,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1537537669.28</float> <float>1586167074.77</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -256,16 +262,20 @@ ...@@ -256,16 +262,20 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU="> <record id="5" aka="AAAAAAAAAAU=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -313,7 +323,9 @@ ...@@ -313,7 +323,9 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
</ZopeData> </ZopeData>
...@@ -6,18 +6,23 @@ ...@@ -6,18 +6,23 @@
var origin_url = (window.location.origin + window.location.pathname) var origin_url = (window.location.origin + window.location.pathname)
.replace("officejs_export/", ""), .replace("officejs_export/", ""),
precache_manifest = "WebSection_getPrecacheManifest",
//TODO get rid of this old HARDCODED app dict and get everything from config
application_dict = { application_dict = {
"Text Editor": { "Text Editor": {
"url": "officejs_text_editor/", "url": "officejs_text_editor/",
"cache": "gadget_officejs_text_editor.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Smart Assistant": { "Smart Assistant": {
"url": "officejs_smart_assistant/", "url": "officejs_smart_assistant/",
"cache": "gadget_smart_assistant.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Media Player": { "Media Player": {
"url": "officejs_media_player/", "url": "officejs_media_player/",
"cache": "gadget_officejs_media_player.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Notebook": { "Notebook": {
"url": "officejs_notebook/", "url": "officejs_notebook/",
...@@ -25,11 +30,13 @@ ...@@ -25,11 +30,13 @@
}, },
"Illustration Editor": { "Illustration Editor": {
"url": "officejs_svg_editor/", "url": "officejs_svg_editor/",
"cache": "gadget_officejs_illustration.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"PDF Viewer": { "PDF Viewer": {
"url": "officejs_pdf_viewer/", "url": "officejs_pdf_viewer/",
"cache": "gadget_officejs_pdf_viewer.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Cribjs": { "Cribjs": {
"url": "officejs_cribjs/", "url": "officejs_cribjs/",
...@@ -37,31 +44,38 @@ ...@@ -37,31 +44,38 @@
}, },
"Bookmark Manager": { "Bookmark Manager": {
"url": "officejs_bookmark_manager/", "url": "officejs_bookmark_manager/",
"cache" : "gadget_officejs_bookmark_manager.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Onlyoffice Text": { "Onlyoffice Text": {
"url": "ooffice_text/", "url": "ooffice_text/",
"cache": "gadget_ooffice_text.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Onlyoffice Spreadsheet": { "Onlyoffice Spreadsheet": {
"url": "ooffice_spreadsheet/", "url": "ooffice_spreadsheet/",
"cache": "gadget_ooffice_spreadsheet.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Onlyoffice Presentation": { "Onlyoffice Presentation": {
"url": "ooffice_presentation/", "url": "ooffice_presentation/",
"cache": "gadget_ooffice_presentation.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Web Table Editor": { "Web Table Editor": {
"url": "officejs_web_table_editor/", "url": "officejs_web_table_editor/",
"cache": "gadget_officejs_web_table.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Image Editor": { "Image Editor": {
"url": "officejs_image_editor/", "url": "officejs_image_editor/",
"cache": "gadget_officejs_image_editor.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Awesome Free Software Publisher List": { "Awesome Free Software Publisher List": {
"url": "afs/", "url": "afs/",
"cache": "gadget_erp5_afs.appcache", "storage_type": "precache",
"cache": precache_manifest,
"no_installer": true "no_installer": true
}, },
"Jabber Client": { "Jabber Client": {
...@@ -99,7 +113,8 @@ ...@@ -99,7 +113,8 @@
}, },
"Drive App": { "Drive App": {
"url": "officejs_drive_app/", "url": "officejs_drive_app/",
"cache": "gadget_officejs_drive_app.appcache" "storage_type": "precache",
"cache": precache_manifest
}, },
"Travel Expense": { "Travel Expense": {
"url": "officejs_hr/", "url": "officejs_hr/",
...@@ -108,7 +123,8 @@ ...@@ -108,7 +123,8 @@
}, },
"Javascript editor (CodeMirror)": { "Javascript editor (CodeMirror)": {
"url": "officejs_codemirror/", "url": "officejs_codemirror/",
"cache": "gadget_officejs_codemirror.appcache" "storage_type": "precache",
"cache": precache_manifest
} }
}; };
...@@ -125,7 +141,8 @@ ...@@ -125,7 +141,8 @@
app = application_dict[form_result.web_site]; app = application_dict[form_result.web_site];
zip_name = form_result.filename; zip_name = form_result.filename;
return gadget.fillZip(app.cache, origin_url + app.url, app.no_installer) return gadget.fillZip(app.storage_type, app.cache, origin_url + app.url,
app.no_installer)
.push(function (zip_file) { .push(function (zip_file) {
var element = gadget.element, var element = gadget.element,
a = document.createElement("a"), a = document.createElement("a"),
...@@ -146,7 +163,8 @@ ...@@ -146,7 +163,8 @@
.ready(function (g) { .ready(function (g) {
g.props = {}; g.props = {};
}) })
.declareMethod("fillZip", function (cache_file, site_url, no_installer) { .declareMethod("fillZip", function (storage_type, cache_file, site_url,
no_installer) {
var file_storage = jIO.createJIO({ var file_storage = jIO.createJIO({
type: "replicate", type: "replicate",
conflict_handling: 2, conflict_handling: 2,
...@@ -160,7 +178,8 @@ ...@@ -160,7 +178,8 @@
type: "filesystem", type: "filesystem",
document: site_url, document: site_url,
sub_storage: { sub_storage: {
type: "appcache", //keep appcache as default for backward compatibility
type: storage_type || "appcache",
take_installer: no_installer === undefined, take_installer: no_installer === undefined,
manifest: cache_file, manifest: cache_file,
origin_url: site_url, origin_url: site_url,
......
...@@ -172,11 +172,13 @@ ...@@ -172,11 +172,13 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -220,16 +222,20 @@ ...@@ -220,16 +222,20 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -252,7 +258,7 @@ ...@@ -252,7 +258,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>970.27017.22588.52565</string> </value> <value> <string>983.24635.55687.32341</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -270,7 +276,7 @@ ...@@ -270,7 +276,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1537537740.22</float> <float>1587979974.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -279,16 +285,20 @@ ...@@ -279,16 +285,20 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU="> <record id="5" aka="AAAAAAAAAAU=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -336,7 +346,9 @@ ...@@ -336,7 +346,9 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
</ZopeData> </ZopeData>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment