Skip to content

Commit

Permalink
Somes fixes relative to #726
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarbet committed May 20, 2022
1 parent a92bbd7 commit bff0196
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 75 deletions.
3 changes: 1 addition & 2 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { LandingPageComponent } from '@components/landing-page/landing-page.component';
import { MainFormInitializedGuard } from '@guards/main-form-initialized/main-form-initialized.guard';
import { PageNotFoundComponent } from '@components/page-not-found/page-not-found.component';
import { CollectionComponent } from '@components/collection/collection.component';


Expand Down Expand Up @@ -76,7 +75,7 @@ const routes: Routes = [
loadChildren: () => import('./modules/external-node-config/external-node-config.module').then(m => m.ExternalNodeConfigModule),
canActivate: [MainFormInitializedGuard]
},
{ path: '**', component: PageNotFoundComponent }
{ path: '**', redirectTo: '' }
];

@NgModule({
Expand Down
2 changes: 0 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { LandingPageComponent, LandingPageDialogComponent } from '@components/landing-page/landing-page.component';
import { LeftMenuComponent } from '@components/left-menu/left-menu.component';
import { PageNotFoundComponent } from '@components/page-not-found/page-not-found.component';
import { LookAndFeelConfigModule } from '@look-and-feel-config/look-and-feel-config.module';
import { MapConfigModule } from '@map-config/map-config.module';
import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
Expand Down Expand Up @@ -77,7 +76,6 @@ export function createTranslateLoader(http: HttpClient) {
declarations: [
AppComponent,
LeftMenuComponent,
PageNotFoundComponent,
LandingPageComponent,
LandingPageDialogComponent,
StatusComponent,
Expand Down
4 changes: 4 additions & 0 deletions src/app/components/landing-page/landing-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,16 @@ export class LandingPageDialogComponent implements OnInit, OnDestroy {
public loadConfig(id: string) {
this.persistenceService.get(id).subscribe(data => {
const configJson = JSON.parse(data.doc_value) as Config;
console.log(configJson);
console.log(data.doc_key);

if (configJson.arlas !== undefined) {
const configMapJson = configJson.arlas.web.components.mapgl.input.mapLayers as MapConfig;
this.initWithConfig(configJson, configMapJson, id, data.doc_key);
} else {
this.configChoice = InitialChoice.setup;
}
this.mainFormService.configurationName = data.doc_key;
this.mainFormService.configurationId = id;
});
}
Expand Down

This file was deleted.

18 changes: 0 additions & 18 deletions src/app/components/page-not-found/page-not-found.component.scss

This file was deleted.

18 changes: 0 additions & 18 deletions src/app/components/page-not-found/page-not-found.component.spec.ts

This file was deleted.

33 changes: 0 additions & 33 deletions src/app/components/page-not-found/page-not-found.component.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
"global": {
"name": "Search...",
"searchField": "internal.fulltext",
"autocompleteField": "internal.fulltext",
"autocompleteField": "internal.autocomplete",
"autocompleteSize": 10,
"unmanagedFields": {
"icon": "search"
Expand Down

0 comments on commit bff0196

Please sign in to comment.