Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove admin old routes #10131

Merged
merged 4 commits into from
May 14, 2024
Merged

remove admin old routes #10131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3d3387
remove admin old routes
aditya-mitra May 6, 2024
a5c6b63
Merge branch 'dev' into chore/remove-old-admin
aditya-mitra May 10, 2024
e065e08
Merge branch 'dev' into chore/remove-old-admin
aditya-mitra May 10, 2024
c1d3193
Merge branch 'dev' into chore/remove-old-admin
HexaField May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions packages/client/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,6 @@ const App = () => {
<BrowserRouter history={history}>
<Routes>
{/* @todo - these are for backwards compatibility with non tailwind pages - they will be removed eventually */}
<Route
key="adminold"
path="/adminold/*"
element={
<Suspense fallback={<LoadingCircle message={t('common:loader.starting')} />}>
<Engine>
<AppPage route={'adminold'} />
</Engine>
</Suspense>
}
/>
<Route
key="location"
path="/location/*"
Expand Down
8 changes: 0 additions & 8 deletions packages/client/src/route/public.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ function RouterComp({ route }: { route: string }) {
const customRoutes = useCustomRoutes()
const { t } = useTranslation()

// still allow admin even if no custom routes are loaded in case routes fail to load
if (route !== 'adminold' && !customRoutes.length) {
return <LoadingCircle message={t('common:loader.loadingRoutes')} />
}

let RouteElement

switch (route) {
Expand All @@ -61,9 +56,6 @@ function RouterComp({ route }: { route: string }) {
case 'location':
RouteElement = $location
break
case 'adminold':
RouteElement = $admin
break
}

return (
Expand Down
1 change: 0 additions & 1 deletion packages/server-core/src/media/storageprovider/s3.storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,6 @@ export class S3Provider implements StorageProviderInterface {
break
case '/location':
case '/auth':
case '/xadm':
case '/capture':
routeRegex += `^${route}/|`
break
Expand Down
4 changes: 0 additions & 4 deletions packages/server-core/src/route/route/route.seed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ export async function seed(knex: Knex): Promise<void> {
project: 'default-project',
route: '/capture'
},
{
project: 'default-project',
route: '/xadm'
},
{
project: 'default-project',
route: '/chat'
Expand Down