@esri/hub-common 9.41.0 → 9.43.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.
Files changed (39) hide show
  1. package/dist/es2017/content/_internal.js +14 -1
  2. package/dist/es2017/content/_internal.js.map +1 -1
  3. package/dist/es2017/core/types/IHubContent.js +1 -0
  4. package/dist/es2017/core/types/IHubContent.js.map +1 -1
  5. package/dist/es2017/search/_internal/portalSearchItems.js +232 -3
  6. package/dist/es2017/search/_internal/portalSearchItems.js.map +1 -1
  7. package/dist/es2017/search/_searchUsers.js +2 -0
  8. package/dist/es2017/search/_searchUsers.js.map +1 -1
  9. package/dist/es2017/search/filter-utils.js +89 -26
  10. package/dist/es2017/search/filter-utils.js.map +1 -1
  11. package/dist/esm/content/_internal.js +14 -1
  12. package/dist/esm/content/_internal.js.map +1 -1
  13. package/dist/esm/core/types/IHubContent.js +1 -0
  14. package/dist/esm/core/types/IHubContent.js.map +1 -1
  15. package/dist/esm/search/_internal/portalSearchItems.js +233 -5
  16. package/dist/esm/search/_internal/portalSearchItems.js.map +1 -1
  17. package/dist/esm/search/_searchUsers.js +2 -0
  18. package/dist/esm/search/_searchUsers.js.map +1 -1
  19. package/dist/esm/search/filter-utils.js +90 -27
  20. package/dist/esm/search/filter-utils.js.map +1 -1
  21. package/dist/node/content/_internal.js +14 -1
  22. package/dist/node/content/_internal.js.map +1 -1
  23. package/dist/node/core/types/IHubContent.js +1 -0
  24. package/dist/node/core/types/IHubContent.js.map +1 -1
  25. package/dist/node/search/_internal/portalSearchItems.js +232 -2
  26. package/dist/node/search/_internal/portalSearchItems.js.map +1 -1
  27. package/dist/node/search/_searchUsers.js +2 -0
  28. package/dist/node/search/_searchUsers.js.map +1 -1
  29. package/dist/node/search/filter-utils.js +92 -27
  30. package/dist/node/search/filter-utils.js.map +1 -1
  31. package/dist/types/content/_internal.d.ts +1 -0
  32. package/dist/types/core/types/IHubContent.d.ts +5 -2
  33. package/dist/types/search/_internal/portalSearchItems.d.ts +35 -1
  34. package/dist/types/search/_searchUsers.d.ts +2 -0
  35. package/dist/types/search/filter-utils.d.ts +13 -1
  36. package/dist/types/search/types/types.d.ts +1 -0
  37. package/dist/umd/common.umd.js +353 -44
  38. package/dist/umd/common.umd.js.map +1 -1
  39. package/package.json +1 -1
@@ -434,7 +434,8 @@ export const getPublisherInfo = (item, metadata, org, ownerUser) => {
434
434
  organizationSource: PublisherSource.None,
435
435
  };
436
436
  const citationContact = extractFirstContact(metadata, "metadata.dataIdInfo.idCitation.citRespParty");
437
- const resourceContact = extractFirstContact(metadata, "metadata.mdContact");
437
+ const resourceContact = extractFirstContact(metadata, "metadata.dataIdInfo.idPoC");
438
+ const metadataContact = extractFirstContact(metadata, "metadata.mdContact");
438
439
  // Determine publisher name properties
439
440
  const ownerFullName = getProp(ownerUser, "fullName");
440
441
  if (citationContact.individualName) {
@@ -445,6 +446,10 @@ export const getPublisherInfo = (item, metadata, org, ownerUser) => {
445
446
  result.name = resourceContact.individualName;
446
447
  result.nameSource = PublisherSource.ResourceContact;
447
448
  }
449
+ else if (metadataContact.individualName) {
450
+ result.name = metadataContact.individualName;
451
+ result.nameSource = PublisherSource.MetadataContact;
452
+ }
448
453
  else if (ownerFullName) {
449
454
  result.name = ownerFullName;
450
455
  result.username = ownerUser.username;
@@ -460,11 +465,19 @@ export const getPublisherInfo = (item, metadata, org, ownerUser) => {
460
465
  result.organization = resourceContact.organizationName;
461
466
  result.organizationSource = PublisherSource.ResourceContact;
462
467
  }
468
+ else if (metadataContact.organizationName) {
469
+ result.organization = metadataContact.organizationName;
470
+ result.organizationSource = PublisherSource.MetadataContact;
471
+ }
463
472
  else if (orgName) {
464
473
  result.organization = orgName;
465
474
  result.orgId = getItemOrgId(item, ownerUser);
466
475
  result.organizationSource = PublisherSource.ItemOwner;
467
476
  }
477
+ // We assume the item belongs to external org if no org info is available and the item is private
478
+ result.isExternal =
479
+ result.organizationSource === PublisherSource.None &&
480
+ item.access !== "public";
468
481
  return result;
469
482
  };
470
483
  //# sourceMappingURL=_internal.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_internal.js","sourceRoot":"","sources":["../../../src/content/_internal.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ export var PublisherSource;
2
2
  (function (PublisherSource) {
3
3
  PublisherSource["CitationContact"] = "metadata.resource.citation.contact";
4
4
  PublisherSource["ResourceContact"] = "metadata.resource.contact";
5
+ PublisherSource["MetadataContact"] = "metadata.contact";
5
6
  PublisherSource["ItemOwner"] = "item.owner";
6
7
  PublisherSource["None"] = "none";
7
8
  })(PublisherSource || (PublisherSource = {}));
@@ -1 +1 @@
1
- {"version":3,"file":"IHubContent.js","sourceRoot":"","sources":["../../../../src/core/types/IHubContent.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,yEAAsD,CAAA;IACtD,gEAA6C,CAAA;IAC7C,2CAAwB,CAAA;IACxB,gCAAa,CAAA;AACf,CAAC,EALW,eAAe,KAAf,eAAe,QAK1B"}
1
+ {"version":3,"file":"IHubContent.js","sourceRoot":"","sources":["../../../../src/core/types/IHubContent.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,yEAAsD,CAAA;IACtD,gEAA6C,CAAA;IAC7C,uDAAoC,CAAA;IACpC,2CAAwB,CAAA;IACxB,gCAAa,CAAA;AACf,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B"}
@@ -1,9 +1,9 @@
1
1
  import { searchItems } from "@esri/arcgis-rest-portal";
2
- import { convertPortalItemResponseToFacets, enrichContentSearchResult, HubError, } from "../..";
2
+ import { cloneObject, convertPortalItemResponseToFacets, enrichContentSearchResult, HubError, } from "../..";
3
3
  import { enrichPageSearchResult } from "../../pages/HubPages";
4
4
  import { enrichProjectSearchResult } from "../../projects";
5
5
  import { enrichSiteSearchResult } from "../../sites";
6
- import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
6
+ import { expandFilter, serializeFilterGroupsForPortal, } from "../filter-utils";
7
7
  import { getNextFunction } from "../utils";
8
8
  /**
9
9
  * @private
@@ -17,8 +17,10 @@ export async function portalSearchItems(filterGroups, options) {
17
17
  if (!options.requestOptions) {
18
18
  throw new HubError("hubSearch", "requestOptions: IHubRequestOptions is required.");
19
19
  }
20
+ // Expand well-known filterGroups
21
+ const replaced = applyWellKnownItemFilters(filterGroups);
20
22
  // Expand the individual filters in each of the groups
21
- const expandedGroups = filterGroups.map((fg) => {
23
+ const expandedGroups = replaced.map((fg) => {
22
24
  fg.filters = fg.filters.map(expandFilter);
23
25
  return fg;
24
26
  });
@@ -106,4 +108,231 @@ async function itemToSearchResult(item, includes = [], requestOptions) {
106
108
  }
107
109
  return fn(item, includes, requestOptions);
108
110
  }
111
+ export const WellKnownItemFilters = {
112
+ $application: [
113
+ {
114
+ filterType: "item",
115
+ type: {
116
+ any: [
117
+ "Web Mapping Application",
118
+ "Application",
119
+ "Insights",
120
+ "Web Experience",
121
+ ],
122
+ not: ["Insights Theme", "Insights Model"],
123
+ },
124
+ typekeywords: {
125
+ not: ["hubSite", "Story Map"],
126
+ },
127
+ },
128
+ {
129
+ filterType: "item",
130
+ type: "Web Mapping Experience",
131
+ typekeywords: "EXB Experience",
132
+ },
133
+ ],
134
+ $dashboard: [
135
+ {
136
+ filterType: "item",
137
+ type: {
138
+ any: ["Dashboard"],
139
+ not: ["Operation View"],
140
+ },
141
+ typekeywords: {
142
+ not: ["Extension", "ArcGIS Operation View"],
143
+ },
144
+ },
145
+ ],
146
+ $dataset: [
147
+ {
148
+ filterType: "item",
149
+ type: {
150
+ any: [
151
+ "Scene Service",
152
+ "Feature Collection",
153
+ "Route Layer",
154
+ "Layer",
155
+ "Explorer Layer",
156
+ "Tile Package",
157
+ "Vector Tile Package",
158
+ "Scene Package",
159
+ "Layer Package",
160
+ "Feature Service",
161
+ "Stream Service",
162
+ "Map Service",
163
+ "Vector Tile Service",
164
+ "Image Service",
165
+ "WMS",
166
+ "WFS",
167
+ "WMTS",
168
+ "KML",
169
+ "KML Collection",
170
+ "Globe Service",
171
+ "CSV",
172
+ "Shapefile",
173
+ "GeoJson",
174
+ "Service Definition",
175
+ "File Geodatabase",
176
+ "CAD Drawing",
177
+ "Relational Database Connection",
178
+ ],
179
+ not: ["Web Mapping Application", "Geodata Service"],
180
+ },
181
+ },
182
+ {
183
+ filterType: "item",
184
+ typekeywords: ["OGC", "Geodata Service"],
185
+ },
186
+ ],
187
+ $document: [
188
+ {
189
+ filterType: "item",
190
+ type: [
191
+ "PDF",
192
+ "Microsoft Excel",
193
+ "Microsoft Word",
194
+ "Microsoft Powerpoint",
195
+ "iWork Keynote",
196
+ "iWork Pages",
197
+ "iWork Numbers",
198
+ "Visio Document",
199
+ "Document Link",
200
+ ],
201
+ },
202
+ ],
203
+ $initiative: [
204
+ {
205
+ filterType: "item",
206
+ type: "Hub Initiative",
207
+ },
208
+ ],
209
+ $experience: [
210
+ {
211
+ filterType: "item",
212
+ type: "Web Experience",
213
+ },
214
+ ],
215
+ $feedback: [
216
+ {
217
+ filterType: "item",
218
+ type: "Form",
219
+ },
220
+ ],
221
+ $page: [
222
+ {
223
+ filterType: "item",
224
+ typekeywords: "hubPage",
225
+ },
226
+ ],
227
+ $site: [
228
+ {
229
+ filterType: "item",
230
+ type: ["Hub Site Application", "Site Application"],
231
+ },
232
+ ],
233
+ $storymap: [
234
+ {
235
+ filterType: "item",
236
+ type: "Storymap",
237
+ },
238
+ {
239
+ filterType: "item",
240
+ type: "Web Mapping Application",
241
+ typekeywords: "Story Map",
242
+ },
243
+ ],
244
+ $template: [
245
+ {
246
+ filterType: "item",
247
+ type: [
248
+ "Web Mapping Application",
249
+ "Hub Initiative",
250
+ "Hub Initiative Template",
251
+ "Solution",
252
+ ],
253
+ typekeywords: {
254
+ any: ["hubInitiativeTemplate", "hubSolutionTemplate", "Template"],
255
+ not: "Deployed",
256
+ },
257
+ },
258
+ ],
259
+ $webmap: [
260
+ {
261
+ filterType: "item",
262
+ type: {
263
+ any: ["Web Map", "Web Scene"],
264
+ not: "Web Mapping Application",
265
+ },
266
+ },
267
+ ],
268
+ };
269
+ /**
270
+ * @private
271
+ * Convert a Filter Group to expand well-known type filters
272
+ *
273
+ * The purpose of this function is to allow for the use of short-hand
274
+ * names for commonly used, complex queries.
275
+ *
276
+ * It works by looking for filters using the .type property, the value
277
+ * of which is a key in the WellKnownItemFilters hash. If found in the
278
+ * hash, the filters array of the active filterGroup is replaced with the
279
+ * filters specified in the hash.
280
+ *
281
+ * NOTE: Any other properties specified in a filter will be removed
282
+ *
283
+ * Only exported to enable extensive testing
284
+ * @param filterGroups
285
+ */
286
+ export function applyWellKnownItemFilters(filterGroups) {
287
+ const clone = cloneObject(filterGroups);
288
+ // iterate the filterGroups
289
+ const result = clone.map((filterGroup) => {
290
+ filterGroup.filters = filterGroup.filters.reduce((updated, filter) => {
291
+ // check if the filter.type is a well-known type
292
+ if (isWellKnownTypeFilter(filter.type)) {
293
+ // get the set of filters to replace the current filter with
294
+ const typeFilters = lookupTypeFilters(filter.type);
295
+ // Note: At this point we could try to "merge" in the other
296
+ // props on the filter, into all the filters returned from
297
+ // the well-known hash. The problem with this is that the
298
+ // combination may yield unexpected results; For now, if a filter
299
+ // includes `.type is keyof WellKnownItemFilters` we simply
300
+ // replace the entire filter with the array of filters returne
301
+ // from the hash
302
+ updated = [...updated, ...typeFilters];
303
+ }
304
+ else {
305
+ // filter does not have a well-known type entry so keep it
306
+ updated.push(filter);
307
+ }
308
+ return updated;
309
+ }, []);
310
+ return filterGroup;
311
+ });
312
+ return result;
313
+ }
314
+ /**
315
+ * Is the argument a well-known type "key"
316
+ *
317
+ * Accepts `string`, `string[]` or `IMatchOptions`
318
+ * but only string values can possibly be keys
319
+ * on `WellKnownItemFilters`
320
+ * @param key
321
+ * @returns
322
+ */
323
+ function isWellKnownTypeFilter(key) {
324
+ let result = false;
325
+ if (typeof key === "string") {
326
+ result = key in WellKnownItemFilters;
327
+ }
328
+ return result;
329
+ }
330
+ /**
331
+ * Fetch the array of fitlers from the well-known hash
332
+ * @param key
333
+ * @returns
334
+ */
335
+ function lookupTypeFilters(key) {
336
+ return WellKnownItemFilters[key];
337
+ }
109
338
  //# sourceMappingURL=portalSearchItems.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,8 @@ import { searchUsers as portalUserSearch, } from "@esri/arcgis-rest-portal";
6
6
  *
7
7
  * **Note** Authentication is required
8
8
  *
9
+ * Trivial comment to force a release
10
+ *
9
11
  * Note: in the future, there may be options to search via
10
12
  * a Hub specific API
11
13
  * @param filter
@@ -1 +1 @@
1
- {"version":3,"file":"_searchUsers.js","sourceRoot":"","sources":["../../../src/search/_searchUsers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_searchUsers.js","sourceRoot":"","sources":["../../../src/search/_searchUsers.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,13 @@ import { relativeDateToDateRange, valueToMatchOptions } from "./utils";
13
13
  export function expandFilter(filter) {
14
14
  const result = {};
15
15
  const dateProps = ["created", "modified", "lastlogin"];
16
- const copyProps = ["filterType", "term", "searchUserAccess", "isopendata"];
16
+ const copyProps = [
17
+ "filterType",
18
+ "term",
19
+ "searchUserAccess",
20
+ "isopendata",
21
+ "searchUserName",
22
+ ];
17
23
  const nonMatchOptionsFields = [...dateProps, ...copyProps];
18
24
  // Do the conversion
19
25
  Object.entries(filter).forEach(([key, value]) => {
@@ -45,27 +51,26 @@ export function expandFilter(filter) {
45
51
  * @returns
46
52
  */
47
53
  export function serializeFilterGroupsForPortal(filterGroups) {
48
- const result = {
49
- q: "",
50
- filter: "",
51
- };
52
- result.q = filterGroups.map(serializeGroup).join(" AND ");
54
+ const groupSearchOptions = filterGroups.map(serializeGroup);
55
+ const result = mergeSearchOptions(groupSearchOptions, "AND");
53
56
  return result;
54
57
  }
55
58
  /**
56
59
  * Serialize the filters in a FitlerGroup into a Portal Query
57
- * @param group
60
+ * @param filterGroup
58
61
  * @returns
59
62
  */
60
- function serializeGroup(group) {
61
- const operation = group.operation || "AND";
62
- const filters = group.filters.map(expandFilter);
63
- let q = filters.map(serializeFilter).join(` ${operation} `);
64
- // Wrap in parens if there is more than one filter
63
+ function serializeGroup(filterGroup) {
64
+ const operation = filterGroup.operation || "AND";
65
+ const filters = filterGroup.filters.map(expandFilter);
66
+ const filterSearchOptions = filters.map(serializeFilter);
67
+ // combine these searchOptions
68
+ const groupSearchOptions = mergeSearchOptions(filterSearchOptions, operation);
69
+ //
65
70
  if (filters.length > 1) {
66
- q = `(${q})`;
71
+ groupSearchOptions.q = `(${groupSearchOptions.q})`;
67
72
  }
68
- return q;
73
+ return groupSearchOptions;
69
74
  }
70
75
  /**
71
76
  * Serialize a Filter into a Portal Query
@@ -75,37 +80,65 @@ function serializeGroup(group) {
75
80
  function serializeFilter(filter) {
76
81
  const dateProps = ["created", "modified"];
77
82
  const boolProps = ["isopendata"];
83
+ const passThroughProps = ["searchUserAccess", "searchUserName"];
78
84
  const specialProps = [
79
85
  "filterType",
80
- "searchUserAccess",
81
86
  "term",
82
87
  ...dateProps,
83
88
  ...boolProps,
89
+ ...passThroughProps,
84
90
  ];
91
+ let qCount = 0;
85
92
  // TODO: Look at using reduce vs .map and remove the `.filter`
86
- const stringFilters = Object.entries(filter)
93
+ const opts = Object.entries(filter)
87
94
  .map(([key, value]) => {
95
+ const so = { q: "" };
88
96
  if (!specialProps.includes(key)) {
89
- return serializeMatchOptions(key, value);
97
+ qCount++;
98
+ so.q = serializeMatchOptions(key, value);
90
99
  }
91
100
  if (dateProps.includes(key)) {
92
- return serializeDateRange(key, value);
101
+ qCount++;
102
+ so.q = serializeDateRange(key, value);
93
103
  }
94
104
  if (boolProps.includes(key)) {
95
- return `${key}:${value}`;
105
+ qCount++;
106
+ so.q = `${key}:${value}`;
107
+ }
108
+ if (passThroughProps.includes(key)) {
109
+ so[key] = value;
96
110
  }
97
111
  if (key === "term") {
98
- return value;
112
+ qCount++;
113
+ so.q = value;
99
114
  }
115
+ return so;
100
116
  })
101
117
  .filter((e) => e !== undefined);
102
- // eslint-disable-next-line unicorn/prefer-ternary
103
- if (stringFilters.length > 1) {
104
- return `(${stringFilters.join(" AND ")})`;
105
- }
106
- else {
107
- return stringFilters[0];
118
+ // merge up all the searchOptions
119
+ const searchOptions = mergeSearchOptions(opts, "AND");
120
+ if (qCount > 1) {
121
+ searchOptions.q = `(${searchOptions.q})`;
108
122
  }
123
+ return searchOptions;
124
+ }
125
+ function mergeSearchOptions(options, operation) {
126
+ const result = options.reduce((acc, entry) => {
127
+ // walk the props
128
+ Object.entries(entry).forEach(([key, value]) => {
129
+ // if prop exists
130
+ if (acc[key]) {
131
+ // combine via operation
132
+ acc[key] = `${acc[key]} ${operation} ${value}`;
133
+ }
134
+ else {
135
+ // just copy the value
136
+ acc[key] = value;
137
+ }
138
+ });
139
+ return acc;
140
+ }, { q: "" });
141
+ return result;
109
142
  }
110
143
  /**
111
144
  * Serialize MatchOptions into portal syntax
@@ -161,4 +194,34 @@ function serializeStringOrArray(join, key, value) {
161
194
  }
162
195
  return q;
163
196
  }
197
+ /**
198
+ * Determine if a Filter is "empty"
199
+ * @param filter
200
+ * @returns
201
+ */
202
+ export function isEmptyFilter(filter) {
203
+ // if it has one property, filterType, it's empty
204
+ return (Object.keys(filter).length === 1 && filter.hasOwnProperty("filterType"));
205
+ }
206
+ /**
207
+ * Determine if a filterGroup is "empty"
208
+ * @param filterGroup
209
+ * @returns
210
+ */
211
+ export function isEmptyFilterGroup(filterGroup) {
212
+ // if filters array is empty
213
+ if (filterGroup.filters.length === 0) {
214
+ return true;
215
+ }
216
+ else {
217
+ // if all filters are empty
218
+ const result = filterGroup.filters.reduce((acc, entry) => {
219
+ if (acc) {
220
+ acc = isEmptyFilter(entry);
221
+ }
222
+ return acc;
223
+ }, true);
224
+ return result;
225
+ }
226
+ }
164
227
  //# sourceMappingURL=filter-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":"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"}
@@ -441,7 +441,8 @@ export var getPublisherInfo = function (item, metadata, org, ownerUser) {
441
441
  organizationSource: PublisherSource.None,
442
442
  };
443
443
  var citationContact = extractFirstContact(metadata, "metadata.dataIdInfo.idCitation.citRespParty");
444
- var resourceContact = extractFirstContact(metadata, "metadata.mdContact");
444
+ var resourceContact = extractFirstContact(metadata, "metadata.dataIdInfo.idPoC");
445
+ var metadataContact = extractFirstContact(metadata, "metadata.mdContact");
445
446
  // Determine publisher name properties
446
447
  var ownerFullName = getProp(ownerUser, "fullName");
447
448
  if (citationContact.individualName) {
@@ -452,6 +453,10 @@ export var getPublisherInfo = function (item, metadata, org, ownerUser) {
452
453
  result.name = resourceContact.individualName;
453
454
  result.nameSource = PublisherSource.ResourceContact;
454
455
  }
456
+ else if (metadataContact.individualName) {
457
+ result.name = metadataContact.individualName;
458
+ result.nameSource = PublisherSource.MetadataContact;
459
+ }
455
460
  else if (ownerFullName) {
456
461
  result.name = ownerFullName;
457
462
  result.username = ownerUser.username;
@@ -467,11 +472,19 @@ export var getPublisherInfo = function (item, metadata, org, ownerUser) {
467
472
  result.organization = resourceContact.organizationName;
468
473
  result.organizationSource = PublisherSource.ResourceContact;
469
474
  }
475
+ else if (metadataContact.organizationName) {
476
+ result.organization = metadataContact.organizationName;
477
+ result.organizationSource = PublisherSource.MetadataContact;
478
+ }
470
479
  else if (orgName) {
471
480
  result.organization = orgName;
472
481
  result.orgId = getItemOrgId(item, ownerUser);
473
482
  result.organizationSource = PublisherSource.ItemOwner;
474
483
  }
484
+ // We assume the item belongs to external org if no org info is available and the item is private
485
+ result.isExternal =
486
+ result.organizationSource === PublisherSource.None &&
487
+ item.access !== "public";
475
488
  return result;
476
489
  };
477
490
  //# sourceMappingURL=_internal.js.map