From efe2e53bf1fc1e9847c031dea9083ef6fe2c862f Mon Sep 17 00:00:00 2001
From: vkovtun <vkovtun@ethz.ch>
Date: Wed, 23 Aug 2023 17:09:21 +0200
Subject: [PATCH] SSDM-13926: Fixing the failing JS test.
---
.../src/v3/as/dto/exporter/ExportResult.js | 8 +++++++-
.../src/v3/as/dto/exporter/data/ExportData.js | 8 +++++++-
.../src/v3/as/dto/exporter/data/ExportablePermId.js | 5 ++++-
.../src/v3/as/dto/exporter/data/SelectedFields.js | 11 ++++++++++-
.../src/v3/as/dto/exporter/options/ExportOptions.js | 10 +++++++++-
.../src/v3/as/dto/importer/ImportOperation.js | 5 ++++-
.../v3/as/dto/importer/data/UncompressedImportData.js | 9 ++++++++-
.../src/v3/as/dto/importer/data/ZipImportData.js | 5 ++++-
.../src/v3/as/dto/importer/options/ImportOptions.js | 4 +++-
9 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/ExportResult.js b/api-openbis-javascript/src/v3/as/dto/exporter/ExportResult.js
index 65975f746ad..1b33decd4a9 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/ExportResult.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/ExportResult.js
@@ -39,7 +39,13 @@ define(["stjs"], function (stjs) {
return this.warnings;
};
},
- {}
+ {
+ downloadUrl: "String",
+ warnings: {
+ name: "Collection",
+ arguments: ["String"]
+ }
+ }
);
return ExportResult;
});
\ No newline at end of file
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportData.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportData.js
index a589abc4557..70e238e2cef 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportData.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportData.js
@@ -40,7 +40,13 @@ define(["stjs"], function (stjs) {
return this.fields;
};
},
- {}
+ {
+ permIds: {
+ name: "List",
+ arguments: ["ExportablePermId"]
+ },
+ fields: "IExportableFields"
+ }
);
return ExportData;
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportablePermId.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportablePermId.js
index 3c9f5a7efb4..327b30c3a6e 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportablePermId.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/ExportablePermId.js
@@ -40,7 +40,10 @@ define(["stjs"], function (stjs) {
return this.permId;
};
},
- {}
+ {
+ exportableKind: "ExportableKind",
+ permId: "ObjectPermId"
+ }
);
return ExportablePermId;
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
index 9c2f71273e4..74c4d3c9f81 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
@@ -40,7 +40,16 @@ define(["stjs", "as/dto/exporter/data/IExportableFields"], function (stjs, IExpo
return this.properties;
};
},
- {}
+ {
+ attributes: {
+ name: "List",
+ arguments: ["Attribute"]
+ },
+ properties: {
+ name : "List",
+ arguments : ["PropertyTypePermId"]
+ }
+ }
);
return SelectedFields;
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
index b8c8a638f9a..6a1e0881235 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
@@ -52,7 +52,15 @@ define(["stjs"], function (stjs) {
return this.withImportCompatibility;
};
},
- {}
+ {
+ formats: {
+ name: "Set",
+ arguments: ["ExportFormat"]
+ },
+ xlsTextFormat: "XlsTextFormat",
+ withReferredTypes: "Boolean",
+ withImportCompatibility: "Boolean"
+ }
);
return SelectedFields;
diff --git a/api-openbis-javascript/src/v3/as/dto/importer/ImportOperation.js b/api-openbis-javascript/src/v3/as/dto/importer/ImportOperation.js
index e666a045929..717aa8112bf 100644
--- a/api-openbis-javascript/src/v3/as/dto/importer/ImportOperation.js
+++ b/api-openbis-javascript/src/v3/as/dto/importer/ImportOperation.js
@@ -45,7 +45,10 @@ define(["stjs", "as/dto/common/operation/IOperation"],
return this.importOptions;
};
},
- {}
+ {
+ importData: "IImportData",
+ importOptions: "ImportOptions"
+ }
);
return ImportOperation;
diff --git a/api-openbis-javascript/src/v3/as/dto/importer/data/UncompressedImportData.js b/api-openbis-javascript/src/v3/as/dto/importer/data/UncompressedImportData.js
index e01da7dd9da..e5f163b7c16 100644
--- a/api-openbis-javascript/src/v3/as/dto/importer/data/UncompressedImportData.js
+++ b/api-openbis-javascript/src/v3/as/dto/importer/data/UncompressedImportData.js
@@ -47,7 +47,14 @@ define(["stjs", "as/dto/importer/data/IImportData"],
return this.scripts;
};
},
- {}
+ {
+ format: "ImportFormat",
+ file: "byte[]",
+ scripts: {
+ name: "Collection",
+ arguments: ["ImportScript"]
+ }
+ }
);
return UncompressedImportData;
diff --git a/api-openbis-javascript/src/v3/as/dto/importer/data/ZipImportData.js b/api-openbis-javascript/src/v3/as/dto/importer/data/ZipImportData.js
index 764c3e492fd..a2e162e7c65 100644
--- a/api-openbis-javascript/src/v3/as/dto/importer/data/ZipImportData.js
+++ b/api-openbis-javascript/src/v3/as/dto/importer/data/ZipImportData.js
@@ -41,7 +41,10 @@ define(["stjs", "as/dto/importer/data/IImportData"],
return this.file;
};
},
- {}
+ {
+ format: "ImportFormat",
+ file: "byte[]"
+ }
);
return ZipImportData;
diff --git a/api-openbis-javascript/src/v3/as/dto/importer/options/ImportOptions.js b/api-openbis-javascript/src/v3/as/dto/importer/options/ImportOptions.js
index 8e76e247fa6..b38a98b11e8 100644
--- a/api-openbis-javascript/src/v3/as/dto/importer/options/ImportOptions.js
+++ b/api-openbis-javascript/src/v3/as/dto/importer/options/ImportOptions.js
@@ -34,7 +34,9 @@ define(["stjs"], function (stjs) {
return this.mode;
};
},
- {}
+ {
+ mode: "ImportMode"
+ }
);
return ImportOptions;
--
GitLab