Skip to content

Commit 7cf0e08

Browse files
committed
Conditionally included V1 pages
1 parent 120f183 commit 7cf0e08

File tree

5 files changed

+22
-1
lines changed

5 files changed

+22
-1
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ PUBLIC_OAUTH_CLIENT_NAME=
1717
LOG_FILE=/tmp/fractal-web.log
1818
LOG_LEVEL_FILE=info
1919
LOG_LEVEL_CONSOLE=warn
20+
21+
FRACTAL_API_V1_MODE=include

.env.development

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ PUBLIC_OAUTH_CLIENT_NAME=
1616
LOG_FILE=./fractal-web.log
1717
LOG_LEVEL_FILE=debug
1818
LOG_LEVEL_CONSOLE=info
19+
20+
FRACTAL_API_V1_MODE=include

src/routes/+layout.server.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { env } from '$env/dynamic/private';
12
import { getLogger } from '$lib/server/logger.js';
23

34
const logger = getLogger('page layout');
@@ -15,5 +16,8 @@ export async function load({ locals, request, url }) {
1516
logger.error('pageInfo is missing, it should have been loaded by hooks.server.js');
1617
}
1718

18-
return pageInfo;
19+
return {
20+
...pageInfo,
21+
v1Enabled: env.FRACTAL_API_V1_MODE !== 'exclude'
22+
};
1923
}

src/routes/+layout.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
let clientVersion = __APP_VERSION__;
1717
1818
$: displayVersionSelector =
19+
$page.data.v1Enabled &&
1920
(!isSubPage($page.url.pathname, apiVersion) ||
2021
$page.url.pathname === '/v2/admin/jobs' ||
2122
$page.url.pathname === '/v1/admin/jobs') &&

src/routes/v1/+layout.server.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { getLogger } from '$lib/server/logger';
2+
import { redirect } from '@sveltejs/kit';
3+
import { env } from '$env/dynamic/private';
4+
5+
const logger = getLogger('v1 pages');
6+
7+
export async function load() {
8+
if (env.FRACTAL_API_V1_MODE === 'exclude') {
9+
logger.warn('v1 pages has been disabled, redirecting to home');
10+
throw redirect(307, '/');
11+
}
12+
}

0 commit comments

Comments
 (0)