geonetwork-ui 2.7.2-dev.a33d4e84e → 2.7.2-dev.c95657518
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.
- package/esm2022/libs/api/repository/src/lib/gn4/auth/auth.service.mjs +2 -2
- package/esm2022/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.mjs +10 -10
- package/esm2022/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.mjs +3 -2
- package/esm2022/libs/feature/record/src/lib/map-view/map-view.component.mjs +2 -1
- package/fesm2022/geonetwork-ui.mjs +8 -7
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/api/repository/src/lib/gn4/auth/auth.service.d.ts.map +1 -1
- package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts +7 -7
- package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts.map +1 -1
- package/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.d.ts.map +1 -1
- package/libs/feature/record/src/lib/map-view/map-view.component.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts +4 -1
- package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +37 -36
- package/src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts +3 -2
- package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/auth/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,cAAc,EAAY,MAAM,eAAe,CAAA;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;;AAE1C,eAAO,MAAM,qBAAqB,oEAAsE,CAAA;AACxG,eAAO,MAAM,SAAS,wBAAyC,CAAA;AAE/D,eAAO,MAAM,sBAAsB,wBAAwB,CAAA;AAC3D,eAAO,MAAM,UAAU,wBAA0C,CAAA;AAEjE,eAAO,MAAM,wBAAwB,4EAA6E,CAAA;AAClH,eAAO,MAAM,YAAY,wBAA4C,CAAA;AAErE,qBAGa,WAAW;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/auth/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,cAAc,EAAY,MAAM,eAAe,CAAA;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;;AAE1C,eAAO,MAAM,qBAAqB,oEAAsE,CAAA;AACxG,eAAO,MAAM,SAAS,wBAAyC,CAAA;AAE/D,eAAO,MAAM,sBAAsB,wBAAwB,CAAA;AAC3D,eAAO,MAAM,UAAU,wBAA0C,CAAA;AAEjE,eAAO,MAAM,wBAAwB,4EAA6E,CAAA;AAClH,eAAO,MAAM,YAAY,wBAA4C,CAAA;AAErE,qBAGa,WAAW;IAuCW,OAAO,CAAC,iBAAiB;IACxB,OAAO,CAAC,kBAAkB;IACxB,OAAO,CAAC,oBAAoB;IAC9D,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,QAAQ;IA1ClB,YAAY,SAAkD;IAC9D,aAAa,SAAoD;IACjE,eAAe,SAAwD;IAEvE,IAAI,QAAQ,WAoBX;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,WAAW,WAKd;gBAGwC,iBAAiB,EAAE,MAAM,EACxB,kBAAkB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC9D,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,QAAQ;yCA3CjB,WAAW;6CAAX,WAAW;CA6CvB"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
+
import { HttpClient } from '@angular/common/http';
|
|
1
2
|
import { InjectionToken } from '@angular/core';
|
|
2
|
-
import { MeApiService, RecordsApiService, RegistriesApiService, ToolsApiService, UserfeedbackApiService, UsersApiService } from '../../../../../../../libs/data-access/gn4/src';
|
|
3
|
-
import { PlatformServiceInterface, UploadEvent } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface';
|
|
4
|
-
import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model';
|
|
5
3
|
import { CatalogRecord, Keyword, Organization, UserFeedback } from '../../../../../../../libs/common/domain/src/lib/model/record';
|
|
6
|
-
import { Gn4PlatformMapper } from './gn4-platform.mapper';
|
|
7
|
-
import { HttpClient } from '@angular/common/http';
|
|
8
4
|
import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus';
|
|
9
|
-
import {
|
|
5
|
+
import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model';
|
|
6
|
+
import { PlatformServiceInterface, UploadEvent } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface';
|
|
7
|
+
import { MeApiService, RecordsApiService, RegistriesApiService, ToolsApiService, UserfeedbackApiService, UsersApiService } from '../../../../../../../libs/data-access/gn4/src';
|
|
10
8
|
import { TranslateService } from '@ngx-translate/core';
|
|
9
|
+
import { Observable } from 'rxjs';
|
|
11
10
|
import { Gn4SettingsService } from '../settings/gn4-settings.service';
|
|
11
|
+
import { Gn4PlatformMapper } from './gn4-platform.mapper';
|
|
12
12
|
import * as i0 from "@angular/core";
|
|
13
13
|
export declare const DISABLE_AUTH: InjectionToken<boolean>;
|
|
14
14
|
export declare class Gn4PlatformService implements PlatformServiceInterface {
|
|
@@ -24,11 +24,11 @@ export declare class Gn4PlatformService implements PlatformServiceInterface {
|
|
|
24
24
|
private settingsService;
|
|
25
25
|
private disableAuth;
|
|
26
26
|
private readonly type;
|
|
27
|
-
private readonly me$;
|
|
28
27
|
private readonly users$;
|
|
29
28
|
private readonly isUserAnonymous$;
|
|
30
29
|
private readonly gnParseVersion;
|
|
31
30
|
private keyTranslations$;
|
|
31
|
+
private me$;
|
|
32
32
|
/**
|
|
33
33
|
* A map of already loaded thesauri (groups of keywords); the key is a URI
|
|
34
34
|
* @private
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gn4-platform.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,cAAc,EAAY,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"gn4-platform.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gn4-settings.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAA;
|
|
1
|
+
{"version":3,"file":"gn4-settings.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAiB,MAAM,MAAM,CAAA;;AAGhD,qBAGa,kBAAkB;IAgBjB,OAAO,CAAC,cAAc;IAf3B,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAEpC;IAEM,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CACkB;IAE1D,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,CAE1C;IAEM,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,CAErC;gBAEmB,cAAc,EAAE,cAAc;IAElD,OAAO,CAAC,wBAAwB;yCAlBrB,kBAAkB;6CAAlB,kBAAkB;CAyB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-view.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/map-view/map-view.component.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,iBAAiB,EAEjB,YAAY,EAIb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAExE,OAAO,EACL,eAAe,EAGf,UAAU,EAKX,MAAM,MAAM,CAAA;AAWb,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACxE,OAAO,EACL,qBAAqB,EAEtB,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAEL,UAAU,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAEL,qBAAqB,EAGtB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAYjC,OAAO,EAGL,gBAAgB,EACjB,MAAM,qBAAqB,CAAA;AAO5B,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAA;;AAOzE,qBA2Ba,gBAAiB,YAAW,aAAa;
|
|
1
|
+
{"version":3,"file":"map-view.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/map-view/map-view.component.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,iBAAiB,EAEjB,YAAY,EAIb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAExE,OAAO,EACL,eAAe,EAGf,UAAU,EAKX,MAAM,MAAM,CAAA;AAWb,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACxE,OAAO,EACL,qBAAqB,EAEtB,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAEL,UAAU,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAEL,qBAAqB,EAGtB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAYjC,OAAO,EAGL,gBAAgB,EACjB,MAAM,qBAAqB,CAAA;AAO5B,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAA;;AAOzE,qBA2Ba,gBAAiB,YAAW,aAAa;IAiPlD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,gBAAgB;IApP1B,IAAa,YAAY,CAAC,KAAK,EAAE,OAAO,EAEvC;IACD,eAAe,uBAA4B;IAC3C,eAAe,MAAO;IACtB,gBAAgB,MAAO;IAEvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAY;IAEvD,IAAa,YAAY,CAAC,KAAK,EAAE,MAAM,EAEtC;IACD,IAAa,aAAa,CAAC,KAAK,EAAE,GAAG,EAUpC;IACQ,aAAa,UAAO;IACnB,YAAY,sCAA4C;IACxD,aAAa,uBAA6B;IACzB,YAAY,EAAE,qBAAqB,CAAA;IAE9D,WAAW,2BAA6B;IACxC,WAAW,UAAQ;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,UAAO;IACjB,YAAY,UAAQ;IACpB,OAAO,UAAQ;IACf,KAAK,MAAO;IAEZ,mBAAmB,CAAC,EAAE,EAAE,MAAM;IAI9B,oBAAoB,CAAC,CAAC,EAAE,MAAM;IAK9B,YAAY;IAGZ,oBAAoB,CAAC,CAAC,EAAE,OAAO;IAI/B,mBAAmB,oBASlB;IAED,gBAAgB;;;SAaf;IAED,aAAa,uBAA4B;IACzC,eAAe,uBAA4B;IAC3C,gBAAgB,uBAA4B;IAE5C,mBAAmB,kBA+BlB;IAED,WAAW,kBAyCV;IAED,qBAAqB,kBAcpB;IAED,aAAa,kBAOZ;IAED,cAAc,oBAwBb;IAED,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CA4BlC;gBAGS,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,iBAAiB,EAC5B,gBAAgB,EAAE,gBAAgB;IAGtC,eAAe;IAKrB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI;IAU7C,iBAAiB,CAAC,KAAK,EAAE,oBAAoB;IAU7C,cAAc,IAAI,IAAI;IAQtB,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,UAAU,CAAC,eAAe,CAAC;IAuD1E,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK,GAAG,MAAM;yCAhVnC,gBAAgB;2CAAhB,gBAAgB;CAmW5B"}
|
package/package.json
CHANGED
|
@@ -33,7 +33,10 @@ export class AuthService {
|
|
|
33
33
|
return baseUrl
|
|
34
34
|
.replace(
|
|
35
35
|
'${current_url}',
|
|
36
|
-
new URL(
|
|
36
|
+
new URL(
|
|
37
|
+
this.location.prepareExternalUrl(this.location.path()),
|
|
38
|
+
window.location.href
|
|
39
|
+
).toString()
|
|
37
40
|
)
|
|
38
41
|
.replace('${lang2}', toLang2(this.translateService.currentLang))
|
|
39
42
|
.replace('${lang3}', toLang3(this.translateService.currentLang))
|
|
@@ -1,12 +1,21 @@
|
|
|
1
|
+
import { HttpClient, HttpEventType } from '@angular/common/http'
|
|
1
2
|
import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
|
|
2
3
|
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
KeywordApiResponse,
|
|
5
|
+
ThesaurusApiResponse,
|
|
6
|
+
} from '../../../../../../../libs/api/metadata-converter/src'
|
|
7
|
+
import {
|
|
8
|
+
CatalogRecord,
|
|
9
|
+
Keyword,
|
|
10
|
+
Organization,
|
|
11
|
+
UserFeedback,
|
|
12
|
+
} from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
13
|
+
import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
|
|
14
|
+
import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
|
|
15
|
+
import {
|
|
16
|
+
PlatformServiceInterface,
|
|
17
|
+
UploadEvent,
|
|
18
|
+
} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
10
19
|
import {
|
|
11
20
|
MeApiService,
|
|
12
21
|
RecordsApiService,
|
|
@@ -15,26 +24,9 @@ import {
|
|
|
15
24
|
UserfeedbackApiService,
|
|
16
25
|
UsersApiService,
|
|
17
26
|
} from '../../../../../../../libs/data-access/gn4/src'
|
|
18
|
-
import {
|
|
19
|
-
PlatformServiceInterface,
|
|
20
|
-
UploadEvent,
|
|
21
|
-
} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
22
|
-
import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
|
|
23
|
-
import {
|
|
24
|
-
CatalogRecord,
|
|
25
|
-
Keyword,
|
|
26
|
-
Organization,
|
|
27
|
-
UserFeedback,
|
|
28
|
-
} from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
29
|
-
import { Gn4PlatformMapper } from './gn4-platform.mapper'
|
|
30
|
-
import { ltr } from 'semver'
|
|
31
|
-
import { HttpClient, HttpEventType } from '@angular/common/http'
|
|
32
|
-
import {
|
|
33
|
-
KeywordApiResponse,
|
|
34
|
-
ThesaurusApiResponse,
|
|
35
|
-
} from '../../../../../../../libs/api/metadata-converter/src'
|
|
36
|
-
import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
|
|
27
|
+
import { toLang3 } from '../../../../../../../libs/util/i18n/src'
|
|
37
28
|
import { noDuplicateFileName } from '../../../../../../../libs/util/shared/src'
|
|
29
|
+
import { TranslateService } from '@ngx-translate/core'
|
|
38
30
|
import {
|
|
39
31
|
combineLatest,
|
|
40
32
|
forkJoin,
|
|
@@ -43,9 +35,17 @@ import {
|
|
|
43
35
|
switchMap,
|
|
44
36
|
throwError,
|
|
45
37
|
} from 'rxjs'
|
|
46
|
-
import {
|
|
47
|
-
|
|
38
|
+
import {
|
|
39
|
+
catchError,
|
|
40
|
+
filter,
|
|
41
|
+
map,
|
|
42
|
+
mergeMap,
|
|
43
|
+
shareReplay,
|
|
44
|
+
tap,
|
|
45
|
+
} from 'rxjs/operators'
|
|
46
|
+
import { ltr } from 'semver'
|
|
48
47
|
import { Gn4SettingsService } from '../settings/gn4-settings.service'
|
|
48
|
+
import { Gn4PlatformMapper } from './gn4-platform.mapper'
|
|
49
49
|
|
|
50
50
|
const minApiVersion = '4.2.2'
|
|
51
51
|
|
|
@@ -56,7 +56,6 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
|
|
|
56
56
|
@Injectable()
|
|
57
57
|
export class Gn4PlatformService implements PlatformServiceInterface {
|
|
58
58
|
private readonly type = 'GeoNetwork'
|
|
59
|
-
private readonly me$: Observable<UserModel>
|
|
60
59
|
private readonly users$: Observable<UserModel[]>
|
|
61
60
|
private readonly isUserAnonymous$: Observable<boolean>
|
|
62
61
|
private readonly gnParseVersion = '4.2.5'
|
|
@@ -70,6 +69,15 @@ export class Gn4PlatformService implements PlatformServiceInterface {
|
|
|
70
69
|
}),
|
|
71
70
|
shareReplay(1)
|
|
72
71
|
)
|
|
72
|
+
|
|
73
|
+
private me$ = this.disableAuth
|
|
74
|
+
? of(null)
|
|
75
|
+
: of(true).pipe(
|
|
76
|
+
switchMap(() => this.meApi.getMe()),
|
|
77
|
+
switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
|
|
78
|
+
shareReplay({ bufferSize: 1, refCount: true })
|
|
79
|
+
)
|
|
80
|
+
|
|
73
81
|
/**
|
|
74
82
|
* A map of already loaded thesauri (groups of keywords); the key is a URI
|
|
75
83
|
* @private
|
|
@@ -93,13 +101,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
|
|
|
93
101
|
private settingsService: Gn4SettingsService,
|
|
94
102
|
@Inject(DISABLE_AUTH) @Optional() private disableAuth: boolean
|
|
95
103
|
) {
|
|
96
|
-
this.me$ = this.disableAuth
|
|
97
|
-
? of(null)
|
|
98
|
-
: this.meApi.getMe().pipe(
|
|
99
|
-
switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
|
|
100
|
-
shareReplay({ bufferSize: 1, refCount: true })
|
|
101
|
-
)
|
|
102
|
-
|
|
103
104
|
this.isUserAnonymous$ = this.me$.pipe(
|
|
104
105
|
map((user) => !user || !('id' in user))
|
|
105
106
|
)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core'
|
|
2
2
|
import { SiteApiService } from '../../../../../../../libs/data-access/gn4/src'
|
|
3
|
+
import { Observable, of, switchMap } from 'rxjs'
|
|
3
4
|
import { map, shareReplay } from 'rxjs/operators'
|
|
4
|
-
import { Observable } from 'rxjs'
|
|
5
5
|
|
|
6
6
|
@Injectable({
|
|
7
7
|
providedIn: 'root',
|
|
@@ -25,7 +25,8 @@ export class Gn4SettingsService {
|
|
|
25
25
|
constructor(private siteApiService: SiteApiService) {}
|
|
26
26
|
|
|
27
27
|
private getSettingsSetValueByKey(key: string) {
|
|
28
|
-
return
|
|
28
|
+
return of(true).pipe(
|
|
29
|
+
switchMap(() => this.siteApiService.getSettingsSet(null, [key])),
|
|
29
30
|
map((v) => v[key]),
|
|
30
31
|
shareReplay({ bufferSize: 1, refCount: true })
|
|
31
32
|
)
|
|
@@ -114,6 +114,7 @@ export class MapViewComponent implements AfterViewInit {
|
|
|
114
114
|
_styleFromConfig = null
|
|
115
115
|
|
|
116
116
|
linkMap: Map<string, DatasetOnlineResource> = new Map()
|
|
117
|
+
// FIXME the map view component should not need a selectedView
|
|
117
118
|
@Input() set selectedView(value: string) {
|
|
118
119
|
this.selectedView$.next(value)
|
|
119
120
|
}
|