Skip to content

Commit

Permalink
DEV-43349 Grafana upgrade leftovers and fixes::Fix shapshots url in A…
Browse files Browse the repository at this point in the history
…pp (#35)
  • Loading branch information
copyhold authored Jul 3, 2024
1 parent 03961a4 commit 2d9e5ab
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 52 deletions.
4 changes: 2 additions & 2 deletions public/app/core/components/PageNotFound/EntityNotFound.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export function EntityNotFound({ entity = 'Page' }: Props) {
<a href="/" className="external-link">
home
</a>{' '}
or seeking help on the{' '}
{/* or seeking help on the{' '} LOGZ.IO GRAFANA CHANGE::DEV-00000 hide grafana links
<a href="https://community.grafana.com" target="_blank" rel="noreferrer" className="external-link">
community site.
</a>
</a> */}
</div>
<div className={styles.grot}>
<img src={`public/img/grot-404-${theme.isDark ? 'dark' : 'light'}.svg`} width="100%" alt="grot" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export class ShareSnapshot extends PureComponent<Props, State> {
// LOGZ.IO GRAFANA CHANGE :: DEV-20896 Change snapshot url to logzio
const logzioUrl = await logzioServices?.shareUrlService?.getLogzioGrafanaUrl({
productUrl: window.location.origin,
hash: '/dashboard/grafana-snapshot',
});

this.setState({
Expand Down
101 changes: 51 additions & 50 deletions public/app/routes/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -363,56 +363,57 @@ export function getAppRoutes(): RouteDescriptor[] {
),
},
// LOGIN / SIGNUP
{
path: '/login',
component: LoginPage,
pageClass: 'login-page',
chromeless: true,
},
{
path: '/invite/:code',
component: SafeDynamicImport(
() => import(/* webpackChunkName: "SignupInvited" */ 'app/features/invites/SignupInvited')
),
chromeless: true,
},
{
path: '/verify',
component: !config.verifyEmailEnabled
? () => <Redirect to="/signup" />
: SafeDynamicImport(
() => import(/* webpackChunkName "VerifyEmailPage"*/ 'app/core/components/Signup/VerifyEmailPage')
),
pageClass: 'login-page',
chromeless: true,
},
{
path: '/signup',
component: config.disableUserSignUp
? () => <Redirect to="/login" />
: SafeDynamicImport(() => import(/* webpackChunkName "SignupPage"*/ 'app/core/components/Signup/SignupPage')),
pageClass: 'login-page',
chromeless: true,
},
{
path: '/user/password/send-reset-email',
chromeless: true,
component: SafeDynamicImport(
() =>
import(/* webpackChunkName: "SendResetMailPage" */ 'app/core/components/ForgottenPassword/SendResetMailPage')
),
},
{
path: '/user/password/reset',
component: SafeDynamicImport(
() =>
import(
/* webpackChunkName: "ChangePasswordPage" */ 'app/core/components/ForgottenPassword/ChangePasswordPage'
)
),
pageClass: 'login-page',
chromeless: true,
},
// LOGZ.IO GRAFANA CHANGE::DEV-00000 deactivate all login/signup related pages
// {
// path: '/login',
// component: LoginPage,
// pageClass: 'login-page',
// chromeless: true,
// },
// {
// path: '/invite/:code',
// component: SafeDynamicImport(
// () => import(/* webpackChunkName: "SignupInvited" */ 'app/features/invites/SignupInvited')
// ),
// chromeless: true,
// },
// {
// path: '/verify',
// component: !config.verifyEmailEnabled
// ? () => <Redirect to="/signup" />
// : SafeDynamicImport(
// () => import(/* webpackChunkName "VerifyEmailPage"*/ 'app/core/components/Signup/VerifyEmailPage')
// ),
// pageClass: 'login-page',
// chromeless: true,
// },
// {
// path: '/signup',
// component: config.disableUserSignUp
// ? () => <Redirect to="/login" />
// : SafeDynamicImport(() => import(/* webpackChunkName "SignupPage"*/ 'app/core/components/Signup/SignupPage')),
// pageClass: 'login-page',
// chromeless: true,
// },
// {
// path: '/user/password/send-reset-email',
// chromeless: true,
// component: SafeDynamicImport(
// () =>
// import(/* webpackChunkName: "SendResetMailPage" */ 'app/core/components/ForgottenPassword/SendResetMailPage')
// ),
// },
// {
// path: '/user/password/reset',
// component: SafeDynamicImport(
// () =>
// import(
// /* webpackChunkName: "ChangePasswordPage" */ 'app/core/components/ForgottenPassword/ChangePasswordPage'
// )
// ),
// pageClass: 'login-page',
// chromeless: true,
// },
{
path: '/dashboard/snapshots',
component: SafeDynamicImport(
Expand Down

0 comments on commit 2d9e5ab

Please sign in to comment.