@memberjunction/ng-explorer-core 1.3.2 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,4 @@
1
+ import { ComponentRef } from '@angular/core';
1
2
  import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
2
3
  import { SharedService } from '@memberjunction/ng-shared';
3
4
  import { DetachedRouteHandle, RouteReuseStrategy } from '@angular/router';
@@ -5,13 +6,14 @@ import * as i0 from "@angular/core";
5
6
  import * as i1 from "@angular/router";
6
7
  export declare class CustomReuseStrategy implements RouteReuseStrategy {
7
8
  storedRoutes: {
8
- [key: string]: DetachedRouteHandle;
9
+ [key: string]: DetachedRouteHandleExt | null;
9
10
  };
10
11
  shouldDetach(route: ActivatedRouteSnapshot): boolean;
11
- store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void;
12
+ store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandleExt | null): void;
12
13
  shouldAttach(route: ActivatedRouteSnapshot): boolean;
13
14
  retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle | null;
14
15
  shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean;
16
+ private callHook;
15
17
  }
16
18
  export declare class ResourceResolver implements Resolve<void> {
17
19
  private sharedService;
@@ -20,9 +22,13 @@ export declare class ResourceResolver implements Resolve<void> {
20
22
  static ɵfac: i0.ɵɵFactoryDeclaration<ResourceResolver, never>;
21
23
  static ɵprov: i0.ɵɵInjectableDeclaration<ResourceResolver>;
22
24
  }
25
+ interface DetachedRouteHandleExt extends DetachedRouteHandle {
26
+ componentRef: ComponentRef<any>;
27
+ }
23
28
  export declare class AppRoutingModule {
24
29
  static ɵfac: i0.ɵɵFactoryDeclaration<AppRoutingModule, never>;
25
30
  static ɵmod: i0.ɵɵNgModuleDeclaration<AppRoutingModule, never, [typeof i1.RouterModule], [typeof i1.RouterModule]>;
26
31
  static ɵinj: i0.ɵɵInjectorDeclaration<AppRoutingModule>;
27
32
  }
33
+ export {};
28
34
  //# sourceMappingURL=app-routing.module.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"app-routing.module.d.ts","sourceRoot":"","sources":["../src/app-routing.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAkB7G,OAAO,EAAc,aAAa,EAAgB,MAAM,2BAA2B,CAAC;AAEpF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;;;AAE1E,qBAAa,mBAAoB,YAAW,kBAAkB;IAC5D,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAG1D,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAMpD,KAAK,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAOvE,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAOpD,QAAQ,CAAC,KAAK,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,IAAI;IAQnE,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO;CAGxF;AAED,qBAGa,gBAAiB,YAAW,OAAO,CAAC,IAAI,CAAC;IACxC,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEhD,OAAO,CAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,mBAAmB,GAAG,IAAI;yCAH7D,gBAAgB;6CAAhB,gBAAgB;CA2D5B;AAgDD,qBAIa,gBAAgB;yCAAhB,gBAAgB;0CAAhB,gBAAgB;0CAAhB,gBAAgB;CAAG"}
1
+ {"version":3,"file":"app-routing.module.d.ts","sourceRoot":"","sources":["../src/app-routing.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAwB,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAkB7G,OAAO,EAAc,aAAa,EAAgB,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;;;AAE1E,qBAAa,mBAAoB,YAAW,kBAAkB;IAC5D,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAAA;KAAE,CAAM;IAGpE,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAMpD,KAAK,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,sBAAsB,GAAG,IAAI,GAAG,IAAI;IAYjF,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAUpD,QAAQ,CAAC,KAAK,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,IAAI;IAgBnE,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO;IAIvF,OAAO,CAAC,QAAQ;CAUjB;AAED,qBAGa,gBAAiB,YAAW,OAAO,CAAC,IAAI,CAAC;IACxC,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEhD,OAAO,CAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,mBAAmB,GAAG,IAAI;yCAH7D,gBAAgB;6CAAhB,gBAAgB;CA2D5B;AAgDD,UAAU,sBAAuB,SAAQ,mBAAmB;IAC1D,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;CACjC;AAED,qBAKa,gBAAgB;yCAAhB,gBAAgB;0CAAhB,gBAAgB;0CAAhB,gBAAgB;CAAG"}
@@ -21,16 +21,21 @@ export class CustomReuseStrategy {
21
21
  }
22
22
  // Stores the detached route
23
23
  store(route, handle) {
24
+ if (!handle) {
25
+ return;
26
+ }
24
27
  if (route.routeConfig && route.routeConfig.path) {
25
28
  this.storedRoutes[route.routeConfig.path] = handle;
29
+ this.callHook(handle, 'ngOnDetach');
26
30
  }
27
31
  }
28
32
  // Determines if a stored route should be reattached
29
33
  shouldAttach(route) {
30
34
  var _a;
31
35
  // Reattach if we have a stored route for the incoming route
32
- if ((_a = route.routeConfig) === null || _a === void 0 ? void 0 : _a.path)
36
+ if ((_a = route.routeConfig) === null || _a === void 0 ? void 0 : _a.path) {
33
37
  return !!route.routeConfig && !!this.storedRoutes[route.routeConfig.path];
38
+ }
34
39
  else
35
40
  return false;
36
41
  }
@@ -39,15 +44,28 @@ export class CustomReuseStrategy {
39
44
  if (!route.routeConfig || (route.routeConfig.path && !this.storedRoutes[route.routeConfig.path])) {
40
45
  return null;
41
46
  }
42
- else if (route.routeConfig.path)
43
- return this.storedRoutes[route.routeConfig.path];
44
- else
45
- return null;
47
+ else if (route.routeConfig.path) {
48
+ const path = this.storedRoutes[route.routeConfig.path];
49
+ if (path) {
50
+ this.callHook(path, 'ngOnAttach');
51
+ return path;
52
+ }
53
+ }
54
+ return null;
46
55
  }
47
56
  // Determines if the route should be reused
48
57
  shouldReuseRoute(future, curr) {
49
58
  return future.routeConfig === curr.routeConfig;
50
59
  }
60
+ callHook(detachedTree, hookName) {
61
+ if (!detachedTree || !hookName) {
62
+ return;
63
+ }
64
+ const componentRef = detachedTree.componentRef;
65
+ if (componentRef && componentRef.instance && typeof componentRef.instance[hookName] === 'function') {
66
+ componentRef.instance[hookName]();
67
+ }
68
+ }
51
69
  }
52
70
  export class ResourceResolver {
53
71
  constructor(sharedService) {
@@ -1 +1 @@
1
- {"version":3,"file":"user-notifications.component.d.ts","sourceRoot":"","sources":["../../../src/lib/user-notifications/user-notifications.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAY,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAEzC,qBAKa,0BAA2B,YAAW,aAAa;IAQ1C,aAAa,EAAE,aAAa;IAAE,OAAO,CAAC,MAAM;IAPzC,QAAQ,EAAG,UAAU,CAAC;IACnB,WAAW,EAAG,UAAU,CAAC;IAC3B,SAAS,EAAG,UAAU,CAAC;IAExC,aAAa,EAAE,MAAM,CAAS;IAC9B,aAAa,EAAE,MAAM,CAAM;gBAEd,aAAa,EAAE,aAAa,EAAU,MAAM,EAAE,MAAM;IAExE,eAAe,IAAI,IAAI;IAIvB,IAAW,mBAAmB,IAAI,sBAAsB,EAAE,CAqBzD;IAEM,uBAAuB,CAAC,YAAY,EAAE,sBAAsB,GAAG,OAAO;IAKtE,eAAe,CAAC,YAAY,EAAE,sBAAsB,GAAG;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC;IA4CvG,IAAW,gBAAgB,IAAI,sBAAsB,EAAE,CAEtD;IAED,IAAW,mBAAmB,IAAI,sBAAsB,EAAE,CAEzD;IAED,IAAW,iBAAiB,IAAI,sBAAsB,EAAE,CAEvD;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAgBtC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAMtC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,iBAAiB,CAAC,YAAY,EAAE,sBAAsB;IAStD,mBAAmB,CAAC,YAAY,EAAE,sBAAsB;IAYlD,UAAU,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCpH,aAAa;IAIb,eAAe;IAIf,OAAO,CAAC,KAAK,EAAE,OAAO;IAwBnC,mBAAmB,CAAC,YAAY,EAAE,sBAAsB;yCAxN7C,0BAA0B;2CAA1B,0BAA0B;CAyOtC"}
1
+ {"version":3,"file":"user-notifications.component.d.ts","sourceRoot":"","sources":["../../../src/lib/user-notifications/user-notifications.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAY,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAEzC,qBAKa,0BAA2B,YAAW,aAAa;IAQ1C,aAAa,EAAE,aAAa;IAAE,OAAO,CAAC,MAAM;IAPzC,QAAQ,EAAG,UAAU,CAAC;IACnB,WAAW,EAAG,UAAU,CAAC;IAC3B,SAAS,EAAG,UAAU,CAAC;IAExC,aAAa,EAAE,MAAM,CAAS;IAC9B,aAAa,EAAE,MAAM,CAAM;gBAEd,aAAa,EAAE,aAAa,EAAU,MAAM,EAAE,MAAM;IAExE,eAAe,IAAI,IAAI;IAIvB,IAAW,mBAAmB,IAAI,sBAAsB,EAAE,CAqBzD;IAEM,uBAAuB,CAAC,YAAY,EAAE,sBAAsB,GAAG,OAAO;IAKtE,eAAe,CAAC,YAAY,EAAE,sBAAsB,GAAG;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC;IA4CvG,IAAW,gBAAgB,IAAI,sBAAsB,EAAE,CAEtD;IAED,IAAW,mBAAmB,IAAI,sBAAsB,EAAE,CAEzD;IAED,IAAW,iBAAiB,IAAI,sBAAsB,EAAE,CAEvD;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAgBtC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAMtC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,iBAAiB,CAAC,YAAY,EAAE,sBAAsB;IAStD,mBAAmB,CAAC,YAAY,EAAE,sBAAsB;IAYlD,UAAU,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCpH,aAAa;IAIb,eAAe;IAIf,OAAO,CAAC,KAAK,EAAE,OAAO;IAwBnC,mBAAmB,CAAC,YAAY,EAAE,sBAAsB;yCAxN7C,0BAA0B;2CAA1B,0BAA0B;CAuOtC"}
@@ -334,8 +334,9 @@ export class UserNotificationsComponent {
334
334
  const fullUrl = `${info.urlParts.join('/')}${info.queryString ? '?' + info.queryString : ''}`;
335
335
  this.router.navigateByUrl(fullUrl);
336
336
  }
337
- else
337
+ else {
338
338
  this.router.navigate(info.urlParts);
339
+ }
339
340
  }
340
341
  }
341
342
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/ng-explorer-core",
3
- "version": "1.3.2",
3
+ "version": "1.4.0",
4
4
  "description": "MemberJunction Explorer: Core Angular Components",
5
5
  "main": "./dist/public-api.js",
6
6
  "typings": "./dist/public-api.d.ts",
@@ -26,21 +26,21 @@
26
26
  "@angular/router": "~17.2.2"
27
27
  },
28
28
  "dependencies": {
29
- "@memberjunction/global": "~1.3.2",
30
- "@memberjunction/core": "~1.3.2",
31
- "@memberjunction/ng-compare-records": "~1.3.2",
32
- "@memberjunction/ng-file-storage": "~1.3.2",
33
- "@memberjunction/ng-record-changes": "~1.3.2",
34
- "@memberjunction/ng-container-directives": "~1.3.2",
35
- "@memberjunction/ng-user-view-grid": "~1.3.2",
36
- "@memberjunction/ng-query-grid": "~1.3.2",
37
- "@memberjunction/ng-user-view-properties": "~1.3.2",
38
- "@memberjunction/ng-shared": "~1.3.2",
39
- "@memberjunction/ng-tabstrip": "~1.3.2",
40
- "@memberjunction/ng-ask-skip": "~1.3.2",
41
- "@memberjunction/ng-auth-services": "~1.3.2",
42
- "@memberjunction/ng-explorer-settings": "~1.3.2",
43
- "@memberjunction/ng-base-forms": "~1.3.2",
29
+ "@memberjunction/global": "~1.4.0",
30
+ "@memberjunction/core": "~1.4.0",
31
+ "@memberjunction/ng-compare-records": "~1.4.0",
32
+ "@memberjunction/ng-file-storage": "~1.4.0",
33
+ "@memberjunction/ng-record-changes": "~1.4.0",
34
+ "@memberjunction/ng-container-directives": "~1.4.0",
35
+ "@memberjunction/ng-user-view-grid": "~1.4.0",
36
+ "@memberjunction/ng-query-grid": "~1.4.0",
37
+ "@memberjunction/ng-user-view-properties": "~1.4.0",
38
+ "@memberjunction/ng-shared": "~1.4.0",
39
+ "@memberjunction/ng-tabstrip": "~1.4.0",
40
+ "@memberjunction/ng-ask-skip": "~1.4.0",
41
+ "@memberjunction/ng-auth-services": "~1.4.0",
42
+ "@memberjunction/ng-explorer-settings": "~1.4.0",
43
+ "@memberjunction/ng-base-forms": "~1.4.0",
44
44
  "@progress/kendo-angular-grid": "~15.1.0",
45
45
  "@progress/kendo-angular-buttons": "~15.1.0",
46
46
  "@progress/kendo-angular-listview": "~15.1.0",