feat(common): refact in submodule (#1155)

* feat(common): refact in submodule * fix: provider import (#1156) * build: update igo2-lib to v17.0.0-next.7
infra-geo-ouverte · May 16, 2024 · 76fb402 · 76fb402
1 parent e1e9fbc
commit 76fb402
Show file tree

Hide file tree

Showing 12 changed files with 4,968 additions and 3,939 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,13 +55,13 @@
     "@angular/platform-browser-dynamic": "^17.0.7",
     "@angular/router": "^17.0.7",
     "@angular/service-worker": "^17.0.7",
-    "@igo2/auth": "^17.0.0-next.6",
-    "@igo2/common": "^17.0.0-next.6",
-    "@igo2/context": "^17.0.0-next.6",
-    "@igo2/core": "^17.0.0-next.6",
-    "@igo2/geo": "^17.0.0-next.6",
-    "@igo2/integration": "^17.0.0-next.6",
-    "@igo2/utils": "^17.0.0-next.6",
+    "@igo2/auth": "^17.0.0-next.7",
+    "@igo2/common": "^17.0.0-next.7",
+    "@igo2/context": "^17.0.0-next.7",
+    "@igo2/core": "^17.0.0-next.7",
+    "@igo2/geo": "^17.0.0-next.7",
+    "@igo2/integration": "^17.0.0-next.7",
+    "@igo2/utils": "^17.0.0-next.7",
     "core-js": "^3.32.2",
     "hammerjs": "^2.0.8",
     "ol": "^9.1.0",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -5,7 +5,8 @@ import { NavigationEnd, Router } from '@angular/router';
 
 import { AuthOptions } from '@igo2/auth';
 import { AuthFormComponent } from '@igo2/auth/form';
-import { SpinnerComponent, StopPropagationDirective } from '@igo2/common';
+import { SpinnerComponent } from '@igo2/common/spinner';
+import { StopPropagationDirective } from '@igo2/common/stop-propagation';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';

diff --git a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
@@ -7,7 +7,7 @@ import {
   Output
 } from '@angular/core';
 
-import { BackdropComponent } from '@igo2/common';
+import { BackdropComponent } from '@igo2/common/backdrop';
 
 import { ExpansionPanelHeaderComponent } from './expansion-panel-header.component';
 import { showContent } from './expansion-panel.animations';

diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
@@ -25,24 +25,31 @@ import { AuthService } from '@igo2/auth';
 import {
   ActionStore,
   ActionbarComponent,
-  ActionbarMode,
-  BackdropComponent,
+  ActionbarMode
+} from '@igo2/common/action';
+import { BackdropComponent } from '@igo2/common/backdrop';
+import {
   ContextMenuDirective,
+  LongPressDirective
+} from '@igo2/common/context-menu';
+import {
   ENTITY_DIRECTIVES,
   EntityRecord,
   EntityStore,
-  EntityTablePaginatorOptions,
+  EntityTablePaginatorOptions
+} from '@igo2/common/entity';
+import {
   IconSvg,
   IgoIconComponent,
-  LongPressDirective,
-  MAGNIFY_SCAN_ICON,
-  Tool,
-  Toolbox,
+  MAGNIFY_SCAN_ICON
+} from '@igo2/common/icon';
+import { Tool, Toolbox } from '@igo2/common/tool';
+import { Widget } from '@igo2/common/widget';
+import {
   WORKSPACE_DIRECTIVES,
-  Widget,
   Workspace,
   WorkspaceStore
-} from '@igo2/common';
+} from '@igo2/common/workspace';
 import {
   DetailedContext,
   LayerContextDirective,
@@ -93,8 +100,19 @@ import {
   handleFileImportError,
   handleFileImportSuccess,
   moveToOlFeatures,
+  provideDirection,
+  provideSearch,
   sourceCanReverseSearch,
-  sourceCanSearch
+  sourceCanSearch,
+  withCadastreSource,
+  withCoordinatesReverseSource,
+  withIChercheReverseSource,
+  withIChercheSource,
+  withILayerSource,
+  withNominatimSource,
+  withOsrmSource,
+  withStoredQueriesSource,
+  withWorkspaceSource
 } from '@igo2/geo';
 import {
   AnalyticsListenerService,
@@ -185,6 +203,20 @@ import { WelcomeWindowService } from './welcome-window/welcome-window.service';
     WORKSPACE_DIRECTIVES,
     WorkspaceUpdatorDirective,
     IgoIconComponent
+  ],
+  providers: [
+    provideSearch([
+      withCadastreSource(),
+      withCoordinatesReverseSource(),
+      withIChercheReverseSource(),
+      withIChercheSource(),
+      withILayerSource(),
+      withNominatimSource(),
+      withStoredQueriesSource(),
+      withWorkspaceSource()
+    ]),
+    provideDirection(withOsrmSource()),
+    SearchState
   ]
 })
 export class PortalComponent implements OnInit, OnDestroy {

diff --git a/src/app/pages/portal/portal.module.ts b/src/app/pages/portal/portal.module.ts
@@ -5,17 +5,8 @@ import {
   IgoDirectionsModule,
   IgoQueryModule,
   IgoSearchModule,
-  provideCadastreSearchSource,
-  provideCoordinatesReverseSearchSource,
-  provideIChercheReverseSearchSource,
-  provideIChercheSearchSource,
-  provideILayerSearchSource,
-  provideNominatimSearchSource,
   provideOptionsApi,
-  provideOsrmDirectionsSource,
-  provideStoredQueriesSearchSource,
-  provideStyleListOptions,
-  provideWorkspaceSearchSource
+  provideStyleListOptions
 } from '@igo2/geo';
 import { AnalyticsListenerService } from '@igo2/integration';
 
@@ -25,23 +16,14 @@ import { PortalComponent } from './portal.component';
   imports: [
     IgoGestureModule.forRoot(),
     IgoQueryModule.forRoot(),
-    IgoSearchModule.forRoot(),
+    IgoSearchModule,
     IgoDirectionsModule,
     PortalComponent
   ],
   exports: [PortalComponent],
   providers: [
     AnalyticsListenerService,
-    provideNominatimSearchSource(),
-    provideIChercheSearchSource(),
-    provideWorkspaceSearchSource(),
-    provideIChercheReverseSearchSource(),
-    provideCoordinatesReverseSearchSource(),
-    provideILayerSearchSource(),
-    provideStoredQueriesSearchSource(),
-    provideOsrmDirectionsSource(),
     provideOptionsApi(),
-    provideCadastreSearchSource(),
     provideStyleListOptions({
       path: './assets/list-style.json'
     })

diff --git a/src/app/pages/portal/sidenav/sidenav.component.ts b/src/app/pages/portal/sidenav/sidenav.component.ts
@@ -13,14 +13,10 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import {
-  HomeButtonComponent,
-  IgoInteractiveTourModule,
-  PanelComponent,
-  Tool,
-  Toolbox,
-  ToolboxComponent
-} from '@igo2/common';
+import { HomeButtonComponent } from '@igo2/common/home-button';
+import { IgoInteractiveTourModule } from '@igo2/common/interactive-tour';
+import { PanelComponent } from '@igo2/common/panel';
+import { Tool, Toolbox, ToolboxComponent } from '@igo2/common/tool';
 import { ConfigService } from '@igo2/core/config';
 import { IgoMap } from '@igo2/geo';
 import { CatalogState, ToolState } from '@igo2/integration';

diff --git a/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts b/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts
@@ -7,7 +7,7 @@ import {
   Output
 } from '@angular/core';
 
-import { PanelComponent } from '@igo2/common';
+import { PanelComponent } from '@igo2/common/panel';
 
 import { showContent } from './toast-panel-for-expansion.animations';
 

diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.ts b/src/app/pages/portal/toast-panel/toast-panel.component.ts
@@ -19,12 +19,11 @@ import {
   Action,
   ActionStore,
   ActionbarComponent,
-  ActionbarMode,
-  EntityStore,
-  PanelComponent,
-  StopPropagationDirective,
-  getEntityTitle
-} from '@igo2/common';
+  ActionbarMode
+} from '@igo2/common/action';
+import { EntityStore, getEntityTitle } from '@igo2/common/entity';
+import { PanelComponent } from '@igo2/common/panel';
+import { StopPropagationDirective } from '@igo2/common/stop-propagation';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { Media, MediaService } from '@igo2/core/media';

diff --git a/src/app/pages/portal/welcome-window/welcome-window.component.ts b/src/app/pages/portal/welcome-window/welcome-window.component.ts
@@ -9,7 +9,8 @@ import {
 } from '@angular/material/dialog';
 import { MatToolbarModule } from '@angular/material/toolbar';
 
-import { CustomHtmlComponent, IgoInteractiveTourModule } from '@igo2/common';
+import { CustomHtmlComponent } from '@igo2/common/custom-html';
+import { IgoInteractiveTourModule } from '@igo2/common/interactive-tour';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 

diff --git a/src/app/services/pwa.service.ts b/src/app/services/pwa.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { SwUpdate } from '@angular/service-worker';
 
-import { ConfirmDialogService } from '@igo2/common';
+import { ConfirmDialogService } from '@igo2/common/confirm-dialog';
 import { LanguageService } from '@igo2/core/language';
 
 import { interval } from 'rxjs';

diff --git a/src/main.ts b/src/main.ts
@@ -18,7 +18,7 @@ import { ServiceWorkerModule } from '@angular/service-worker';
 
 import { provideAuthentification } from '@igo2/auth';
 import { withMicrosoftSupport } from '@igo2/auth/microsoft';
-import { provideIcon } from '@igo2/common';
+import { provideIcon } from '@igo2/common/icon';
 import { IgoCoreModule } from '@igo2/core';
 import { ConfigService, provideConfig } from '@igo2/core/config';
 import { provideTranslation } from '@igo2/core/language';