2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 03:26:45 +00:00

Static Asset Management (#9292)

* Caddyfile: Redirect asset requests

- Ensure the static asset files are served by the proxy
- Reduce gunicorn / python load
- Significant server performance increase

* Allow CORS requests to 'assets' path

* Update static assets path for vite build

* Remove RedirectAssetView

* Specify relative base path

Ref: https://vite.dev/guide/build.html#relative-base

* Revert settings.py

* Revert caddyfile

* Remove defunct unit test

* Add timeout to test
This commit is contained in:
Oliver 2025-03-14 08:20:51 +11:00 committed by GitHub
parent b25bf5e669
commit 3dfd1ed146
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 21 deletions

View File

@ -84,8 +84,3 @@ class TemplateTagTest(InvenTreeTestCase):
rsp = get_frontend_settings(False)
self.assertNotIn('show_server_selector', rsp)
self.assertEqual(rsp['server_list'], ['aa', 'bb'])
def test_redirects(self):
"""Test the redirect helper."""
response = self.client.get('/assets/testpath')
self.assertEqual(response.url, '/static/web/assets/testpath')

View File

@ -1,31 +1,16 @@
"""URLs for web app."""
from django.conf import settings
from django.shortcuts import redirect
from django.urls import include, path, re_path
from django.views.decorators.csrf import ensure_csrf_cookie
from django.views.generic import TemplateView
class RedirectAssetView(TemplateView):
"""View to redirect to static asset."""
def get(self, request, *args, **kwargs):
"""Redirect to static asset."""
return redirect(
f'{settings.STATIC_URL}web/assets/{kwargs["path"]}', permanent=True
)
spa_view = ensure_csrf_cookie(TemplateView.as_view(template_name='web/index.html'))
assets_path = path('assets/<path:path>', RedirectAssetView.as_view(), name='web-assets')
urlpatterns = [
path(
f'{settings.FRONTEND_URL_BASE}/',
include([
assets_path,
path(
'set-password?uid=<uid>&token=<token>',
spa_view,
@ -34,6 +19,5 @@ urlpatterns = [
re_path('.*', spa_view, name='platform-wildcard'),
]),
),
assets_path,
path(settings.FRONTEND_URL_BASE, spa_view, name='platform'),
]

View File

@ -38,6 +38,8 @@ test('Plugins - Settings', async ({ page, request }) => {
.fill(originalValue == '999' ? '1000' : '999');
await page.getByRole('button', { name: 'Submit' }).click();
await page.waitForTimeout(500);
// Change it back
await page.getByLabel('edit-setting-NUMERICAL_SETTING').click();
await page.getByLabel('number-field-value').fill(originalValue);

View File

@ -48,6 +48,7 @@ export default defineConfig({
uploadToken: process.env.CODECOV_TOKEN
})
],
base: '',
build: {
manifest: true,
outDir: '../../src/backend/InvenTree/web/static/web',