rogee
be38051ac5
ISS-01: Fix reporting_events_rollups table schema mismatch
- The init migration (000001) created columns (dimension, dimension_value,
metric_name, value, value_in_business_hours, period) that do not match
the GORM model which expects (date, dimension_type, dimension_id, metric,
count, sum_value, sum_value_business_hours)
- Add migration 000048 to drop and recreate the table with correct schema
matching the GORM model and all Go code that references it
- Fixes: GET /api/v2/accounts/:id/reports returning HTTP 500 with
'column date does not exist (SQLSTATE 42703)'
ISS-02: Fix Settings > General page white screen
- AccountId.vue: add null-safe access for currentAccount.value.id before
calling toString() — currentAccount can be {} when account data not yet
loaded in store
- BuildInfo.vue: add null-safe access for globalConfig.value.gitSha and
globalConfig.value.appVersion; guard copyGitSha with existence check;
add v-if guard on gitSha span in template
ISS-04: Fix SidebarGroup mounted hook exceptions
- SidebarGroup.vue: Object.keys(child.to.params) throws TypeError when
child.to.params is undefined; add null-safe fallback Object.keys(child.to?.params ?? {})
- This was the source of the 29 recurring JS exceptions on every Settings
page navigation
ISS-05: Fix Vue Router root path warning
- Add root route { path: '/', redirect: '/app/login' } to silence
'No match found for location with path /' warning
88 lines
2.5 KiB
JavaScript
88 lines
2.5 KiB
JavaScript
import { createRouter, createWebHistory } from 'vue-router';
|
|
|
|
import { frontendURL } from '../helper/URLHelper';
|
|
import dashboard from './dashboard/dashboard.routes';
|
|
import store from 'dashboard/store';
|
|
import { validateLoggedInRoutes } from '../helper/routeHelpers';
|
|
import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
|
|
import AnalyticsHelper from '../helper/AnalyticsHelper';
|
|
|
|
const ONBOARDING_STEPS = ['account_details', 'enrichment'];
|
|
const routes = [
|
|
{ path: '/', redirect: '/app/login' },
|
|
...dashboard.routes,
|
|
];
|
|
|
|
export const router = createRouter({ history: createWebHistory(), routes });
|
|
|
|
const PUBLIC_ROUTE_NAMES = [
|
|
'login',
|
|
'sso_login',
|
|
'auth_signup',
|
|
'auth_confirmation',
|
|
'auth_verify_email',
|
|
'auth_password_edit',
|
|
'auth_reset_password',
|
|
];
|
|
|
|
export const validateAuthenticateRoutePermission = async (to, next) => {
|
|
const { isLoggedIn, getCurrentUser: user } = store.getters;
|
|
|
|
if (PUBLIC_ROUTE_NAMES.includes(to.name)) {
|
|
return next();
|
|
}
|
|
|
|
if (!isLoggedIn) {
|
|
return next(frontendURL('login'));
|
|
}
|
|
|
|
const { accounts = [], account_id: accountId } = user;
|
|
|
|
if (!accounts.length) {
|
|
if (to.name === 'no_accounts') {
|
|
return next();
|
|
}
|
|
return next(frontendURL('no-accounts'));
|
|
}
|
|
|
|
const routeAccountId = Number(to.params?.accountId || accountId);
|
|
const userAccount = accounts.find(a => a.id === routeAccountId);
|
|
const isAdmin = userAccount?.role === 'administrator';
|
|
const isActive = userAccount?.status === 'active';
|
|
const needsOnboarding =
|
|
ONBOARDING_STEPS.includes(userAccount?.onboarding_step) &&
|
|
isAdmin &&
|
|
isActive;
|
|
|
|
if (to.name === 'no_accounts' || !to.name) {
|
|
const target = needsOnboarding ? 'onboarding' : 'dashboard';
|
|
return next(frontendURL(`accounts/${routeAccountId}/${target}`));
|
|
}
|
|
|
|
if (needsOnboarding && !isOnOnboardingView(to)) {
|
|
return next(frontendURL(`accounts/${routeAccountId}/onboarding`));
|
|
}
|
|
if (!needsOnboarding && isOnOnboardingView(to)) {
|
|
return next(frontendURL(`accounts/${routeAccountId}/dashboard`));
|
|
}
|
|
|
|
const nextRoute = validateLoggedInRoutes(to, store.getters.getCurrentUser);
|
|
return nextRoute ? next(frontendURL(nextRoute)) : next();
|
|
};
|
|
|
|
export const initalizeRouter = () => {
|
|
const userAuthentication = store.dispatch('setUser');
|
|
|
|
router.beforeEach(async (to, _from, next) => {
|
|
AnalyticsHelper.page(to.name || '', {
|
|
path: to.path,
|
|
name: to.name,
|
|
});
|
|
|
|
await userAuthentication;
|
|
await validateAuthenticateRoutePermission(to, next, store);
|
|
});
|
|
};
|
|
|
|
export default router;
|