generated from Seekra/repository-template
refactor(settings): move setttings path normalization utility to a separate file
Moved the normalizePagePath utility from the settings page composable to a separate utility file and restructured tests accordingly.
This commit is contained in:
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { normalizePagePath, useSettingsPage } from '../useSettingsPage.js';
|
import { useSettingsPage } from '../useSettingsPage.js';
|
||||||
import { describe, expect, test, vi } from 'vitest';
|
import { describe, expect, test, vi } from 'vitest';
|
||||||
|
|
||||||
const pushRoute = vi.fn();
|
const pushRoute = vi.fn();
|
||||||
@@ -24,50 +24,6 @@ vi.mock('vue-router', () => ({
|
|||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('useSettingsPage', () => {
|
|
||||||
describe('normalizePagePath', () => {
|
|
||||||
test.for([
|
|
||||||
{ path: 'a.b.c', expected: ['a', 'b', 'c'] },
|
|
||||||
{ path: 'a', expected: ['a'] },
|
|
||||||
{ path: 'a.b', expected: ['a', 'b'] },
|
|
||||||
{ path: 'a..b', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a.b', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a.b', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a.b.', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a.b..', expected: ['a', 'b'] },
|
|
||||||
{ path: 'a.b.', expected: ['a', 'b'] },
|
|
||||||
{ path: 'a.b..', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a.b..', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a.b.', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a..b', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a..b', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a..b.', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a..b..', expected: ['a', 'b'] },
|
|
||||||
{ path: 'a..b.', expected: ['a', 'b'] },
|
|
||||||
{ path: 'a..b..', expected: ['a', 'b'] },
|
|
||||||
{ path: '.a..b..', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a..b.', expected: ['a', 'b'] },
|
|
||||||
{ path: '..a.....b.c..d....', expected: ['a', 'b', 'c', 'd'] },
|
|
||||||
{ path: 'a.b.c/', expected: ['a', 'b', 'c'] },
|
|
||||||
{ path: 'a.#b.c', expected: ['a', 'b', 'c'] },
|
|
||||||
{ path: 'a.#b.c/', expected: ['a', 'b', 'c'] },
|
|
||||||
{ path: 'a1.#b.c/', expected: ['a1', 'b', 'c'] },
|
|
||||||
{ path: 'a-1.#b.c/', expected: ['a-1', 'b', 'c'] },
|
|
||||||
{ path: 'a-1.b@.c', expected: ['a-1', 'b', 'c'] },
|
|
||||||
{ path: '....@a/#...)!&§[b.#§c..d....', expected: ['a', 'b', 'c', 'd'] },
|
|
||||||
{ path: '....@a/#...)!&§[b.#§c..dä....', expected: ['a', 'b', 'c', 'd'] },
|
|
||||||
{ path: '..,...~..@a/#.+..)!&§[b.#§c..dä..)..', expected: ['a', 'b', 'c', 'd'] },
|
|
||||||
{ path: 'a.@.b', expected: ['a', 'b'] },
|
|
||||||
{ path: 1, expected: [] },
|
|
||||||
{ path: false, expected: [] },
|
|
||||||
{ path: true, expected: [] },
|
|
||||||
{ path: null, expected: [] },
|
|
||||||
{ path: undefined, expected: [] }
|
|
||||||
])('normalizes path correctly', async ({ path, expected }) => {
|
|
||||||
expect(normalizePagePath(path)).toStrictEqual(expected);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('useSettingsPage', () => {
|
describe('useSettingsPage', () => {
|
||||||
describe('goToSettingsPage', () => {
|
describe('goToSettingsPage', () => {
|
||||||
test('pushes correct route', async () => {
|
test('pushes correct route', async () => {
|
||||||
@@ -82,4 +38,3 @@ describe('useSettingsPage', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
@@ -14,19 +14,9 @@ See the License for the specific language governing permissions and
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { getSettingsPagePathSegments } from '../utils/settingsPage';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
|
|
||||||
export const normalizePagePath = function normalizePagePath (path) {
|
|
||||||
if (typeof path !== 'string') return [];
|
|
||||||
return path
|
|
||||||
.replace(/^\.+|\.+$/g, '')
|
|
||||||
.split('.')
|
|
||||||
.map(
|
|
||||||
(segment) => segment.replace(/[^a-zA-Z0-9-]/g, '')
|
|
||||||
)
|
|
||||||
.filter(Boolean);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useSettingsPage = function useSettingsPage () {
|
export const useSettingsPage = function useSettingsPage () {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
@@ -34,7 +24,7 @@ export const useSettingsPage = function useSettingsPage () {
|
|||||||
return router.push({
|
return router.push({
|
||||||
name: 'settings',
|
name: 'settings',
|
||||||
params: {
|
params: {
|
||||||
rest: normalizePagePath(pagePath)
|
rest: getSettingsPagePathSegments(pagePath)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { getSettingsPagePathSegments } from '../settingsPage.js';
|
||||||
|
import { describe, expect, test } from 'vitest';
|
||||||
|
|
||||||
|
describe('settingsPage', () => {
|
||||||
|
describe('getSettingsPagePathSegments', () => {
|
||||||
|
test.for([
|
||||||
|
{ path: 'a.b.c', expected: ['a', 'b', 'c'] },
|
||||||
|
{ path: 'a', expected: ['a'] },
|
||||||
|
{ path: 'a.b', expected: ['a', 'b'] },
|
||||||
|
{ path: 'a..b', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a.b', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a.b', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a.b.', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a.b..', expected: ['a', 'b'] },
|
||||||
|
{ path: 'a.b.', expected: ['a', 'b'] },
|
||||||
|
{ path: 'a.b..', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a.b..', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a.b.', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a..b', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a..b', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a..b.', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a..b..', expected: ['a', 'b'] },
|
||||||
|
{ path: 'a..b.', expected: ['a', 'b'] },
|
||||||
|
{ path: 'a..b..', expected: ['a', 'b'] },
|
||||||
|
{ path: '.a..b..', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a..b.', expected: ['a', 'b'] },
|
||||||
|
{ path: '..a.....b.c..d....', expected: ['a', 'b', 'c', 'd'] },
|
||||||
|
{ path: 'a.b.c/', expected: ['a', 'b', 'c'] },
|
||||||
|
{ path: 'a.#b.c', expected: ['a', 'b', 'c'] },
|
||||||
|
{ path: 'a.#b.c/', expected: ['a', 'b', 'c'] },
|
||||||
|
{ path: 'a1.#b.c/', expected: ['a1', 'b', 'c'] },
|
||||||
|
{ path: 'a-1.#b.c/', expected: ['a-1', 'b', 'c'] },
|
||||||
|
{ path: 'a-1.b@.c', expected: ['a-1', 'b', 'c'] },
|
||||||
|
{ path: '....@a/#...)!&§[b.#§c..d....', expected: ['a', 'b', 'c', 'd'] },
|
||||||
|
{ path: '....@a/#...)!&§[b.#§c..dä....', expected: ['a', 'b', 'c', 'd'] },
|
||||||
|
{ path: '..,...~..@a/#.+..)!&§[b.#§c..dä..)..', expected: ['a', 'b', 'c', 'd'] },
|
||||||
|
{ path: 'a.@.b', expected: ['a', 'b'] },
|
||||||
|
{ path: 1, expected: [] },
|
||||||
|
{ path: false, expected: [] },
|
||||||
|
{ path: true, expected: [] },
|
||||||
|
{ path: null, expected: [] },
|
||||||
|
{ path: undefined, expected: [] }
|
||||||
|
])('returns $expected', async ({ path, expected }) => {
|
||||||
|
expect(getSettingsPagePathSegments(path)).toStrictEqual(expected);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extracts the segments of a settings page path and normalizes each segment.
|
||||||
|
* @param {string} path - The settings page path.
|
||||||
|
* @returns {Array} The settings page path segments.
|
||||||
|
*/
|
||||||
|
export const getSettingsPagePathSegments = function getSettingsPagePathSegments (path) {
|
||||||
|
if (typeof path !== 'string') return [];
|
||||||
|
return path
|
||||||
|
.replace(/^\.+|\.+$/g, '')
|
||||||
|
.split('.')
|
||||||
|
.map(
|
||||||
|
(segment) => segment.replace(/[^a-zA-Z0-9-]/g, '')
|
||||||
|
)
|
||||||
|
.filter(Boolean);
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user