@riverscapes/common 2.0.10 → 2.0.12

package/dist/lib/xml.js

@@ -21,9 +21,11 @@ var loglevel_1 = __importDefault(require("loglevel"));
 var getMetaFromNode = function (nodeWithMeta) {
     try {
         var metaNodes = xpath_1.default.select('MetaData/Meta', nodeWithMeta);
+        var keyCheck_1 = [];
         var metaInputs = metaNodes.map(function (nd) {
             var rawType = nd.getAttribute('type');
             var rawLocked = nd.getAttribute('locked');
+            var rawExt = nd.getAttribute('ext');
             var typeVal;
             if (rawType && Object.values(schema_types_1.MetaDataTypeEnum).includes(rawType.trim()))
                 throw new Error("MetaDataType not found: ".concat(rawType));
@@ -34,16 +36,35 @@ var getMetaFromNode = function (nodeWithMeta) {
                 throw new Error("locked is not either 'true' or 'false' got: \"".concat(rawLocked, "\""));
             else if (rawLocked && rawLocked.trim().toLowerCase() === 'true')
                 lockedVal = true;
+            var extVal;
+            if (rawExt && rawExt.trim().length > 0) {
+                var lwrExt = rawExt.trim().toUpperCase();
+                if (lwrExt && Object.values(schema_types_1.MetaDataExtEnum).includes(rawExt.trim()))
+                    throw new Error("MetaDataExtEnum not found: ".concat(rawExt));
+                else if (rawExt)
+                    extVal = rawExt.trim().toUpperCase();
+            }
+            var key = nd.getAttribute('name');
+            if (!key)
+                throw new Error('Error retriving name from XML node');
+            if (keyCheck_1.includes(key))
+                throw new Error("Duplicate key found: ".concat(key));
+            keyCheck_1.push(key);
             return {
-                key: nd.getAttribute('name'),
+                key: key,
                 type: typeVal,
                 value: nd.textContent.trim(),
                 locked: lockedVal,
+                ext: extVal,
             };
         });
         return metaInputs;
     }
-    catch (_a) {
+    catch (e) {
+        if (e.message.includes('Duplicate key found'))
+            throw e;
+        if (e.message.includes('Error retriving name'))
+            throw e;
         loglevel_1.default.warn('Could not find MetaData element in XML');
         return [];
     }

package/dist/lib/xml.js.map

@@ -1 +1 @@
-{"version":3,"file":"xml.js","sourceRoot":"","sources":["../../src/lib/xml.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xml.js","sourceRoot":"","sources":["../../src/lib/xml.ts"],"names":[],"mappings":"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"}

package/dist/schema.graphql

@@ -482,14 +482,27 @@ type MapCluster {
 }
 
 type MetaData {
+  ext: MetaDataExtEnum
   key: String!
   locked: Boolean
   type: MetaDataTypeEnum
   value: String!
 }
 
+enum MetaDataExtEnum {
+  DATASET
+  PROJECT
+  WAREHOUSE
+}
+
 """When submitting metadata use this object"""
 input MetaDataInput {
+  """
+  If this metadata was impored from an external project then list what kind of MetaData it is.
+    Options: PROJECT, DATASET, WAREHOUSE
+  """
+  ext: MetaDataExtEnum
+
   """Metadata key string"""
   key: String!
 
@@ -547,6 +560,7 @@ type Mutation {
 
   """ADMIN: Wipe DynamoDB except for users"""
   adminWipeDynamo: Int
+  changeProjectOwner(owner: OwnerInput!, projectId: ID!): Project
 
   """Create a collection of projects"""
   createCollection(collection: CollectionInput!, orgId: ID): Collection
@@ -1043,6 +1057,7 @@ type Project implements DBObj & HasOwner & HasStar {
   createdBy: User!
   createdOn: DateTime!
   datasets(limit: Int!, offset: Int!, sort: [SearchSortEnum!]): PaginatedDatasets!
+  deleted: Boolean!
   description: String!
   files: [FileDownloadMeta!]!
 
@@ -1570,7 +1585,7 @@ type Query {
     - etags: a string list of etags (S3 analog to MD5) for each file. List size must match "files: [String!]!"
     - sizes: a string list of file sizes (S3 analog to MD5) for each file. List size must match "files: [String!]!"
     - noDelete: indicates that we do NOT want to touch remote files that are not also present on the local server
-    - tags: a list of tags to add to the project (these are the warehouse tags)
+    - tags: a list of tags to add to the project (these are the data exchange tags)
     - visibility: the visibility of the project. Defaults to PUBLIC
   """
   requestUploadProject(etags: [String!]!, files: [String!]!, noDelete: Boolean, owner: OwnerInput, projectId: String, sizes: [BigInt!]!, tags: [String!], token: String, visibility: ProjectVisibilityEnum): UploadProjectRequest
@@ -1581,7 +1596,7 @@ type Query {
   """
   requestUploadProjectFilesUrl(files: [String!]!, token: String!): [UploadProjectFileUrls]
   savedSearch(id: ID!): SavedSearch
-  searchCollections(limit: Int!, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchCollectionPagination!
+  searchCollections(limit: Int!, minScore: Float, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchCollectionPagination!
 
   """
   This is a complementary search to "searchProjects". It can be run with essentially the same
@@ -1590,24 +1605,24 @@ type Query {
   Note: params.bbox MUST be included for the searchProjectsMap
   clusters: the number of clusters we should aim for
   """
-  searchMapBounds(limit: Int!, params: ProjectSearchParamsInput!): SearchMapBoundsResult!
+  searchMapBounds(limit: Int!, minScore: Float, params: ProjectSearchParamsInput!): SearchMapBoundsResult!
 
   """
   Discussion here https://github.com/Riverscapes/rs-web-monorepo/discussions/251
   limit: the maximum number of clusters to get back. After this number the list is truncated and any remaining projects are simply represented by the "remaining" property
   precision: The size of the grid to place the clusters on. We use npm's ngeohash for gridding
   """
-  searchMapClusters(limit: Int!, params: ProjectSearchParamsInput!, precision: Int!): SearchMapClusterResult!
-  searchOrganizations(limit: Int!, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchOrganizationPagination!
-  searchProjects(limit: Int!, offset: Int!, params: ProjectSearchParamsInput!, sort: [SearchSortEnum!]): SearchProjectPagination!
-  searchSavedSearches(limit: Int!, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchSavedSearchPagination!
+  searchMapClusters(limit: Int!, minScore: Float, params: ProjectSearchParamsInput!, precision: Int!): SearchMapClusterResult!
+  searchOrganizations(limit: Int!, minScore: Float, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchOrganizationPagination!
+  searchProjects(limit: Int!, minScore: Float, offset: Int!, params: ProjectSearchParamsInput!, sort: [SearchSortEnum!]): SearchProjectPagination!
+  searchSavedSearches(limit: Int!, minScore: Float, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchSavedSearchPagination!
 
   """
   As-you-type suggestions:
   TODO: this needs to be typed but for now it's just pure JSON
   """
-  searchSuggest(text: String!, type: StarrableTypesEnum): SearchSuggestionResults
-  searchUsers(limit: Int!, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchUserPagination!
+  searchSuggest(minScore: Float, text: String!, type: StarrableTypesEnum): SearchSuggestionResults
+  searchUsers(limit: Int!, minScore: Float, offset: Int!, params: SearchParamsInput!, sort: [SearchSortEnum!]): SearchUserPagination!
 
   """A User is any user in the system"""
   user(id: ID!): User
@@ -2202,7 +2217,7 @@ type UploadUrl {
 
 """A User object is any user in the system"""
 type User implements DBObj & UserInterface {
-  """User affiliations (usually external to the warehouse)"""
+  """User affiliations (usually external to the data exchange)"""
   affiliations: [UserAffiliation]!
   avatar: URL
 
@@ -2247,7 +2262,7 @@ type UserAffiliation {
   affiliationRole: String
 
   """
-  Name of the affiliated entity or organization. Can be external to the warehouse
+  Name of the affiliated entity or organization. Can be external to the data exchange
   """
   name: String!
 
@@ -2260,7 +2275,7 @@ input UserAffiliationInput {
   affiliationRole: String
 
   """
-  Name of the affiliated entity or organization. Can be external to the warehouse
+  Name of the affiliated entity or organization. Can be external to the data exchange
   """
   name: String!
 

package/dist/types.d.ts

@@ -51,14 +51,13 @@ export type BusinessLogicNode = {
 export declare const SQSJobEngineEnum: {
     readonly TILERIZER: "TILERIZER";
     readonly JANITOR: "JANITOR";
-    readonly UPLOADER: "UPLOADER";
     readonly ZIPPER: "ZIPPER";
 };
 export type SQSJobEngineEnum = ObjectValues<typeof SQSJobEngineEnum>;
 export type SQSJob = {
     engine: SQSJobEngineEnum;
     projectId: string;
-    projectType: string;
+    projectType: string | null;
     key: string;
     etag?: string;
     rsXPath?: string;

package/dist/types.js

@@ -4,7 +4,6 @@ exports.SQSJobEngineEnum = void 0;
 exports.SQSJobEngineEnum = {
     TILERIZER: 'TILERIZER',
     JANITOR: 'JANITOR',
-    UPLOADER: 'UPLOADER',
     ZIPPER: 'ZIPPER',
 };
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAuEa,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;CACR,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAuEa,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACR,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riverscapes/common",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "Common elements to all riverscapes tools (client and server)",
   "main": "dist/index.js",
   "engines": {
@@ -40,5 +40,5 @@
     "ts-jest": "*",
     "typescript": "*"
   },
-  "gitHead": "198232f0eadfdb35a2ddc20947c768ab180bb316"
+  "gitHead": "1f5f5c220d2d149b32909ec118751f14924ad251"
 }

package/dist/lib/jsonBigIntPatch.js

@@ -1 +0,0 @@
-//# sourceMappingURL=jsonBigIntPatch.js.map

package/dist/lib/jsonBigIntPatch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jsonBigIntPatch.js","sourceRoot":"","sources":["../../src/lib/jsonBigIntPatch.ts"],"names":[],"mappings":""}