@nfdi4plants/arctrl 2.2.2 → 2.2.3

package/Spreadsheet/AnnotationTable/CompositeCell.js

@@ -1,6 +1,7 @@
-import { defaultArg, unwrap, map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
+import { defaultArg, bind, unwrap, map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
 import { item } from "../../fable_modules/fable-library-js.4.22.0/Array.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";
+import { Option_fromValueWithDefault } from "../../Core/Helper/Collections.js";
 
 export function termFromStringCells(tsrCol, tanCol, cellValues) {
     const tan = map((i) => item(i, cellValues), tanCol);
@@ -20,8 +21,8 @@ export function freeTextFromStringCells(cellValues) {
 }
 
 export function dataFromStringCells(format, selectorFormat, cellValues) {
-    const format_1 = map((i) => item(i, cellValues), format);
-    const selectorFormat_1 = map((i_1) => item(i_1, cellValues), selectorFormat);
+    const format_1 = bind((i) => Option_fromValueWithDefault("", item(i, cellValues)), format);
+    const selectorFormat_1 = bind((i_1) => Option_fromValueWithDefault("", item(i_1, cellValues)), selectorFormat);
     return CompositeCell.createDataFromString(item(0, cellValues), unwrap(format_1), unwrap(selectorFormat_1));
 }
 

package/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -2,7 +2,7 @@ import { tryItem, map, setItem, item, skip } from "../../fable_modules/fable-lib
 import { CompositeHeader, IOType } from "../../Core/Table/CompositeHeader.js";
 import { toString } from "../../fable_modules/fable-library-js.4.22.0/Types.js";
 import { toStringCells, fromStringCells } from "./CompositeHeader.js";
-import { empty, singleton, append, toList, exists, map as map_1, delay, toArray } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { singleton, append, toList, exists, map as map_1, delay, toArray } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.22.0/Range.js";
 import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
 import { toStringCells as toStringCells_1 } from "./CompositeCell.js";
@@ -65,9 +65,7 @@ export function toStringCellColumns(column) {
         return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => getCellOrDefault(i_4, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => getCellOrDefault(i_5, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => getCellOrDefault(i_6, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else if (isData) {
-        const hasFormat = exists((c_2) => (c_2.ToDataCell().AsData.Format != null), column.Cells);
-        const hasSelectorFormat = exists((c_3) => (c_3.ToDataCell().AsData.SelectorFormat != null), column.Cells);
-        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => getCellOrDefault(i_7, 0, cells), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => getCellOrDefault(i_8, 1, cells), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => getCellOrDefault(i_9, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => getCellOrDefault(i_7, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => getCellOrDefault(i_8, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => getCellOrDefault(i_9, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else {
         return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));

package/Spreadsheet/Template.js

@@ -261,6 +261,10 @@ export function Metadata_Template_toRows(template) {
     return delay(() => append(singleton(SparseRowModule_fromValues(["TEMPLATE"])), delay(() => append(Metadata_Template_TemplateInfo_toRows_48C39BE1(template), delay(() => append(singleton(SparseRowModule_fromValues(["ERS"])), delay(() => append(Metadata_ER_toRows(undefined, toList(template.EndpointRepositories)), delay(() => append(singleton(SparseRowModule_fromValues(["TAGS"])), delay(() => append(Metadata_Tags_toRows(undefined, toList(template.Tags)), delay(() => append(singleton(SparseRowModule_fromValues(["AUTHORS"])), delay(() => toRows_1("Author", ofSeq(template.Authors)))))))))))))))));
 }
 
+export const Template_metadataSheetName = "isa_template";
+
+export const Template_obsoleteMetadataSheetName = "SwateTemplateMetadata";
+
 export function Template_fromParts(templateInfo, ers, tags, authors, table, lastUpdated) {
     const id = parse(templateInfo.Id);
     const organisation = Organisation.ofString(templateInfo.Organisation);
@@ -271,11 +275,11 @@ export function Template_fromParts(templateInfo, ers, tags, authors, table, last
 }
 
 export function Template_isMetadataSheetName(name) {
-    if (name === "isa_template") {
+    if (name === Template_metadataSheetName) {
         return true;
     }
     else {
-        return name === "SwateTemplateMetadata";
+        return name === Template_obsoleteMetadataSheetName;
     }
 }
 
@@ -288,7 +292,7 @@ export function Template_tryGetMetadataSheet(doc) {
 }
 
 export function Template_toMetadataSheet(template) {
-    const sheet = new FsWorksheet("isa_template");
+    const sheet = new FsWorksheet(Template_metadataSheetName);
     iterateIndexed((rowI, r) => {
         SparseRowModule_writeToSheet(rowI + 1, r, sheet);
     }, Metadata_Template_toRows(template));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nfdi4plants/arctrl",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "main": "index.js",