refactor: remove unused route (#2139)

dasch-swiss · Feb 26, 2025 · 593c19d · 593c19d
1 parent 6c9d1b0
commit 593c19d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/apps/dsp-app/src/app/app-routing.module.ts b/apps/dsp-app/src/app/app-routing.module.ts
@@ -21,7 +21,7 @@ import {
   UsersComponent,
 } from '@dasch-swiss/vre/pages/system/system';
 import { OverviewComponent, UserComponent } from '@dasch-swiss/vre/pages/user-settings/user';
-import { ResourcePage2Component, ResourcePageComponent } from '@dasch-swiss/vre/resource-editor/resource-editor';
+import { ResourcePageComponent, SingleResourcePageComponent } from '@dasch-swiss/vre/resource-editor/resource-editor';
 import { CreateResourcePageComponent } from '@dasch-swiss/vre/resource-editor/resource-properties';
 import { StatusComponent } from '@dasch-swiss/vre/shared/app-common-to-move';
 import { HelpPageComponent } from '@dasch-swiss/vre/shared/app-help-page';
@@ -171,18 +171,8 @@ const routes: Routes = [
     ],
   },
   {
-    path: RouteConstants.resource,
-    children: [
-      {
-        path: RouteConstants.projectResourceValueRelative,
-        component: ResourcePage2Component,
-      },
-      {
-        path: RouteConstants.projectResourceRelative,
-        component: ResourcePage2Component,
-      },
-    ],
-    runGuardsAndResolvers: 'always',
+    path: RouteConstants.projectResourceRelative,
+    component: SingleResourcePageComponent,
   },
   {
     path: RouteConstants.cookiePolicy,

diff --git a/libs/vre/core/config/src/lib/app-config/app-constants.ts b/libs/vre/core/config/src/lib/app-config/app-constants.ts
@@ -88,12 +88,10 @@ export class RouteConstants {
   static readonly projectsRelative = `/${RouteConstants.projects}`;
   static readonly projectRelative = `/${RouteConstants.project}`;
   static readonly projectEditRelative = `${RouteConstants.settings}/${RouteConstants.edit}`;
-  static readonly newProjectRelative = `/${RouteConstants.project}/${RouteConstants.createNew}`;
   static readonly ontologyRelative = `${RouteConstants.ontology}/:${RouteConstants.ontoParameter}`;
   static readonly projectUuidRelative = `${RouteConstants.project}/:${RouteConstants.uuidParameter}`;
   static readonly createNewProjectRelative = `${RouteConstants.project}/${RouteConstants.createNew}`;
-  static readonly projectResourceValueRelative = `:${RouteConstants.projectParameter}/:${RouteConstants.resourceParameter}/:${RouteConstants.valueParameter}`;
-  static readonly projectResourceRelative = `:${RouteConstants.projectParameter}/:${RouteConstants.resourceParameter}`;
+  static readonly projectResourceRelative = `${RouteConstants.resource}/:${RouteConstants.projectParameter}/:${RouteConstants.resourceParameter}`;
 
   static readonly OntologyEditorViewRelative = `${RouteConstants.ontology}/:${RouteConstants.ontoParameter}/${RouteConstants.editor}/:${RouteConstants.viewParameter}`;
   static readonly OntologyClassAddRelative = `${RouteConstants.ontology}/:${RouteConstants.ontoParameter}/:${RouteConstants.classParameter}/${RouteConstants.addClassInstance}`;

diff --git a/libs/vre/resource-editor/resource-editor/src/index.ts b/libs/vre/resource-editor/resource-editor/src/index.ts
@@ -2,7 +2,7 @@ export * from './resource-page.components';
 export * from './lib/resource.component';
 export * from './lib/resource-header.component';
 export * from './lib/resource-page.component';
-export * from './lib/resource-page-2.component';
+export * from './lib/single-resource-page.component';
 export * from './lib/resource-representation.component';
 export * from './lib/resource-tabs.component';
 export * from './lib/resource-toolbar.component';

diff --git a/...itor/src/lib/resource-page-2.component.ts → ...src/lib/single-resource-page.component.ts b/...itor/src/lib/resource-page-2.component.ts → ...src/lib/single-resource-page.component.ts
@@ -7,10 +7,10 @@ import { map } from 'rxjs/operators';
  * This routing issue should be addressed and refactor in order to remove those duplicated components.
  */
 @Component({
-  selector: 'app-resource-page-2',
+  selector: 'app-single-resource-page',
   template: '<app-resource-fetcher *ngIf="resourceIri$ | async as resourceIri" [resourceIri]="resourceIri" />',
 })
-export class ResourcePage2Component {
+export class SingleResourcePageComponent {
   resourceIri$ = this._route.params.pipe(
     map(params => {
       const projectCode = params['project'];

diff --git a/libs/vre/resource-editor/resource-editor/src/resource-page.components.ts b/libs/vre/resource-editor/resource-editor/src/resource-page.components.ts
@@ -7,14 +7,14 @@ import { CompoundViewerComponent } from './lib/compound/compound-viewer.componen
 import { PermissionInfoComponent } from './lib/permission-info/permission-info.component';
 import { ResourceFetcherComponent } from './lib/resource-fetcher.component';
 import { ResourceHeaderComponent } from './lib/resource-header.component';
-import { ResourcePage2Component } from './lib/resource-page-2.component';
 import { ResourcePageComponent } from './lib/resource-page.component';
 import { ResourceRepresentationComponent } from './lib/resource-representation.component';
 import { ResourceRestrictionComponent } from './lib/resource-restriction.component';
 import { ResourceTabsComponent } from './lib/resource-tabs.component';
 import { ResourceToolbarComponent } from './lib/resource-toolbar.component';
 import { ResourceComponent } from './lib/resource.component';
 import { SegmentTabComponent } from './lib/segment-tab.component';
+import { SingleResourcePageComponent } from './lib/single-resource-page.component';
 
 const CompoundComponents = [
   CompoundArrowNavigationComponent,
@@ -27,7 +27,7 @@ export const ResourcePageComponents = [
   ResourceComponent,
   ResourceHeaderComponent,
   ResourcePageComponent,
-  ResourcePage2Component,
+  SingleResourcePageComponent,
   ResourceFetcherComponent,
   ResourceRepresentationComponent,
   ResourceTabsComponent,