Xavier-Do
bf3b6b0b8b
Previously proposed formating was trying to normalize extra in one part
of the path. This means that no extra needed a placeholder.
The implementation was meant to be more generic and extendible since a
part of the logic has to be in website.
A suggestion was made to make it more restricted but explicite by
keeping the url simple in web/controllers/binary.py but adding a
controller in website to add this extra part.
The base extra direction is now in the extension, as the min part.
Initial urls:
/web/assets/{unique}/[{website_id}/][rtl/]{bundle_name}[.min].{extension}
New urls:
/web/assets/[{website_id}]/{unique}/{bundle_name}[.rtl][.min].{extension}
Managed by two routes:
/web/assets/<string:unique>/<string:filename>
/web/assets/<int:website_id>/<string:unique>/<string:filename>
Where filename is in the format {bundle_name}[.rtl][.min].{extension}
Multiple possibilities where proposed
- /web/assets/website/<int:website_id>/<string:unique>/<string:filename>
More explicit but prefixing by /website was considered
- /website/assets/<int:website_id>/<string:unique>/<string:filename>
This one is a litle painfull to match similar attachement, where
website is ignored.
- /website/<int:website_id>/assets/<string:unique>/<string:filename>
Almost accepted but subjective, and anyway two previous solution breaks
the cdn mecanism and would need a migration
- /web/assets/<int:website_id>/<string:unique>/<string:filename>
Almost accepted but subjective, and anyway two previous solution breaks
the cdn mecanism and would need a migration
This last solution was not ideal to match without unique
/web/assets/%/<string:filename> can match both
/web/assets/123456/<string:filename>
and
/web/assets/1/123456/<string:filename>
Anyway, matching without unique shouldn't be supported for al (even if
it is kind of supported with any right now) but it will work by changing
unique wildcard to a more specific one (_ * 7)
closes odoo/odoo#131353
Related: odoo/enterprise#47313
Related: odoo/design-themes#730
Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
45 lines
2.0 KiB
Python
45 lines
2.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
import odoo.tests
|
|
from odoo.osv import expression
|
|
|
|
|
|
@odoo.tests.tagged('post_install', '-at_install', 'assets_bundle')
|
|
class BusWebTests(odoo.tests.HttpCase):
|
|
|
|
def test_bundle_sends_bus(self):
|
|
"""
|
|
Tests two things:
|
|
- Messages are posted to the bus when assets change
|
|
i.e. their hash has been recomputed and differ from the attachment's
|
|
- The interface deals with those bus messages by displaying one notification
|
|
"""
|
|
# start from a clean slate
|
|
self.env['ir.attachment'].search([('name', 'ilike', 'web.assets_%')]).unlink()
|
|
self.env.registry.clear_cache()
|
|
|
|
sendones = []
|
|
def patched_sendone(self, channel, notificationType, message):
|
|
""" Control API and number of messages posted to the bus linked to
|
|
bundle_changed events """
|
|
if notificationType == 'bundle_changed':
|
|
sendones.append((channel, message))
|
|
|
|
self.patch(type(self.env['bus.bus']), '_sendone', patched_sendone)
|
|
|
|
self.assertEqual(self.url_open('/web/assets/any/web.assets_web.min.js', allow_redirects=False).status_code, 200)
|
|
self.assertEqual(self.url_open('/web/assets/any/web.assets_web.min.css', allow_redirects=False).status_code, 200)
|
|
self.assertEqual(self.url_open('/web/assets/any/web.assets_backend.min.js', allow_redirects=False).status_code, 200)
|
|
self.assertEqual(self.url_open('/web/assets/any/web.assets_backend.min.css', allow_redirects=False).status_code, 200)
|
|
|
|
# One sendone for each asset bundle and for each CSS / JS
|
|
self.assertEqual(
|
|
len(sendones),
|
|
2,
|
|
'Received %s' % '\n'.join('%s - %s' % (tmp[0], tmp[1]) for tmp in sendones)
|
|
)
|
|
for (channel, message) in sendones:
|
|
self.assertEqual(channel, 'broadcast')
|
|
self.assertEqual(len(message), 1)
|
|
self.assertTrue(isinstance(message.get('server_version'), str))
|