arlas-web-core 24.0.0-beta.2 → 24.1.0-beta.1
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/models/contributor.d.ts
CHANGED
|
@@ -14,9 +14,10 @@ export declare abstract class Contributor {
|
|
|
14
14
|
collection: string;
|
|
15
15
|
collections: CollectionAggField[];
|
|
16
16
|
endCollaborationEvent: Subject<unknown>;
|
|
17
|
+
linkedContributorId: string;
|
|
17
18
|
protected cacheDuration: number;
|
|
18
19
|
/**
|
|
19
|
-
* @param identifier
|
|
20
|
+
* @param identifier identifier of the contributor.
|
|
20
21
|
* @param configService configService of the contributor.
|
|
21
22
|
*/
|
|
22
23
|
constructor(identifier: string, configService: ConfigService, collaborativeSearcheService: CollaborativesearchService, collection?: string);
|
|
@@ -29,6 +30,9 @@ export declare abstract class Contributor {
|
|
|
29
30
|
* @returns value of the `key` in configuration.
|
|
30
31
|
*/
|
|
31
32
|
getConfigValue(key: string): any;
|
|
33
|
+
abstract isUpdateEnabledOnOwnCollaboration(): boolean;
|
|
34
|
+
isMyOwnCollaboration(collaborationEvent: CollaborationEvent): boolean;
|
|
35
|
+
isMyLinkedContributorCollaboration(collaborationEvent: CollaborationEvent): boolean;
|
|
32
36
|
/**
|
|
33
37
|
* @returns name of contributor set in configuration.
|
|
34
38
|
*/
|
package/models/contributor.js
CHANGED
|
@@ -21,7 +21,7 @@ import { map, finalize, debounceTime } from 'rxjs/operators';
|
|
|
21
21
|
import { hasAtLeastOneCommon as hasAtLeastOneCommon } from '../utils/utils';
|
|
22
22
|
export class Contributor {
|
|
23
23
|
/**
|
|
24
|
-
* @param identifier
|
|
24
|
+
* @param identifier identifier of the contributor.
|
|
25
25
|
* @param configService configService of the contributor.
|
|
26
26
|
*/
|
|
27
27
|
constructor(identifier, configService, collaborativeSearcheService, collection) {
|
|
@@ -56,10 +56,19 @@ export class Contributor {
|
|
|
56
56
|
}
|
|
57
57
|
const cs1 = !!this.collections ? this.collections.map(c => c.collectionName) : [];
|
|
58
58
|
const cs2 = !!collaborationCollections ? collaborationCollections.map(c => c.collectionName) : [];
|
|
59
|
-
const update = collaborationEvent.id === 'url' ||
|
|
59
|
+
const update = collaborationEvent.id === 'url' ||
|
|
60
|
+
collaborationEvent.id === 'all' ||
|
|
61
|
+
this.isUpdateEnabledOnOwnCollaboration() ||
|
|
62
|
+
(!this.isMyOwnCollaboration(collaborationEvent) &&
|
|
63
|
+
!this.isMyLinkedContributorCollaboration(collaborationEvent) &&
|
|
64
|
+
hasAtLeastOneCommon(cs1, cs2));
|
|
60
65
|
if (this._updateData && update) {
|
|
61
66
|
this.updateFromCollaboration(collaborationEvent);
|
|
62
67
|
}
|
|
68
|
+
if (!update && this.isMyLinkedContributorCollaboration(collaborationEvent)) {
|
|
69
|
+
const myLinkedContribCollaboration = this.collaborativeSearcheService.getCollaboration(this.linkedContributorId);
|
|
70
|
+
this.setSelection(this.fetchedData, myLinkedContribCollaboration);
|
|
71
|
+
}
|
|
63
72
|
},
|
|
64
73
|
error: (error) => this.collaborativeSearcheService.collaborationErrorBus.next(error)
|
|
65
74
|
});
|
|
@@ -76,6 +85,12 @@ export class Contributor {
|
|
|
76
85
|
}
|
|
77
86
|
return configValue;
|
|
78
87
|
}
|
|
88
|
+
isMyOwnCollaboration(collaborationEvent) {
|
|
89
|
+
return collaborationEvent.id === this.identifier;
|
|
90
|
+
}
|
|
91
|
+
isMyLinkedContributorCollaboration(collaborationEvent) {
|
|
92
|
+
return collaborationEvent.id === this.linkedContributorId;
|
|
93
|
+
}
|
|
79
94
|
/**
|
|
80
95
|
* @returns name of contributor set in configuration.
|
|
81
96
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contributor.js","sourceRoot":"","sources":["../../src/models/contributor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAKH,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAsB,mBAAmB,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"contributor.js","sourceRoot":"","sources":["../../src/models/contributor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "arlas-web-core",
|
|
3
|
-
"version": "24.
|
|
3
|
+
"version": "24.1.0-beta.1",
|
|
4
4
|
"description": "Core Service Library for ARLAS Web App",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"author": "gisaia-team",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"arlas-api": "
|
|
12
|
+
"arlas-api": "24.0.0",
|
|
13
13
|
"rxjs": "~7.4.0"
|
|
14
14
|
},
|
|
15
15
|
"overrides": {
|