From 11a6c678e28578901101bfc642fa2e3daad73aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Tue, 4 Jun 2024 15:44:53 +0200 Subject: [PATCH 1/2] data model: adapt JONSchemas to angular 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-by: Johnny Mariéthoz --- .../jsonschemas/classification-v1.0.0.json | 636 +-- .../jsonschemas/identifiedby-v1.0.0.json | 36 +- .../interface_language-v1.0.0.json | 46 +- sonar/common/jsonschemas/language-v1.0.0.json | 3902 +++++++++-------- sonar/common/jsonschemas/license-v1.0.0.json | 92 +- sonar/common/jsonschemas/masked-v1.0.0.json | 36 +- .../common/jsonschemas/oa-status-v1.0.0.json | 66 +- sonar/common/jsonschemas/type-v1.0.0.json | 384 +- .../hepvs/projects/project-v1.0.0_src.json | 966 ++-- sonar/json_schemas/users_json_schema.py | 2 +- .../collections/collection-v1.0.0_src.json | 54 +- .../deposits/deposit-v1.0.0_src.json | 794 ++-- .../documents/document-v1.0.0_src.json | 1365 +++--- .../organisation-v1.0.0_src.json | 339 +- .../subdivisions/subdivision-v1.0.0_src.json | 44 +- .../users/jsonschemas/users/user-v1.0.0.json | 110 +- .../projects/project-v1.0.0_src.json | 160 +- .../templates/sonar/accounts/profile.html | 5 + sonar/theme/templates/sonar/manage.html | 6 +- 19 files changed, 4900 insertions(+), 4143 deletions(-) diff --git a/sonar/common/jsonschemas/classification-v1.0.0.json b/sonar/common/jsonschemas/classification-v1.0.0.json index 0c7279ed..46c018c0 100644 --- a/sonar/common/jsonschemas/classification-v1.0.0.json +++ b/sonar/common/jsonschemas/classification-v1.0.0.json @@ -77,7 +77,7 @@ "72", "71", "81", - "81´28", + "81\u00b428", "82", "91", "159.9", @@ -90,415 +90,417 @@ "929.5", "931" ], - "form": { - "templateOptions": { - "sort": false, + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] - }, - "options": [ - { - "label": "classification_root_1", - "value": "root_1", - "disabled": true, - "children": [ + ], + "props": { + "sort": false, + "options": [ { - "label": "classification_004", - "value": "004" - }, - { - "label": "classification_6", - "value": "6", + "label": "classification_root_1", + "value": "root_1", + "disabled": true, "children": [ { - "label": "classification_63", - "value": "63" + "label": "classification_004", + "value": "004" }, { - "label": "classification_66", - "value": "66", + "label": "classification_6", + "value": "6", "children": [ { - "label": "classification_663", - "value": "663" + "label": "classification_63", + "value": "63" + }, + { + "label": "classification_66", + "value": "66", + "children": [ + { + "label": "classification_663", + "value": "663" + }, + { + "label": "classification_664", + "value": "664" + } + ] + }, + { + "label": "classification_620.1", + "value": "620.1" + }, + { + "label": "classification_620.9", + "value": "620.9" }, { - "label": "classification_664", - "value": "664" + "label": "classification_621", + "value": "621" + }, + { + "label": "classification_621.01", + "value": "621.01" + }, + { + "label": "classification_621.3", + "value": "621.3" + }, + { + "label": "classification_621.38", + "value": "621.38" + }, + { + "label": "classification_621.39", + "value": "621.39" + }, + { + "label": "classification_621.762", + "value": "621.762" + }, + { + "label": "classification_681", + "value": "681" } ] }, { - "label": "classification_620.1", - "value": "620.1" - }, - { - "label": "classification_620.9", - "value": "620.9" - }, - { - "label": "classification_621", - "value": "621" - }, - { - "label": "classification_621.01", - "value": "621.01" - }, - { - "label": "classification_621.3", - "value": "621.3" - }, - { - "label": "classification_621.38", - "value": "621.38" - }, - { - "label": "classification_621.39", - "value": "621.39" - }, - { - "label": "classification_621.762", - "value": "621.762" - }, - { - "label": "classification_681", - "value": "681" + "label": "classification_61", + "value": "61", + "children": [ + { + "label": "classification_61_2", + "value": "61", + "children": [ + { + "label": "classification_613.2", + "value": "613.2" + }, + { + "label": "classification_614.253.5", + "value": "614.253.5" + } + ] + }, + { + "label": "classification_615", + "value": "615", + "children": [ + { + "label": "classification_615.8", + "value": "615.8" + }, + { + "label": "classification_615.84", + "value": "615.84" + } + ] + }, + { + "label": "classification_616", + "value": "616" + }, + { + "label": "classification_616.31", + "value": "616.31" + }, + { + "label": "classification_616-083", + "value": "616-083" + } + ] } ] }, { - "label": "classification_61", - "value": "61", + "label": "classification_root_2", + "value": "root_2", + "disabled": true, "children": [ { - "label": "classification_61_2", - "value": "61", + "label": "classification_51", + "value": "51", "children": [ { - "label": "classification_613.2", - "value": "613.2" - }, + "label": "classification_519.2", + "value": "519.2" + } + ] + }, + { + "label": "classification_52", + "value": "52", + "children": [ { - "label": "classification_614.253.5", - "value": "614.253.5" + "label": "classification_524.8", + "value": "524.8" } ] }, { - "label": "classification_615", - "value": "615", + "label": "classification_53", + "value": "53" + }, + { + "label": "classification_54", + "value": "54", "children": [ { - "label": "classification_615.8", - "value": "615.8" + "label": "classification_543", + "value": "543" + }, + { + "label": "classification_548", + "value": "548" }, { - "label": "classification_615.84", - "value": "615.84" + "label": "classification_549", + "value": "549" } ] }, { - "label": "classification_616", - "value": "616" + "label": "classification_574", + "value": "574" }, { - "label": "classification_616.31", - "value": "616.31" + "label": "classification_55/56", + "value": "55/56", + "children": [ + { + "label": "classification_55", + "value": "55", + "children": [ + { + "label": "classification_551", + "value": "551" + }, + { + "label": "classification_556", + "value": "556" + } + ] + }, + { + "label": "classification_56", + "value": "56" + } + ] }, { - "label": "classification_616-083", - "value": "616-083" - } - ] - } - ] - }, - { - "label": "classification_root_2", - "value": "root_2", - "disabled": true, - "children": [ - { - "label": "classification_51", - "value": "51", - "children": [ - { - "label": "classification_519.2", - "value": "519.2" - } - ] - }, - { - "label": "classification_52", - "value": "52", - "children": [ - { - "label": "classification_524.8", - "value": "524.8" + "label": "classification_57/59", + "value": "57/59", + "children": [ + { + "label": "classification_57", + "value": "57" + }, + { + "label": "classification_58", + "value": "58" + }, + { + "label": "classification_59", + "value": "59" + }, + { + "label": "classification_60", + "value": "60" + } + ] } ] }, { - "label": "classification_53", - "value": "53" - }, - { - "label": "classification_54", - "value": "54", + "label": "classification_root_3", + "value": "root_3", + "disabled": true, "children": [ { - "label": "classification_543", - "value": "543" + "label": "classification_1", + "value": "1", + "children": [ + { + "label": "classification_16", + "value": "16" + } + ] }, { - "label": "classification_548", - "value": "548" + "label": "classification_2", + "value": "2", + "children": [ + { + "label": "classification_294/299", + "value": "294/299" + } + ] }, { - "label": "classification_549", - "value": "549" - } - ] - }, - { - "label": "classification_574", - "value": "574" - }, - { - "label": "classification_55/56", - "value": "55/56", - "children": [ + "label": "classification_3", + "value": "3", + "children": [ + { + "label": "classification_31", + "value": "31" + } + ] + }, { - "label": "classification_55", - "value": "55", + "label": "classification_7", + "value": "7", "children": [ { - "label": "classification_551", - "value": "551" + "label": "classification_7.071", + "value": "7.071" }, { - "label": "classification_556", - "value": "556" + "label": "classification_78", + "value": "78" + }, + { + "label": "classification_73/77", + "value": "73/77", + "children": [ + { + "label": "classification_75", + "value": "75" + }, + { + "label": "classification_77", + "value": "77" + } + ] } ] }, { - "label": "classification_56", - "value": "56" - } - ] - }, - { - "label": "classification_57/59", - "value": "57/59", - "children": [ - { - "label": "classification_57", - "value": "57" + "label": "classification_32", + "value": "32" }, { - "label": "classification_58", - "value": "58" + "label": "classification_33", + "value": "33" }, { - "label": "classification_59", - "value": "59" + "label": "classification_34", + "value": "34" }, { - "label": "classification_60", - "value": "60" - } - ] - } - ] - }, - { - "label": "classification_root_3", - "value": "root_3", - "disabled": true, - "children": [ - { - "label": "classification_1", - "value": "1", - "children": [ - { - "label": "classification_16", - "value": "16" - } - ] - }, - { - "label": "classification_2", - "value": "2", - "children": [ - { - "label": "classification_294/299", - "value": "294/299" - } - ] - }, - { - "label": "classification_3", - "value": "3", - "children": [ - { - "label": "classification_31", - "value": "31" - } - ] - }, - { - "label": "classification_7", - "value": "7", - "children": [ - { - "label": "classification_7.071", - "value": "7.071" + "label": "classification_35", + "value": "35" }, { - "label": "classification_78", - "value": "78" + "label": "classification_36", + "value": "36" }, { - "label": "classification_73/77", - "value": "73/77", + "label": "classification_37", + "value": "37", "children": [ { - "label": "classification_75", - "value": "75" + "label": "classification_370", + "value": "370" + }, + { + "label": "classification_376", + "value": "376" }, { - "label": "classification_77", - "value": "77" + "label": "classification_378.6", + "value": "378.6" + }, + { + "label": "classification_39", + "value": "39" } ] - } - ] - }, - { - "label": "classification_32", - "value": "32" - }, - { - "label": "classification_33", - "value": "33" - }, - { - "label": "classification_34", - "value": "34" - }, - { - "label": "classification_35", - "value": "35" - }, - { - "label": "classification_36", - "value": "36" - }, - { - "label": "classification_37", - "value": "37", - "children": [ - { - "label": "classification_370", - "value": "370" }, { - "label": "classification_376", - "value": "376" + "label": "classification_65", + "value": "65", + "children": [ + { + "label": "classification_02", + "value": "02" + } + ] }, { - "label": "classification_378.6", - "value": "378.6" + "label": "classification_72", + "value": "72", + "children": [ + { + "label": "classification_71", + "value": "71" + } + ] }, { - "label": "classification_39", - "value": "39" - } - ] - }, - { - "label": "classification_65", - "value": "65", - "children": [ - { - "label": "classification_02", - "value": "02" - } - ] - }, - { - "label": "classification_72", - "value": "72", - "children": [ - { - "label": "classification_71", - "value": "71" - } - ] - }, - { - "label": "classification_81", - "value": "81", - "children": [ - { - "label": "classification_81´28", - "value": "81´28" - } - ] - }, - { - "label": "classification_82", - "value": "82" - }, - { - "label": "classification_91", - "value": "91" - }, - { - "label": "classification_159.9", - "value": "159.9", - "children": [ - { - "label": "classification_159.953", - "value": "159.953" - } - ] - }, - { - "label": "classification_796", - "value": "796" - }, - { - "label": "classification_93/94", - "value": "93/94", - "children": [ + "label": "classification_81", + "value": "81", + "children": [ + { + "label": "classification_81\u00b428", + "value": "81\u00b428" + } + ] + }, { - "label": "classification_94", - "value": "94" + "label": "classification_82", + "value": "82" }, { - "label": "classification_902", - "value": "902" + "label": "classification_91", + "value": "91" }, { - "label": "classification_903", - "value": "903" + "label": "classification_159.9", + "value": "159.9", + "children": [ + { + "label": "classification_159.953", + "value": "159.953" + } + ] }, { - "label": "classification_929.5", - "value": "929.5" + "label": "classification_796", + "value": "796" }, { - "label": "classification_931", - "value": "931" + "label": "classification_93/94", + "value": "93/94", + "children": [ + { + "label": "classification_94", + "value": "94" + }, + { + "label": "classification_902", + "value": "902" + }, + { + "label": "classification_903", + "value": "903" + }, + { + "label": "classification_929.5", + "value": "929.5" + }, + { + "label": "classification_931", + "value": "931" + } + ] } ] } ] } - ] + } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/identifiedby-v1.0.0.json b/sonar/common/jsonschemas/identifiedby-v1.0.0.json index 5a5c6d8b..901188dd 100644 --- a/sonar/common/jsonschemas/identifiedby-v1.0.0.json +++ b/sonar/common/jsonschemas/identifiedby-v1.0.0.json @@ -11,27 +11,33 @@ "bf:Identifier", "bf:Local" ], - "form": { - "options": [ - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Local", - "value": "bf:Local" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Local", + "value": "bf:Local" + } + ] } - ] + } } }, "source": { "title": "Source", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || model.type !== 'bf:Local'", - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || model.type !== 'bf:Local'" + } } } }, @@ -50,4 +56,4 @@ "type", "value" ] -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/interface_language-v1.0.0.json b/sonar/common/jsonschemas/interface_language-v1.0.0.json index 00d8b056..77906261 100644 --- a/sonar/common/jsonschemas/interface_language-v1.0.0.json +++ b/sonar/common/jsonschemas/interface_language-v1.0.0.json @@ -7,27 +7,29 @@ "fre", "ita" ], - "form": { - "templateOptions": { - "sort": true - }, - "options": [ - { - "label": "lang_ger", - "value": "ger" - }, - { - "label": "lang_eng", - "value": "eng" - }, - { - "label": "lang_fre", - "value": "fre" - }, - { - "label": "lang_ita", - "value": "ita" + "widget": { + "formlyConfig": { + "props": { + "sort": true, + "options": [ + { + "label": "lang_ger", + "value": "ger" + }, + { + "label": "lang_eng", + "value": "eng" + }, + { + "label": "lang_fre", + "value": "fre" + }, + { + "label": "lang_ita", + "value": "ita" + } + ] } - ] + } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/language-v1.0.0.json b/sonar/common/jsonschemas/language-v1.0.0.json index 31edb869..f29c02b6 100644 --- a/sonar/common/jsonschemas/language-v1.0.0.json +++ b/sonar/common/jsonschemas/language-v1.0.0.json @@ -488,1955 +488,1957 @@ "zxx", "zza" ], - "form": { - "templateOptions": { - "sort": true - }, - "options": [ - { - "label": "lang_aar", - "value": "aar" - }, - { - "label": "lang_abk", - "value": "abk" - }, - { - "label": "lang_ace", - "value": "ace" - }, - { - "label": "lang_ach", - "value": "ach" - }, - { - "label": "lang_ada", - "value": "ada" - }, - { - "label": "lang_ady", - "value": "ady" - }, - { - "label": "lang_afa", - "value": "afa" - }, - { - "label": "lang_afh", - "value": "afh" - }, - { - "label": "lang_afr", - "value": "afr" - }, - { - "label": "lang_ain", - "value": "ain" - }, - { - "label": "lang_aka", - "value": "aka" - }, - { - "label": "lang_akk", - "value": "akk" - }, - { - "label": "lang_alb", - "value": "alb" - }, - { - "label": "lang_ale", - "value": "ale" - }, - { - "label": "lang_alg", - "value": "alg" - }, - { - "label": "lang_alt", - "value": "alt" - }, - { - "label": "lang_amh", - "value": "amh" - }, - { - "label": "lang_ang", - "value": "ang" - }, - { - "label": "lang_anp", - "value": "anp" - }, - { - "label": "lang_apa", - "value": "apa" - }, - { - "label": "lang_ara", - "value": "ara" - }, - { - "label": "lang_arc", - "value": "arc" - }, - { - "label": "lang_arg", - "value": "arg" - }, - { - "label": "lang_arm", - "value": "arm" - }, - { - "label": "lang_arn", - "value": "arn" - }, - { - "label": "lang_arp", - "value": "arp" - }, - { - "label": "lang_art", - "value": "art" - }, - { - "label": "lang_arw", - "value": "arw" - }, - { - "label": "lang_asm", - "value": "asm" - }, - { - "label": "lang_ast", - "value": "ast" - }, - { - "label": "lang_ath", - "value": "ath" - }, - { - "label": "lang_aus", - "value": "aus" - }, - { - "label": "lang_ava", - "value": "ava" - }, - { - "label": "lang_ave", - "value": "ave" - }, - { - "label": "lang_awa", - "value": "awa" - }, - { - "label": "lang_aym", - "value": "aym" - }, - { - "label": "lang_aze", - "value": "aze" - }, - { - "label": "lang_bad", - "value": "bad" - }, - { - "label": "lang_bai", - "value": "bai" - }, - { - "label": "lang_bak", - "value": "bak" - }, - { - "label": "lang_bal", - "value": "bal" - }, - { - "label": "lang_bam", - "value": "bam" - }, - { - "label": "lang_ban", - "value": "ban" - }, - { - "label": "lang_baq", - "value": "baq" - }, - { - "label": "lang_bas", - "value": "bas" - }, - { - "label": "lang_bat", - "value": "bat" - }, - { - "label": "lang_bej", - "value": "bej" - }, - { - "label": "lang_bel", - "value": "bel" - }, - { - "label": "lang_bem", - "value": "bem" - }, - { - "label": "lang_ben", - "value": "ben" - }, - { - "label": "lang_ber", - "value": "ber" - }, - { - "label": "lang_bho", - "value": "bho" - }, - { - "label": "lang_bih", - "value": "bih" - }, - { - "label": "lang_bik", - "value": "bik" - }, - { - "label": "lang_bin", - "value": "bin" - }, - { - "label": "lang_bis", - "value": "bis" - }, - { - "label": "lang_bla", - "value": "bla" - }, - { - "label": "lang_bnt", - "value": "bnt" - }, - { - "label": "lang_bos", - "value": "bos" - }, - { - "label": "lang_bra", - "value": "bra" - }, - { - "label": "lang_bre", - "value": "bre" - }, - { - "label": "lang_btk", - "value": "btk" - }, - { - "label": "lang_bua", - "value": "bua" - }, - { - "label": "lang_bug", - "value": "bug" - }, - { - "label": "lang_bul", - "value": "bul" - }, - { - "label": "lang_bur", - "value": "bur" - }, - { - "label": "lang_byn", - "value": "byn" - }, - { - "label": "lang_cad", - "value": "cad" - }, - { - "label": "lang_cai", - "value": "cai" - }, - { - "label": "lang_car", - "value": "car" - }, - { - "label": "lang_cat", - "value": "cat" - }, - { - "label": "lang_cau", - "value": "cau" - }, - { - "label": "lang_ceb", - "value": "ceb" - }, - { - "label": "lang_cel", - "value": "cel" - }, - { - "label": "lang_cha", - "value": "cha" - }, - { - "label": "lang_chb", - "value": "chb" - }, - { - "label": "lang_che", - "value": "che" - }, - { - "label": "lang_chg", - "value": "chg" - }, - { - "label": "lang_chi", - "value": "chi" - }, - { - "label": "lang_chk", - "value": "chk" - }, - { - "label": "lang_chm", - "value": "chm" - }, - { - "label": "lang_chn", - "value": "chn" - }, - { - "label": "lang_cho", - "value": "cho" - }, - { - "label": "lang_chp", - "value": "chp" - }, - { - "label": "lang_chr", - "value": "chr" - }, - { - "label": "lang_chu", - "value": "chu" - }, - { - "label": "lang_chv", - "value": "chv" - }, - { - "label": "lang_chy", - "value": "chy" - }, - { - "label": "lang_cmc", - "value": "cmc" - }, - { - "label": "lang_cnr", - "value": "cnr" - }, - { - "label": "lang_cop", - "value": "cop" - }, - { - "label": "lang_cor", - "value": "cor" - }, - { - "label": "lang_cos", - "value": "cos" - }, - { - "label": "lang_cpe", - "value": "cpe" - }, - { - "label": "lang_cpf", - "value": "cpf" - }, - { - "label": "lang_cpp", - "value": "cpp" - }, - { - "label": "lang_cre", - "value": "cre" - }, - { - "label": "lang_crh", - "value": "crh" - }, - { - "label": "lang_crp", - "value": "crp" - }, - { - "label": "lang_csb", - "value": "csb" - }, - { - "label": "lang_cus", - "value": "cus" - }, - { - "label": "lang_cze", - "value": "cze" - }, - { - "label": "lang_dak", - "value": "dak" - }, - { - "label": "lang_dan", - "value": "dan" - }, - { - "label": "lang_dar", - "value": "dar" - }, - { - "label": "lang_day", - "value": "day" - }, - { - "label": "lang_del", - "value": "del" - }, - { - "label": "lang_den", - "value": "den" - }, - { - "label": "lang_dgr", - "value": "dgr" - }, - { - "label": "lang_din", - "value": "din" - }, - { - "label": "lang_div", - "value": "div" - }, - { - "label": "lang_doi", - "value": "doi" - }, - { - "label": "lang_dra", - "value": "dra" - }, - { - "label": "lang_dsb", - "value": "dsb" - }, - { - "label": "lang_dua", - "value": "dua" - }, - { - "label": "lang_dum", - "value": "dum" - }, - { - "label": "lang_dut", - "value": "dut" - }, - { - "label": "lang_dyu", - "value": "dyu" - }, - { - "label": "lang_dzo", - "value": "dzo" - }, - { - "label": "lang_efi", - "value": "efi" - }, - { - "label": "lang_egy", - "value": "egy" - }, - { - "label": "lang_eka", - "value": "eka" - }, - { - "label": "lang_elx", - "value": "elx" - }, - { - "label": "lang_eng", - "value": "eng", - "preferred": true - }, - { - "label": "lang_enm", - "value": "enm" - }, - { - "label": "lang_epo", - "value": "epo" - }, - { - "label": "lang_est", - "value": "est" - }, - { - "label": "lang_ewe", - "value": "ewe" - }, - { - "label": "lang_ewo", - "value": "ewo" - }, - { - "label": "lang_fan", - "value": "fan" - }, - { - "label": "lang_fao", - "value": "fao" - }, - { - "label": "lang_fat", - "value": "fat" - }, - { - "label": "lang_fij", - "value": "fij" - }, - { - "label": "lang_fil", - "value": "fil" - }, - { - "label": "lang_fin", - "value": "fin" - }, - { - "label": "lang_fiu", - "value": "fiu" - }, - { - "label": "lang_fon", - "value": "fon" - }, - { - "label": "lang_fre", - "value": "fre", - "preferred": true - }, - { - "label": "lang_frm", - "value": "frm" - }, - { - "label": "lang_fro", - "value": "fro" - }, - { - "label": "lang_frr", - "value": "frr" - }, - { - "label": "lang_frs", - "value": "frs" - }, - { - "label": "lang_fry", - "value": "fry" - }, - { - "label": "lang_ful", - "value": "ful" - }, - { - "label": "lang_fur", - "value": "fur" - }, - { - "label": "lang_gaa", - "value": "gaa" - }, - { - "label": "lang_gay", - "value": "gay" - }, - { - "label": "lang_gba", - "value": "gba" - }, - { - "label": "lang_gem", - "value": "gem" - }, - { - "label": "lang_geo", - "value": "geo" - }, - { - "label": "lang_ger", - "value": "ger", - "preferred": true - }, - { - "label": "lang_gez", - "value": "gez" - }, - { - "label": "lang_gil", - "value": "gil" - }, - { - "label": "lang_gla", - "value": "gla" - }, - { - "label": "lang_gle", - "value": "gle" - }, - { - "label": "lang_glg", - "value": "glg" - }, - { - "label": "lang_glv", - "value": "glv" - }, - { - "label": "lang_gmh", - "value": "gmh" - }, - { - "label": "lang_goh", - "value": "goh" - }, - { - "label": "lang_gon", - "value": "gon" - }, - { - "label": "lang_gor", - "value": "gor" - }, - { - "label": "lang_got", - "value": "got" - }, - { - "label": "lang_grb", - "value": "grb" - }, - { - "label": "lang_grc", - "value": "grc" - }, - { - "label": "lang_gre", - "value": "gre" - }, - { - "label": "lang_grn", - "value": "grn" - }, - { - "label": "lang_gsw", - "value": "gsw" - }, - { - "label": "lang_guj", - "value": "guj" - }, - { - "label": "lang_gwi", - "value": "gwi" - }, - { - "label": "lang_hai", - "value": "hai" - }, - { - "label": "lang_hat", - "value": "hat" - }, - { - "label": "lang_hau", - "value": "hau" - }, - { - "label": "lang_haw", - "value": "haw" - }, - { - "label": "lang_heb", - "value": "heb" - }, - { - "label": "lang_her", - "value": "her" - }, - { - "label": "lang_hil", - "value": "hil" - }, - { - "label": "lang_him", - "value": "him" - }, - { - "label": "lang_hin", - "value": "hin" - }, - { - "label": "lang_hit", - "value": "hit" - }, - { - "label": "lang_hmn", - "value": "hmn" - }, - { - "label": "lang_hmo", - "value": "hmo" - }, - { - "label": "lang_hrv", - "value": "hrv" - }, - { - "label": "lang_hsb", - "value": "hsb" - }, - { - "label": "lang_hun", - "value": "hun" - }, - { - "label": "lang_hup", - "value": "hup" - }, - { - "label": "lang_iba", - "value": "iba" - }, - { - "label": "lang_ibo", - "value": "ibo" - }, - { - "label": "lang_ice", - "value": "ice" - }, - { - "label": "lang_ido", - "value": "ido" - }, - { - "label": "lang_iii", - "value": "iii" - }, - { - "label": "lang_ijo", - "value": "ijo" - }, - { - "label": "lang_iku", - "value": "iku" - }, - { - "label": "lang_ile", - "value": "ile" - }, - { - "label": "lang_ilo", - "value": "ilo" - }, - { - "label": "lang_ina", - "value": "ina" - }, - { - "label": "lang_inc", - "value": "inc" - }, - { - "label": "lang_ind", - "value": "ind" - }, - { - "label": "lang_ine", - "value": "ine" - }, - { - "label": "lang_inh", - "value": "inh" - }, - { - "label": "lang_ipk", - "value": "ipk" - }, - { - "label": "lang_ira", - "value": "ira" - }, - { - "label": "lang_iro", - "value": "iro" - }, - { - "label": "lang_ita", - "value": "ita", - "preferred": true - }, - { - "label": "lang_jav", - "value": "jav" - }, - { - "label": "lang_jbo", - "value": "jbo" - }, - { - "label": "lang_jpn", - "value": "jpn" - }, - { - "label": "lang_jpr", - "value": "jpr" - }, - { - "label": "lang_jrb", - "value": "jrb" - }, - { - "label": "lang_kaa", - "value": "kaa" - }, - { - "label": "lang_kab", - "value": "kab" - }, - { - "label": "lang_kac", - "value": "kac" - }, - { - "label": "lang_kal", - "value": "kal" - }, - { - "label": "lang_kam", - "value": "kam" - }, - { - "label": "lang_kan", - "value": "kan" - }, - { - "label": "lang_kar", - "value": "kar" - }, - { - "label": "lang_kas", - "value": "kas" - }, - { - "label": "lang_kau", - "value": "kau" - }, - { - "label": "lang_kaw", - "value": "kaw" - }, - { - "label": "lang_kaz", - "value": "kaz" - }, - { - "label": "lang_kbd", - "value": "kbd" - }, - { - "label": "lang_kha", - "value": "kha" - }, - { - "label": "lang_khi", - "value": "khi" - }, - { - "label": "lang_khm", - "value": "khm" - }, - { - "label": "lang_kho", - "value": "kho" - }, - { - "label": "lang_kik", - "value": "kik" - }, - { - "label": "lang_kin", - "value": "kin" - }, - { - "label": "lang_kir", - "value": "kir" - }, - { - "label": "lang_kmb", - "value": "kmb" - }, - { - "label": "lang_kok", - "value": "kok" - }, - { - "label": "lang_kom", - "value": "kom" - }, - { - "label": "lang_kon", - "value": "kon" - }, - { - "label": "lang_kor", - "value": "kor" - }, - { - "label": "lang_kos", - "value": "kos" - }, - { - "label": "lang_kpe", - "value": "kpe" - }, - { - "label": "lang_krc", - "value": "krc" - }, - { - "label": "lang_krl", - "value": "krl" - }, - { - "label": "lang_kro", - "value": "kro" - }, - { - "label": "lang_kru", - "value": "kru" - }, - { - "label": "lang_kua", - "value": "kua" - }, - { - "label": "lang_kum", - "value": "kum" - }, - { - "label": "lang_kur", - "value": "kur" - }, - { - "label": "lang_kut", - "value": "kut" - }, - { - "label": "lang_lad", - "value": "lad" - }, - { - "label": "lang_lah", - "value": "lah" - }, - { - "label": "lang_lam", - "value": "lam" - }, - { - "label": "lang_lao", - "value": "lao" - }, - { - "label": "lang_lat", - "value": "lat" - }, - { - "label": "lang_lav", - "value": "lav" - }, - { - "label": "lang_lez", - "value": "lez" - }, - { - "label": "lang_lim", - "value": "lim" - }, - { - "label": "lang_lin", - "value": "lin" - }, - { - "label": "lang_lit", - "value": "lit" - }, - { - "label": "lang_lol", - "value": "lol" - }, - { - "label": "lang_loz", - "value": "loz" - }, - { - "label": "lang_ltz", - "value": "ltz" - }, - { - "label": "lang_lua", - "value": "lua" - }, - { - "label": "lang_lub", - "value": "lub" - }, - { - "label": "lang_lug", - "value": "lug" - }, - { - "label": "lang_lui", - "value": "lui" - }, - { - "label": "lang_lun", - "value": "lun" - }, - { - "label": "lang_luo", - "value": "luo" - }, - { - "label": "lang_lus", - "value": "lus" - }, - { - "label": "lang_mac", - "value": "mac" - }, - { - "label": "lang_mad", - "value": "mad" - }, - { - "label": "lang_mag", - "value": "mag" - }, - { - "label": "lang_mah", - "value": "mah" - }, - { - "label": "lang_mai", - "value": "mai" - }, - { - "label": "lang_mak", - "value": "mak" - }, - { - "label": "lang_mal", - "value": "mal" - }, - { - "label": "lang_man", - "value": "man" - }, - { - "label": "lang_mao", - "value": "mao" - }, - { - "label": "lang_map", - "value": "map" - }, - { - "label": "lang_mar", - "value": "mar" - }, - { - "label": "lang_mas", - "value": "mas" - }, - { - "label": "lang_may", - "value": "may" - }, - { - "label": "lang_mdf", - "value": "mdf" - }, - { - "label": "lang_mdr", - "value": "mdr" - }, - { - "label": "lang_men", - "value": "men" - }, - { - "label": "lang_mga", - "value": "mga" - }, - { - "label": "lang_mic", - "value": "mic" - }, - { - "label": "lang_min", - "value": "min" - }, - { - "label": "lang_mis", - "value": "mis" - }, - { - "label": "lang_mkh", - "value": "mkh" - }, - { - "label": "lang_mlg", - "value": "mlg" - }, - { - "label": "lang_mlt", - "value": "mlt" - }, - { - "label": "lang_mnc", - "value": "mnc" - }, - { - "label": "lang_mni", - "value": "mni" - }, - { - "label": "lang_mno", - "value": "mno" - }, - { - "label": "lang_moh", - "value": "moh" - }, - { - "label": "lang_mon", - "value": "mon" - }, - { - "label": "lang_mos", - "value": "mos" - }, - { - "label": "lang_mul", - "value": "mul" - }, - { - "label": "lang_mun", - "value": "mun" - }, - { - "label": "lang_mus", - "value": "mus" - }, - { - "label": "lang_mwl", - "value": "mwl" - }, - { - "label": "lang_mwr", - "value": "mwr" - }, - { - "label": "lang_myn", - "value": "myn" - }, - { - "label": "lang_myv", - "value": "myv" - }, - { - "label": "lang_nah", - "value": "nah" - }, - { - "label": "lang_nai", - "value": "nai" - }, - { - "label": "lang_nap", - "value": "nap" - }, - { - "label": "lang_nau", - "value": "nau" - }, - { - "label": "lang_nav", - "value": "nav" - }, - { - "label": "lang_nbl", - "value": "nbl" - }, - { - "label": "lang_nde", - "value": "nde" - }, - { - "label": "lang_ndo", - "value": "ndo" - }, - { - "label": "lang_nds", - "value": "nds" - }, - { - "label": "lang_nep", - "value": "nep" - }, - { - "label": "lang_new", - "value": "new" - }, - { - "label": "lang_nia", - "value": "nia" - }, - { - "label": "lang_nic", - "value": "nic" - }, - { - "label": "lang_niu", - "value": "niu" - }, - { - "label": "lang_nno", - "value": "nno" - }, - { - "label": "lang_nob", - "value": "nob" - }, - { - "label": "lang_nog", - "value": "nog" - }, - { - "label": "lang_non", - "value": "non" - }, - { - "label": "lang_nor", - "value": "nor" - }, - { - "label": "lang_nqo", - "value": "nqo" - }, - { - "label": "lang_nso", - "value": "nso" - }, - { - "label": "lang_nub", - "value": "nub" - }, - { - "label": "lang_nwc", - "value": "nwc" - }, - { - "label": "lang_nya", - "value": "nya" - }, - { - "label": "lang_nym", - "value": "nym" - }, - { - "label": "lang_nyn", - "value": "nyn" - }, - { - "label": "lang_nyo", - "value": "nyo" - }, - { - "label": "lang_nzi", - "value": "nzi" - }, - { - "label": "lang_oci", - "value": "oci" - }, - { - "label": "lang_oji", - "value": "oji" - }, - { - "label": "lang_ori", - "value": "ori" - }, - { - "label": "lang_orm", - "value": "orm" - }, - { - "label": "lang_osa", - "value": "osa" - }, - { - "label": "lang_oss", - "value": "oss" - }, - { - "label": "lang_ota", - "value": "ota" - }, - { - "label": "lang_oto", - "value": "oto" - }, - { - "label": "lang_paa", - "value": "paa" - }, - { - "label": "lang_pag", - "value": "pag" - }, - { - "label": "lang_pal", - "value": "pal" - }, - { - "label": "lang_pam", - "value": "pam" - }, - { - "label": "lang_pan", - "value": "pan" - }, - { - "label": "lang_pap", - "value": "pap" - }, - { - "label": "lang_pau", - "value": "pau" - }, - { - "label": "lang_peo", - "value": "peo" - }, - { - "label": "lang_per", - "value": "per" - }, - { - "label": "lang_phi", - "value": "phi" - }, - { - "label": "lang_phn", - "value": "phn" - }, - { - "label": "lang_pli", - "value": "pli" - }, - { - "label": "lang_pol", - "value": "pol" - }, - { - "label": "lang_pon", - "value": "pon" - }, - { - "label": "lang_por", - "value": "por" - }, - { - "label": "lang_pra", - "value": "pra" - }, - { - "label": "lang_pro", - "value": "pro" - }, - { - "label": "lang_pus", - "value": "pus" - }, - { - "label": "lang_que", - "value": "que" - }, - { - "label": "lang_raj", - "value": "raj" - }, - { - "label": "lang_rap", - "value": "rap" - }, - { - "label": "lang_rar", - "value": "rar" - }, - { - "label": "lang_roa", - "value": "roa" - }, - { - "label": "lang_roh", - "value": "roh" - }, - { - "label": "lang_rom", - "value": "rom" - }, - { - "label": "lang_rum", - "value": "rum" - }, - { - "label": "lang_run", - "value": "run" - }, - { - "label": "lang_rup", - "value": "rup" - }, - { - "label": "lang_rus", - "value": "rus" - }, - { - "label": "lang_sad", - "value": "sad" - }, - { - "label": "lang_sag", - "value": "sag" - }, - { - "label": "lang_sah", - "value": "sah" - }, - { - "label": "lang_sai", - "value": "sai" - }, - { - "label": "lang_sal", - "value": "sal" - }, - { - "label": "lang_sam", - "value": "sam" - }, - { - "label": "lang_san", - "value": "san" - }, - { - "label": "lang_sas", - "value": "sas" - }, - { - "label": "lang_sat", - "value": "sat" - }, - { - "label": "lang_scn", - "value": "scn" - }, - { - "label": "lang_sco", - "value": "sco" - }, - { - "label": "lang_sel", - "value": "sel" - }, - { - "label": "lang_sem", - "value": "sem" - }, - { - "label": "lang_sga", - "value": "sga" - }, - { - "label": "lang_sgn", - "value": "sgn" - }, - { - "label": "lang_shn", - "value": "shn" - }, - { - "label": "lang_sid", - "value": "sid" - }, - { - "label": "lang_sin", - "value": "sin" - }, - { - "label": "lang_sio", - "value": "sio" - }, - { - "label": "lang_sit", - "value": "sit" - }, - { - "label": "lang_sla", - "value": "sla" - }, - { - "label": "lang_slo", - "value": "slo" - }, - { - "label": "lang_slv", - "value": "slv" - }, - { - "label": "lang_sma", - "value": "sma" - }, - { - "label": "lang_sme", - "value": "sme" - }, - { - "label": "lang_smi", - "value": "smi" - }, - { - "label": "lang_smj", - "value": "smj" - }, - { - "label": "lang_smn", - "value": "smn" - }, - { - "label": "lang_smo", - "value": "smo" - }, - { - "label": "lang_sms", - "value": "sms" - }, - { - "label": "lang_sna", - "value": "sna" - }, - { - "label": "lang_snd", - "value": "snd" - }, - { - "label": "lang_snk", - "value": "snk" - }, - { - "label": "lang_sog", - "value": "sog" - }, - { - "label": "lang_som", - "value": "som" - }, - { - "label": "lang_son", - "value": "son" - }, - { - "label": "lang_sot", - "value": "sot" - }, - { - "label": "lang_spa", - "value": "spa" - }, - { - "label": "lang_srd", - "value": "srd" - }, - { - "label": "lang_srn", - "value": "srn" - }, - { - "label": "lang_srp", - "value": "srp" - }, - { - "label": "lang_srr", - "value": "srr" - }, - { - "label": "lang_ssa", - "value": "ssa" - }, - { - "label": "lang_ssw", - "value": "ssw" - }, - { - "label": "lang_suk", - "value": "suk" - }, - { - "label": "lang_sun", - "value": "sun" - }, - { - "label": "lang_sus", - "value": "sus" - }, - { - "label": "lang_sux", - "value": "sux" - }, - { - "label": "lang_swa", - "value": "swa" - }, - { - "label": "lang_swe", - "value": "swe" - }, - { - "label": "lang_syc", - "value": "syc" - }, - { - "label": "lang_syr", - "value": "syr" - }, - { - "label": "lang_tah", - "value": "tah" - }, - { - "label": "lang_tai", - "value": "tai" - }, - { - "label": "lang_tam", - "value": "tam" - }, - { - "label": "lang_tat", - "value": "tat" - }, - { - "label": "lang_tel", - "value": "tel" - }, - { - "label": "lang_tem", - "value": "tem" - }, - { - "label": "lang_ter", - "value": "ter" - }, - { - "label": "lang_tet", - "value": "tet" - }, - { - "label": "lang_tgk", - "value": "tgk" - }, - { - "label": "lang_tgl", - "value": "tgl" - }, - { - "label": "lang_tha", - "value": "tha" - }, - { - "label": "lang_tib", - "value": "tib" - }, - { - "label": "lang_tig", - "value": "tig" - }, - { - "label": "lang_tir", - "value": "tir" - }, - { - "label": "lang_tiv", - "value": "tiv" - }, - { - "label": "lang_tkl", - "value": "tkl" - }, - { - "label": "lang_tlh", - "value": "tlh" - }, - { - "label": "lang_tli", - "value": "tli" - }, - { - "label": "lang_tmh", - "value": "tmh" - }, - { - "label": "lang_tog", - "value": "tog" - }, - { - "label": "lang_ton", - "value": "ton" - }, - { - "label": "lang_tpi", - "value": "tpi" - }, - { - "label": "lang_tsi", - "value": "tsi" - }, - { - "label": "lang_tsn", - "value": "tsn" - }, - { - "label": "lang_tso", - "value": "tso" - }, - { - "label": "lang_tuk", - "value": "tuk" - }, - { - "label": "lang_tum", - "value": "tum" - }, - { - "label": "lang_tup", - "value": "tup" - }, - { - "label": "lang_tur", - "value": "tur" - }, - { - "label": "lang_tut", - "value": "tut" - }, - { - "label": "lang_tvl", - "value": "tvl" - }, - { - "label": "lang_twi", - "value": "twi" - }, - { - "label": "lang_tyv", - "value": "tyv" - }, - { - "label": "lang_udm", - "value": "udm" - }, - { - "label": "lang_uga", - "value": "uga" - }, - { - "label": "lang_uig", - "value": "uig" - }, - { - "label": "lang_ukr", - "value": "ukr" - }, - { - "label": "lang_umb", - "value": "umb" - }, - { - "label": "lang_und", - "value": "und" - }, - { - "label": "lang_urd", - "value": "urd" - }, - { - "label": "lang_uzb", - "value": "uzb" - }, - { - "label": "lang_vai", - "value": "vai" - }, - { - "label": "lang_ven", - "value": "ven" - }, - { - "label": "lang_vie", - "value": "vie" - }, - { - "label": "lang_vol", - "value": "vol" - }, - { - "label": "lang_vot", - "value": "vot" - }, - { - "label": "lang_wak", - "value": "wak" - }, - { - "label": "lang_wal", - "value": "wal" - }, - { - "label": "lang_war", - "value": "war" - }, - { - "label": "lang_was", - "value": "was" - }, - { - "label": "lang_wel", - "value": "wel" - }, - { - "label": "lang_wen", - "value": "wen" - }, - { - "label": "lang_wln", - "value": "wln" - }, - { - "label": "lang_wol", - "value": "wol" - }, - { - "label": "lang_xal", - "value": "xal" - }, - { - "label": "lang_xho", - "value": "xho" - }, - { - "label": "lang_yao", - "value": "yao" - }, - { - "label": "lang_yap", - "value": "yap" - }, - { - "label": "lang_yid", - "value": "yid" - }, - { - "label": "lang_yor", - "value": "yor" - }, - { - "label": "lang_ypk", - "value": "ypk" - }, - { - "label": "lang_zap", - "value": "zap" - }, - { - "label": "lang_zbl", - "value": "zbl" - }, - { - "label": "lang_zen", - "value": "zen" - }, - { - "label": "lang_zha", - "value": "zha" - }, - { - "label": "lang_znd", - "value": "znd" - }, - { - "label": "lang_zul", - "value": "zul" - }, - { - "label": "lang_zun", - "value": "zun" - }, - { - "label": "lang_zxx", - "value": "zxx" - }, - { - "label": "lang_zza", - "value": "zza" + "widget": { + "formlyConfig": { + "props": { + "sort": true, + "options": [ + { + "label": "lang_aar", + "value": "aar" + }, + { + "label": "lang_abk", + "value": "abk" + }, + { + "label": "lang_ace", + "value": "ace" + }, + { + "label": "lang_ach", + "value": "ach" + }, + { + "label": "lang_ada", + "value": "ada" + }, + { + "label": "lang_ady", + "value": "ady" + }, + { + "label": "lang_afa", + "value": "afa" + }, + { + "label": "lang_afh", + "value": "afh" + }, + { + "label": "lang_afr", + "value": "afr" + }, + { + "label": "lang_ain", + "value": "ain" + }, + { + "label": "lang_aka", + "value": "aka" + }, + { + "label": "lang_akk", + "value": "akk" + }, + { + "label": "lang_alb", + "value": "alb" + }, + { + "label": "lang_ale", + "value": "ale" + }, + { + "label": "lang_alg", + "value": "alg" + }, + { + "label": "lang_alt", + "value": "alt" + }, + { + "label": "lang_amh", + "value": "amh" + }, + { + "label": "lang_ang", + "value": "ang" + }, + { + "label": "lang_anp", + "value": "anp" + }, + { + "label": "lang_apa", + "value": "apa" + }, + { + "label": "lang_ara", + "value": "ara" + }, + { + "label": "lang_arc", + "value": "arc" + }, + { + "label": "lang_arg", + "value": "arg" + }, + { + "label": "lang_arm", + "value": "arm" + }, + { + "label": "lang_arn", + "value": "arn" + }, + { + "label": "lang_arp", + "value": "arp" + }, + { + "label": "lang_art", + "value": "art" + }, + { + "label": "lang_arw", + "value": "arw" + }, + { + "label": "lang_asm", + "value": "asm" + }, + { + "label": "lang_ast", + "value": "ast" + }, + { + "label": "lang_ath", + "value": "ath" + }, + { + "label": "lang_aus", + "value": "aus" + }, + { + "label": "lang_ava", + "value": "ava" + }, + { + "label": "lang_ave", + "value": "ave" + }, + { + "label": "lang_awa", + "value": "awa" + }, + { + "label": "lang_aym", + "value": "aym" + }, + { + "label": "lang_aze", + "value": "aze" + }, + { + "label": "lang_bad", + "value": "bad" + }, + { + "label": "lang_bai", + "value": "bai" + }, + { + "label": "lang_bak", + "value": "bak" + }, + { + "label": "lang_bal", + "value": "bal" + }, + { + "label": "lang_bam", + "value": "bam" + }, + { + "label": "lang_ban", + "value": "ban" + }, + { + "label": "lang_baq", + "value": "baq" + }, + { + "label": "lang_bas", + "value": "bas" + }, + { + "label": "lang_bat", + "value": "bat" + }, + { + "label": "lang_bej", + "value": "bej" + }, + { + "label": "lang_bel", + "value": "bel" + }, + { + "label": "lang_bem", + "value": "bem" + }, + { + "label": "lang_ben", + "value": "ben" + }, + { + "label": "lang_ber", + "value": "ber" + }, + { + "label": "lang_bho", + "value": "bho" + }, + { + "label": "lang_bih", + "value": "bih" + }, + { + "label": "lang_bik", + "value": "bik" + }, + { + "label": "lang_bin", + "value": "bin" + }, + { + "label": "lang_bis", + "value": "bis" + }, + { + "label": "lang_bla", + "value": "bla" + }, + { + "label": "lang_bnt", + "value": "bnt" + }, + { + "label": "lang_bos", + "value": "bos" + }, + { + "label": "lang_bra", + "value": "bra" + }, + { + "label": "lang_bre", + "value": "bre" + }, + { + "label": "lang_btk", + "value": "btk" + }, + { + "label": "lang_bua", + "value": "bua" + }, + { + "label": "lang_bug", + "value": "bug" + }, + { + "label": "lang_bul", + "value": "bul" + }, + { + "label": "lang_bur", + "value": "bur" + }, + { + "label": "lang_byn", + "value": "byn" + }, + { + "label": "lang_cad", + "value": "cad" + }, + { + "label": "lang_cai", + "value": "cai" + }, + { + "label": "lang_car", + "value": "car" + }, + { + "label": "lang_cat", + "value": "cat" + }, + { + "label": "lang_cau", + "value": "cau" + }, + { + "label": "lang_ceb", + "value": "ceb" + }, + { + "label": "lang_cel", + "value": "cel" + }, + { + "label": "lang_cha", + "value": "cha" + }, + { + "label": "lang_chb", + "value": "chb" + }, + { + "label": "lang_che", + "value": "che" + }, + { + "label": "lang_chg", + "value": "chg" + }, + { + "label": "lang_chi", + "value": "chi" + }, + { + "label": "lang_chk", + "value": "chk" + }, + { + "label": "lang_chm", + "value": "chm" + }, + { + "label": "lang_chn", + "value": "chn" + }, + { + "label": "lang_cho", + "value": "cho" + }, + { + "label": "lang_chp", + "value": "chp" + }, + { + "label": "lang_chr", + "value": "chr" + }, + { + "label": "lang_chu", + "value": "chu" + }, + { + "label": "lang_chv", + "value": "chv" + }, + { + "label": "lang_chy", + "value": "chy" + }, + { + "label": "lang_cmc", + "value": "cmc" + }, + { + "label": "lang_cnr", + "value": "cnr" + }, + { + "label": "lang_cop", + "value": "cop" + }, + { + "label": "lang_cor", + "value": "cor" + }, + { + "label": "lang_cos", + "value": "cos" + }, + { + "label": "lang_cpe", + "value": "cpe" + }, + { + "label": "lang_cpf", + "value": "cpf" + }, + { + "label": "lang_cpp", + "value": "cpp" + }, + { + "label": "lang_cre", + "value": "cre" + }, + { + "label": "lang_crh", + "value": "crh" + }, + { + "label": "lang_crp", + "value": "crp" + }, + { + "label": "lang_csb", + "value": "csb" + }, + { + "label": "lang_cus", + "value": "cus" + }, + { + "label": "lang_cze", + "value": "cze" + }, + { + "label": "lang_dak", + "value": "dak" + }, + { + "label": "lang_dan", + "value": "dan" + }, + { + "label": "lang_dar", + "value": "dar" + }, + { + "label": "lang_day", + "value": "day" + }, + { + "label": "lang_del", + "value": "del" + }, + { + "label": "lang_den", + "value": "den" + }, + { + "label": "lang_dgr", + "value": "dgr" + }, + { + "label": "lang_din", + "value": "din" + }, + { + "label": "lang_div", + "value": "div" + }, + { + "label": "lang_doi", + "value": "doi" + }, + { + "label": "lang_dra", + "value": "dra" + }, + { + "label": "lang_dsb", + "value": "dsb" + }, + { + "label": "lang_dua", + "value": "dua" + }, + { + "label": "lang_dum", + "value": "dum" + }, + { + "label": "lang_dut", + "value": "dut" + }, + { + "label": "lang_dyu", + "value": "dyu" + }, + { + "label": "lang_dzo", + "value": "dzo" + }, + { + "label": "lang_efi", + "value": "efi" + }, + { + "label": "lang_egy", + "value": "egy" + }, + { + "label": "lang_eka", + "value": "eka" + }, + { + "label": "lang_elx", + "value": "elx" + }, + { + "label": "lang_eng", + "value": "eng", + "preferred": true + }, + { + "label": "lang_enm", + "value": "enm" + }, + { + "label": "lang_epo", + "value": "epo" + }, + { + "label": "lang_est", + "value": "est" + }, + { + "label": "lang_ewe", + "value": "ewe" + }, + { + "label": "lang_ewo", + "value": "ewo" + }, + { + "label": "lang_fan", + "value": "fan" + }, + { + "label": "lang_fao", + "value": "fao" + }, + { + "label": "lang_fat", + "value": "fat" + }, + { + "label": "lang_fij", + "value": "fij" + }, + { + "label": "lang_fil", + "value": "fil" + }, + { + "label": "lang_fin", + "value": "fin" + }, + { + "label": "lang_fiu", + "value": "fiu" + }, + { + "label": "lang_fon", + "value": "fon" + }, + { + "label": "lang_fre", + "value": "fre", + "preferred": true + }, + { + "label": "lang_frm", + "value": "frm" + }, + { + "label": "lang_fro", + "value": "fro" + }, + { + "label": "lang_frr", + "value": "frr" + }, + { + "label": "lang_frs", + "value": "frs" + }, + { + "label": "lang_fry", + "value": "fry" + }, + { + "label": "lang_ful", + "value": "ful" + }, + { + "label": "lang_fur", + "value": "fur" + }, + { + "label": "lang_gaa", + "value": "gaa" + }, + { + "label": "lang_gay", + "value": "gay" + }, + { + "label": "lang_gba", + "value": "gba" + }, + { + "label": "lang_gem", + "value": "gem" + }, + { + "label": "lang_geo", + "value": "geo" + }, + { + "label": "lang_ger", + "value": "ger", + "preferred": true + }, + { + "label": "lang_gez", + "value": "gez" + }, + { + "label": "lang_gil", + "value": "gil" + }, + { + "label": "lang_gla", + "value": "gla" + }, + { + "label": "lang_gle", + "value": "gle" + }, + { + "label": "lang_glg", + "value": "glg" + }, + { + "label": "lang_glv", + "value": "glv" + }, + { + "label": "lang_gmh", + "value": "gmh" + }, + { + "label": "lang_goh", + "value": "goh" + }, + { + "label": "lang_gon", + "value": "gon" + }, + { + "label": "lang_gor", + "value": "gor" + }, + { + "label": "lang_got", + "value": "got" + }, + { + "label": "lang_grb", + "value": "grb" + }, + { + "label": "lang_grc", + "value": "grc" + }, + { + "label": "lang_gre", + "value": "gre" + }, + { + "label": "lang_grn", + "value": "grn" + }, + { + "label": "lang_gsw", + "value": "gsw" + }, + { + "label": "lang_guj", + "value": "guj" + }, + { + "label": "lang_gwi", + "value": "gwi" + }, + { + "label": "lang_hai", + "value": "hai" + }, + { + "label": "lang_hat", + "value": "hat" + }, + { + "label": "lang_hau", + "value": "hau" + }, + { + "label": "lang_haw", + "value": "haw" + }, + { + "label": "lang_heb", + "value": "heb" + }, + { + "label": "lang_her", + "value": "her" + }, + { + "label": "lang_hil", + "value": "hil" + }, + { + "label": "lang_him", + "value": "him" + }, + { + "label": "lang_hin", + "value": "hin" + }, + { + "label": "lang_hit", + "value": "hit" + }, + { + "label": "lang_hmn", + "value": "hmn" + }, + { + "label": "lang_hmo", + "value": "hmo" + }, + { + "label": "lang_hrv", + "value": "hrv" + }, + { + "label": "lang_hsb", + "value": "hsb" + }, + { + "label": "lang_hun", + "value": "hun" + }, + { + "label": "lang_hup", + "value": "hup" + }, + { + "label": "lang_iba", + "value": "iba" + }, + { + "label": "lang_ibo", + "value": "ibo" + }, + { + "label": "lang_ice", + "value": "ice" + }, + { + "label": "lang_ido", + "value": "ido" + }, + { + "label": "lang_iii", + "value": "iii" + }, + { + "label": "lang_ijo", + "value": "ijo" + }, + { + "label": "lang_iku", + "value": "iku" + }, + { + "label": "lang_ile", + "value": "ile" + }, + { + "label": "lang_ilo", + "value": "ilo" + }, + { + "label": "lang_ina", + "value": "ina" + }, + { + "label": "lang_inc", + "value": "inc" + }, + { + "label": "lang_ind", + "value": "ind" + }, + { + "label": "lang_ine", + "value": "ine" + }, + { + "label": "lang_inh", + "value": "inh" + }, + { + "label": "lang_ipk", + "value": "ipk" + }, + { + "label": "lang_ira", + "value": "ira" + }, + { + "label": "lang_iro", + "value": "iro" + }, + { + "label": "lang_ita", + "value": "ita", + "preferred": true + }, + { + "label": "lang_jav", + "value": "jav" + }, + { + "label": "lang_jbo", + "value": "jbo" + }, + { + "label": "lang_jpn", + "value": "jpn" + }, + { + "label": "lang_jpr", + "value": "jpr" + }, + { + "label": "lang_jrb", + "value": "jrb" + }, + { + "label": "lang_kaa", + "value": "kaa" + }, + { + "label": "lang_kab", + "value": "kab" + }, + { + "label": "lang_kac", + "value": "kac" + }, + { + "label": "lang_kal", + "value": "kal" + }, + { + "label": "lang_kam", + "value": "kam" + }, + { + "label": "lang_kan", + "value": "kan" + }, + { + "label": "lang_kar", + "value": "kar" + }, + { + "label": "lang_kas", + "value": "kas" + }, + { + "label": "lang_kau", + "value": "kau" + }, + { + "label": "lang_kaw", + "value": "kaw" + }, + { + "label": "lang_kaz", + "value": "kaz" + }, + { + "label": "lang_kbd", + "value": "kbd" + }, + { + "label": "lang_kha", + "value": "kha" + }, + { + "label": "lang_khi", + "value": "khi" + }, + { + "label": "lang_khm", + "value": "khm" + }, + { + "label": "lang_kho", + "value": "kho" + }, + { + "label": "lang_kik", + "value": "kik" + }, + { + "label": "lang_kin", + "value": "kin" + }, + { + "label": "lang_kir", + "value": "kir" + }, + { + "label": "lang_kmb", + "value": "kmb" + }, + { + "label": "lang_kok", + "value": "kok" + }, + { + "label": "lang_kom", + "value": "kom" + }, + { + "label": "lang_kon", + "value": "kon" + }, + { + "label": "lang_kor", + "value": "kor" + }, + { + "label": "lang_kos", + "value": "kos" + }, + { + "label": "lang_kpe", + "value": "kpe" + }, + { + "label": "lang_krc", + "value": "krc" + }, + { + "label": "lang_krl", + "value": "krl" + }, + { + "label": "lang_kro", + "value": "kro" + }, + { + "label": "lang_kru", + "value": "kru" + }, + { + "label": "lang_kua", + "value": "kua" + }, + { + "label": "lang_kum", + "value": "kum" + }, + { + "label": "lang_kur", + "value": "kur" + }, + { + "label": "lang_kut", + "value": "kut" + }, + { + "label": "lang_lad", + "value": "lad" + }, + { + "label": "lang_lah", + "value": "lah" + }, + { + "label": "lang_lam", + "value": "lam" + }, + { + "label": "lang_lao", + "value": "lao" + }, + { + "label": "lang_lat", + "value": "lat" + }, + { + "label": "lang_lav", + "value": "lav" + }, + { + "label": "lang_lez", + "value": "lez" + }, + { + "label": "lang_lim", + "value": "lim" + }, + { + "label": "lang_lin", + "value": "lin" + }, + { + "label": "lang_lit", + "value": "lit" + }, + { + "label": "lang_lol", + "value": "lol" + }, + { + "label": "lang_loz", + "value": "loz" + }, + { + "label": "lang_ltz", + "value": "ltz" + }, + { + "label": "lang_lua", + "value": "lua" + }, + { + "label": "lang_lub", + "value": "lub" + }, + { + "label": "lang_lug", + "value": "lug" + }, + { + "label": "lang_lui", + "value": "lui" + }, + { + "label": "lang_lun", + "value": "lun" + }, + { + "label": "lang_luo", + "value": "luo" + }, + { + "label": "lang_lus", + "value": "lus" + }, + { + "label": "lang_mac", + "value": "mac" + }, + { + "label": "lang_mad", + "value": "mad" + }, + { + "label": "lang_mag", + "value": "mag" + }, + { + "label": "lang_mah", + "value": "mah" + }, + { + "label": "lang_mai", + "value": "mai" + }, + { + "label": "lang_mak", + "value": "mak" + }, + { + "label": "lang_mal", + "value": "mal" + }, + { + "label": "lang_man", + "value": "man" + }, + { + "label": "lang_mao", + "value": "mao" + }, + { + "label": "lang_map", + "value": "map" + }, + { + "label": "lang_mar", + "value": "mar" + }, + { + "label": "lang_mas", + "value": "mas" + }, + { + "label": "lang_may", + "value": "may" + }, + { + "label": "lang_mdf", + "value": "mdf" + }, + { + "label": "lang_mdr", + "value": "mdr" + }, + { + "label": "lang_men", + "value": "men" + }, + { + "label": "lang_mga", + "value": "mga" + }, + { + "label": "lang_mic", + "value": "mic" + }, + { + "label": "lang_min", + "value": "min" + }, + { + "label": "lang_mis", + "value": "mis" + }, + { + "label": "lang_mkh", + "value": "mkh" + }, + { + "label": "lang_mlg", + "value": "mlg" + }, + { + "label": "lang_mlt", + "value": "mlt" + }, + { + "label": "lang_mnc", + "value": "mnc" + }, + { + "label": "lang_mni", + "value": "mni" + }, + { + "label": "lang_mno", + "value": "mno" + }, + { + "label": "lang_moh", + "value": "moh" + }, + { + "label": "lang_mon", + "value": "mon" + }, + { + "label": "lang_mos", + "value": "mos" + }, + { + "label": "lang_mul", + "value": "mul" + }, + { + "label": "lang_mun", + "value": "mun" + }, + { + "label": "lang_mus", + "value": "mus" + }, + { + "label": "lang_mwl", + "value": "mwl" + }, + { + "label": "lang_mwr", + "value": "mwr" + }, + { + "label": "lang_myn", + "value": "myn" + }, + { + "label": "lang_myv", + "value": "myv" + }, + { + "label": "lang_nah", + "value": "nah" + }, + { + "label": "lang_nai", + "value": "nai" + }, + { + "label": "lang_nap", + "value": "nap" + }, + { + "label": "lang_nau", + "value": "nau" + }, + { + "label": "lang_nav", + "value": "nav" + }, + { + "label": "lang_nbl", + "value": "nbl" + }, + { + "label": "lang_nde", + "value": "nde" + }, + { + "label": "lang_ndo", + "value": "ndo" + }, + { + "label": "lang_nds", + "value": "nds" + }, + { + "label": "lang_nep", + "value": "nep" + }, + { + "label": "lang_new", + "value": "new" + }, + { + "label": "lang_nia", + "value": "nia" + }, + { + "label": "lang_nic", + "value": "nic" + }, + { + "label": "lang_niu", + "value": "niu" + }, + { + "label": "lang_nno", + "value": "nno" + }, + { + "label": "lang_nob", + "value": "nob" + }, + { + "label": "lang_nog", + "value": "nog" + }, + { + "label": "lang_non", + "value": "non" + }, + { + "label": "lang_nor", + "value": "nor" + }, + { + "label": "lang_nqo", + "value": "nqo" + }, + { + "label": "lang_nso", + "value": "nso" + }, + { + "label": "lang_nub", + "value": "nub" + }, + { + "label": "lang_nwc", + "value": "nwc" + }, + { + "label": "lang_nya", + "value": "nya" + }, + { + "label": "lang_nym", + "value": "nym" + }, + { + "label": "lang_nyn", + "value": "nyn" + }, + { + "label": "lang_nyo", + "value": "nyo" + }, + { + "label": "lang_nzi", + "value": "nzi" + }, + { + "label": "lang_oci", + "value": "oci" + }, + { + "label": "lang_oji", + "value": "oji" + }, + { + "label": "lang_ori", + "value": "ori" + }, + { + "label": "lang_orm", + "value": "orm" + }, + { + "label": "lang_osa", + "value": "osa" + }, + { + "label": "lang_oss", + "value": "oss" + }, + { + "label": "lang_ota", + "value": "ota" + }, + { + "label": "lang_oto", + "value": "oto" + }, + { + "label": "lang_paa", + "value": "paa" + }, + { + "label": "lang_pag", + "value": "pag" + }, + { + "label": "lang_pal", + "value": "pal" + }, + { + "label": "lang_pam", + "value": "pam" + }, + { + "label": "lang_pan", + "value": "pan" + }, + { + "label": "lang_pap", + "value": "pap" + }, + { + "label": "lang_pau", + "value": "pau" + }, + { + "label": "lang_peo", + "value": "peo" + }, + { + "label": "lang_per", + "value": "per" + }, + { + "label": "lang_phi", + "value": "phi" + }, + { + "label": "lang_phn", + "value": "phn" + }, + { + "label": "lang_pli", + "value": "pli" + }, + { + "label": "lang_pol", + "value": "pol" + }, + { + "label": "lang_pon", + "value": "pon" + }, + { + "label": "lang_por", + "value": "por" + }, + { + "label": "lang_pra", + "value": "pra" + }, + { + "label": "lang_pro", + "value": "pro" + }, + { + "label": "lang_pus", + "value": "pus" + }, + { + "label": "lang_que", + "value": "que" + }, + { + "label": "lang_raj", + "value": "raj" + }, + { + "label": "lang_rap", + "value": "rap" + }, + { + "label": "lang_rar", + "value": "rar" + }, + { + "label": "lang_roa", + "value": "roa" + }, + { + "label": "lang_roh", + "value": "roh" + }, + { + "label": "lang_rom", + "value": "rom" + }, + { + "label": "lang_rum", + "value": "rum" + }, + { + "label": "lang_run", + "value": "run" + }, + { + "label": "lang_rup", + "value": "rup" + }, + { + "label": "lang_rus", + "value": "rus" + }, + { + "label": "lang_sad", + "value": "sad" + }, + { + "label": "lang_sag", + "value": "sag" + }, + { + "label": "lang_sah", + "value": "sah" + }, + { + "label": "lang_sai", + "value": "sai" + }, + { + "label": "lang_sal", + "value": "sal" + }, + { + "label": "lang_sam", + "value": "sam" + }, + { + "label": "lang_san", + "value": "san" + }, + { + "label": "lang_sas", + "value": "sas" + }, + { + "label": "lang_sat", + "value": "sat" + }, + { + "label": "lang_scn", + "value": "scn" + }, + { + "label": "lang_sco", + "value": "sco" + }, + { + "label": "lang_sel", + "value": "sel" + }, + { + "label": "lang_sem", + "value": "sem" + }, + { + "label": "lang_sga", + "value": "sga" + }, + { + "label": "lang_sgn", + "value": "sgn" + }, + { + "label": "lang_shn", + "value": "shn" + }, + { + "label": "lang_sid", + "value": "sid" + }, + { + "label": "lang_sin", + "value": "sin" + }, + { + "label": "lang_sio", + "value": "sio" + }, + { + "label": "lang_sit", + "value": "sit" + }, + { + "label": "lang_sla", + "value": "sla" + }, + { + "label": "lang_slo", + "value": "slo" + }, + { + "label": "lang_slv", + "value": "slv" + }, + { + "label": "lang_sma", + "value": "sma" + }, + { + "label": "lang_sme", + "value": "sme" + }, + { + "label": "lang_smi", + "value": "smi" + }, + { + "label": "lang_smj", + "value": "smj" + }, + { + "label": "lang_smn", + "value": "smn" + }, + { + "label": "lang_smo", + "value": "smo" + }, + { + "label": "lang_sms", + "value": "sms" + }, + { + "label": "lang_sna", + "value": "sna" + }, + { + "label": "lang_snd", + "value": "snd" + }, + { + "label": "lang_snk", + "value": "snk" + }, + { + "label": "lang_sog", + "value": "sog" + }, + { + "label": "lang_som", + "value": "som" + }, + { + "label": "lang_son", + "value": "son" + }, + { + "label": "lang_sot", + "value": "sot" + }, + { + "label": "lang_spa", + "value": "spa" + }, + { + "label": "lang_srd", + "value": "srd" + }, + { + "label": "lang_srn", + "value": "srn" + }, + { + "label": "lang_srp", + "value": "srp" + }, + { + "label": "lang_srr", + "value": "srr" + }, + { + "label": "lang_ssa", + "value": "ssa" + }, + { + "label": "lang_ssw", + "value": "ssw" + }, + { + "label": "lang_suk", + "value": "suk" + }, + { + "label": "lang_sun", + "value": "sun" + }, + { + "label": "lang_sus", + "value": "sus" + }, + { + "label": "lang_sux", + "value": "sux" + }, + { + "label": "lang_swa", + "value": "swa" + }, + { + "label": "lang_swe", + "value": "swe" + }, + { + "label": "lang_syc", + "value": "syc" + }, + { + "label": "lang_syr", + "value": "syr" + }, + { + "label": "lang_tah", + "value": "tah" + }, + { + "label": "lang_tai", + "value": "tai" + }, + { + "label": "lang_tam", + "value": "tam" + }, + { + "label": "lang_tat", + "value": "tat" + }, + { + "label": "lang_tel", + "value": "tel" + }, + { + "label": "lang_tem", + "value": "tem" + }, + { + "label": "lang_ter", + "value": "ter" + }, + { + "label": "lang_tet", + "value": "tet" + }, + { + "label": "lang_tgk", + "value": "tgk" + }, + { + "label": "lang_tgl", + "value": "tgl" + }, + { + "label": "lang_tha", + "value": "tha" + }, + { + "label": "lang_tib", + "value": "tib" + }, + { + "label": "lang_tig", + "value": "tig" + }, + { + "label": "lang_tir", + "value": "tir" + }, + { + "label": "lang_tiv", + "value": "tiv" + }, + { + "label": "lang_tkl", + "value": "tkl" + }, + { + "label": "lang_tlh", + "value": "tlh" + }, + { + "label": "lang_tli", + "value": "tli" + }, + { + "label": "lang_tmh", + "value": "tmh" + }, + { + "label": "lang_tog", + "value": "tog" + }, + { + "label": "lang_ton", + "value": "ton" + }, + { + "label": "lang_tpi", + "value": "tpi" + }, + { + "label": "lang_tsi", + "value": "tsi" + }, + { + "label": "lang_tsn", + "value": "tsn" + }, + { + "label": "lang_tso", + "value": "tso" + }, + { + "label": "lang_tuk", + "value": "tuk" + }, + { + "label": "lang_tum", + "value": "tum" + }, + { + "label": "lang_tup", + "value": "tup" + }, + { + "label": "lang_tur", + "value": "tur" + }, + { + "label": "lang_tut", + "value": "tut" + }, + { + "label": "lang_tvl", + "value": "tvl" + }, + { + "label": "lang_twi", + "value": "twi" + }, + { + "label": "lang_tyv", + "value": "tyv" + }, + { + "label": "lang_udm", + "value": "udm" + }, + { + "label": "lang_uga", + "value": "uga" + }, + { + "label": "lang_uig", + "value": "uig" + }, + { + "label": "lang_ukr", + "value": "ukr" + }, + { + "label": "lang_umb", + "value": "umb" + }, + { + "label": "lang_und", + "value": "und" + }, + { + "label": "lang_urd", + "value": "urd" + }, + { + "label": "lang_uzb", + "value": "uzb" + }, + { + "label": "lang_vai", + "value": "vai" + }, + { + "label": "lang_ven", + "value": "ven" + }, + { + "label": "lang_vie", + "value": "vie" + }, + { + "label": "lang_vol", + "value": "vol" + }, + { + "label": "lang_vot", + "value": "vot" + }, + { + "label": "lang_wak", + "value": "wak" + }, + { + "label": "lang_wal", + "value": "wal" + }, + { + "label": "lang_war", + "value": "war" + }, + { + "label": "lang_was", + "value": "was" + }, + { + "label": "lang_wel", + "value": "wel" + }, + { + "label": "lang_wen", + "value": "wen" + }, + { + "label": "lang_wln", + "value": "wln" + }, + { + "label": "lang_wol", + "value": "wol" + }, + { + "label": "lang_xal", + "value": "xal" + }, + { + "label": "lang_xho", + "value": "xho" + }, + { + "label": "lang_yao", + "value": "yao" + }, + { + "label": "lang_yap", + "value": "yap" + }, + { + "label": "lang_yid", + "value": "yid" + }, + { + "label": "lang_yor", + "value": "yor" + }, + { + "label": "lang_ypk", + "value": "ypk" + }, + { + "label": "lang_zap", + "value": "zap" + }, + { + "label": "lang_zbl", + "value": "zbl" + }, + { + "label": "lang_zen", + "value": "zen" + }, + { + "label": "lang_zha", + "value": "zha" + }, + { + "label": "lang_znd", + "value": "znd" + }, + { + "label": "lang_zul", + "value": "zul" + }, + { + "label": "lang_zun", + "value": "zun" + }, + { + "label": "lang_zxx", + "value": "zxx" + }, + { + "label": "lang_zza", + "value": "zza" + } + ] } - ] + } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/license-v1.0.0.json b/sonar/common/jsonschemas/license-v1.0.0.json index d3064ae3..8a0a5bff 100644 --- a/sonar/common/jsonschemas/license-v1.0.0.json +++ b/sonar/common/jsonschemas/license-v1.0.0.json @@ -13,52 +13,54 @@ "Rights reserved" ], "default": "License undefined", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + }, "wrappers": [ "card" - ] - }, - "expressionProperties": { - "templateOptions.required": "true" - }, - "options": [ - { - "label": "CC0", - "value": "CC0" - }, - { - "label": "CC BY", - "value": "CC BY" - }, - { - "label": "CC BY-NC", - "value": "CC BY-NC" - }, - { - "label": "CC BY-NC-ND", - "value": "CC BY-NC-ND" - }, - { - "label": "CC BY-NC-SA", - "value": "CC BY-NC-SA" - }, - { - "label": "CC BY-ND", - "value": "CC BY-ND" - }, - { - "label": "CC BY-SA", - "value": "CC BY-SA" - }, - { - "label": "License undefined", - "value": "License undefined" - }, - { - "label": "Rights reserved", - "value": "Rights reserved" + ], + "props": { + "options": [ + { + "label": "CC0", + "value": "CC0" + }, + { + "label": "CC BY", + "value": "CC BY" + }, + { + "label": "CC BY-NC", + "value": "CC BY-NC" + }, + { + "label": "CC BY-NC-ND", + "value": "CC BY-NC-ND" + }, + { + "label": "CC BY-NC-SA", + "value": "CC BY-NC-SA" + }, + { + "label": "CC BY-ND", + "value": "CC BY-ND" + }, + { + "label": "CC BY-SA", + "value": "CC BY-SA" + }, + { + "label": "License undefined", + "value": "License undefined" + }, + { + "label": "Rights reserved", + "value": "Rights reserved" + } + ] } - ] + } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/masked-v1.0.0.json b/sonar/common/jsonschemas/masked-v1.0.0.json index 57a09b2a..675f392f 100644 --- a/sonar/common/jsonschemas/masked-v1.0.0.json +++ b/sonar/common/jsonschemas/masked-v1.0.0.json @@ -8,23 +8,27 @@ ], "description": "A masked document is visible in the professional interface, but not in the public interface.", "default": "not_masked", - "form": { - "options": [ - { - "label": "Public", - "value": "not_masked" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" }, - { - "label": "Private", - "value": "masked_for_all" - }, - { - "label": "Restricted to the organisation", - "value": "masked_for_external_ips" + "props": { + "options": [ + { + "label": "Public", + "value": "not_masked" + }, + { + "label": "Private", + "value": "masked_for_all" + }, + { + "label": "Restricted to the organisation", + "value": "masked_for_external_ips" + } + ] } - ], - "expressionProperties": { - "templateOptions.required": "true" } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/oa-status-v1.0.0.json b/sonar/common/jsonschemas/oa-status-v1.0.0.json index cfba26fc..4dc6c204 100644 --- a/sonar/common/jsonschemas/oa-status-v1.0.0.json +++ b/sonar/common/jsonschemas/oa-status-v1.0.0.json @@ -9,36 +9,40 @@ "diamond", "closed" ], - "form": { - "hide": true, - "navigation": { - "essential": true - }, - "options": [ - { - "label": "Green", - "value": "green" - }, - { - "label": "Gold", - "value": "gold" - }, - { - "label": "Hybrid", - "value": "hybrid" - }, - { - "label": "Bronze", - "value": "bronze" - }, - { - "label": "Diamond", - "value": "diamond" - }, - { - "label": "Closed", - "value": "closed" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "Green", + "value": "green" + }, + { + "label": "Gold", + "value": "gold" + }, + { + "label": "Hybrid", + "value": "hybrid" + }, + { + "label": "Bronze", + "value": "bronze" + }, + { + "label": "Diamond", + "value": "diamond" + }, + { + "label": "Closed", + "value": "closed" + } + ], + "hide": true, + "navigation": { + "essential": true + } } - ] + } } -} +} \ No newline at end of file diff --git a/sonar/common/jsonschemas/type-v1.0.0.json b/sonar/common/jsonschemas/type-v1.0.0.json index 60591c03..09a8e9d1 100644 --- a/sonar/common/jsonschemas/type-v1.0.0.json +++ b/sonar/common/jsonschemas/type-v1.0.0.json @@ -52,233 +52,235 @@ "coar:c_8042", "coar:c_1843" ], - "form": { - "templateOptions": { - "sort": false, + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + }, "wrappers": [ "card" - ] - }, - "options": [ - { - "label": "document_type_coar:c_2f33", - "value": "coar:c_2f33", - "preferred": true - }, - { - "label": "document_type_coar:c_3248", - "value": "coar:c_3248", - "preferred": true - }, - { - "label": "document_type_coar:c_c94f", - "value": "coar:c_c94f", - "children": [ + ], + "props": { + "sort": false, + "options": [ { - "label": "document_type_coar:c_5794", - "value": "coar:c_5794", + "label": "document_type_coar:c_2f33", + "value": "coar:c_2f33", "preferred": true }, { - "label": "document_type_coar:c_18cp", - "value": "coar:c_18cp" - }, - { - "label": "document_type_coar:c_6670", - "value": "coar:c_6670" - }, - { - "label": "document_type_coar:c_18co", - "value": "coar:c_18co" - }, - { - "label": "document_type_coar:c_f744", - "value": "coar:c_f744" - }, - { - "label": "document_type_coar:R60J-J5BD", - "value": "coar:R60J-J5BD" - } - ] - }, - { - "label": "document_type_coar:c_ddb1", - "value": "coar:c_ddb1" - }, - { - "label": "document_type_coar:c_3e5a", - "value": "coar:c_3e5a", - "children": [ - { - "label": "document_type_coar:c_beb9", - "value": "coar:c_beb9" - }, - { - "label": "document_type_coar:c_6501", - "value": "coar:c_6501", + "label": "document_type_coar:c_3248", + "value": "coar:c_3248", "preferred": true }, { - "label": "document_type_coar:c_998f", - "value": "coar:c_998f" - }, - { - "label": "document_type_coar:c_dcae04bc", - "value": "coar:c_dcae04bc" - } - ] - }, - { - "label": "document_type_coar:c_ba08", - "value": "coar:c_ba08" - }, - { - "label": "document_type_coar:c_8544", - "value": "coar:c_8544" - }, - { - "label": "document_type_non_textual_object", - "value": "non_textual_object", - "children": [ - { - "label": "document_type_coar:c_8a7e", - "value": "coar:c_8a7e" - }, - { - "label": "document_type_coar:c_ecc8", - "value": "coar:c_ecc8" - }, - { - "label": "document_type_coar:c_12cc", - "value": "coar:c_12cc" + "label": "document_type_coar:c_c94f", + "value": "coar:c_c94f", + "children": [ + { + "label": "document_type_coar:c_5794", + "value": "coar:c_5794", + "preferred": true + }, + { + "label": "document_type_coar:c_18cp", + "value": "coar:c_18cp" + }, + { + "label": "document_type_coar:c_6670", + "value": "coar:c_6670" + }, + { + "label": "document_type_coar:c_18co", + "value": "coar:c_18co" + }, + { + "label": "document_type_coar:c_f744", + "value": "coar:c_f744" + }, + { + "label": "document_type_coar:R60J-J5BD", + "value": "coar:R60J-J5BD" + } + ] }, { - "label": "document_type_coar:c_18cc", - "value": "coar:c_18cc" + "label": "document_type_coar:c_ddb1", + "value": "coar:c_ddb1" }, { - "label": "document_type_coar:c_18cw", - "value": "coar:c_18cw" + "label": "document_type_coar:c_3e5a", + "value": "coar:c_3e5a", + "children": [ + { + "label": "document_type_coar:c_beb9", + "value": "coar:c_beb9" + }, + { + "label": "document_type_coar:c_6501", + "value": "coar:c_6501", + "preferred": true + }, + { + "label": "document_type_coar:c_998f", + "value": "coar:c_998f" + }, + { + "label": "document_type_coar:c_dcae04bc", + "value": "coar:c_dcae04bc" + } + ] }, { - "label": "document_type_coar:c_5ce6", - "value": "coar:c_5ce6" - } - ] - }, - { - "label": "document_type_coar:c_15cd", - "value": "coar:c_15cd" - }, - { - "label": "document_type_coar:c_2659", - "value": "coar:c_2659", - "children": [ - { - "label": "document_type_coar:c_0640", - "value": "coar:c_0640" - }, - { - "label": "document_type_coar:c_2cd9", - "value": "coar:c_2cd9" - }, - { - "label": "document_type_coar:c_2fe3", - "value": "coar:c_2fe3" - } - ] - }, - { - "label": "document_type_coar:c_816b", - "value": "coar:c_816b", - "preferred": true - }, - { - "label": "document_type_coar:c_93fc", - "value": "coar:c_93fc", - "children": [ - { - "label": "document_type_coar:c_18ww", - "value": "coar:c_18ww" - }, - { - "label": "document_type_coar:c_18wz", - "value": "coar:c_18wz" - }, - { - "label": "document_type_coar:c_18wq", - "value": "coar:c_18wq" - }, - { - "label": "document_type_coar:c_186u", - "value": "coar:c_186u" + "label": "document_type_coar:c_ba08", + "value": "coar:c_ba08" }, { - "label": "document_type_coar:c_18op", - "value": "coar:c_18op" + "label": "document_type_coar:c_8544", + "value": "coar:c_8544" }, { - "label": "document_type_coar:c_ba1f", - "value": "coar:c_ba1f" + "label": "document_type_non_textual_object", + "value": "non_textual_object", + "children": [ + { + "label": "document_type_coar:c_8a7e", + "value": "coar:c_8a7e" + }, + { + "label": "document_type_coar:c_ecc8", + "value": "coar:c_ecc8" + }, + { + "label": "document_type_coar:c_12cc", + "value": "coar:c_12cc" + }, + { + "label": "document_type_coar:c_18cc", + "value": "coar:c_18cc" + }, + { + "label": "document_type_coar:c_18cw", + "value": "coar:c_18cw" + }, + { + "label": "document_type_coar:c_5ce6", + "value": "coar:c_5ce6" + } + ] }, { - "label": "document_type_coar:c_18hj", - "value": "coar:c_18hj" + "label": "document_type_coar:c_15cd", + "value": "coar:c_15cd" }, { - "label": "document_type_coar:c_18ws", - "value": "coar:c_18ws" + "label": "document_type_coar:c_2659", + "value": "coar:c_2659", + "children": [ + { + "label": "document_type_coar:c_0640", + "value": "coar:c_0640" + }, + { + "label": "document_type_coar:c_2cd9", + "value": "coar:c_2cd9" + }, + { + "label": "document_type_coar:c_2fe3", + "value": "coar:c_2fe3" + } + ] }, { - "label": "document_type_coar:c_18gh", - "value": "coar:c_18gh" - } - ] - }, - { - "label": "document_type_coar:c_46ec", - "value": "coar:c_46ec", - "children": [ - { - "label": "document_type_coar:c_7a1f", - "value": "coar:c_7a1f", + "label": "document_type_coar:c_816b", + "value": "coar:c_816b", "preferred": true }, { - "label": "document_type_coar:c_db06", - "value": "coar:c_db06", - "preferred": true + "label": "document_type_coar:c_93fc", + "value": "coar:c_93fc", + "children": [ + { + "label": "document_type_coar:c_18ww", + "value": "coar:c_18ww" + }, + { + "label": "document_type_coar:c_18wz", + "value": "coar:c_18wz" + }, + { + "label": "document_type_coar:c_18wq", + "value": "coar:c_18wq" + }, + { + "label": "document_type_coar:c_186u", + "value": "coar:c_186u" + }, + { + "label": "document_type_coar:c_18op", + "value": "coar:c_18op" + }, + { + "label": "document_type_coar:c_ba1f", + "value": "coar:c_ba1f" + }, + { + "label": "document_type_coar:c_18hj", + "value": "coar:c_18hj" + }, + { + "label": "document_type_coar:c_18ws", + "value": "coar:c_18ws" + }, + { + "label": "document_type_coar:c_18gh", + "value": "coar:c_18gh" + } + ] }, { - "label": "document_type_coar:c_bdcc", - "value": "coar:c_bdcc", - "preferred": true + "label": "document_type_coar:c_46ec", + "value": "coar:c_46ec", + "children": [ + { + "label": "document_type_coar:c_7a1f", + "value": "coar:c_7a1f", + "preferred": true + }, + { + "label": "document_type_coar:c_db06", + "value": "coar:c_db06", + "preferred": true + }, + { + "label": "document_type_coar:c_bdcc", + "value": "coar:c_bdcc", + "preferred": true + }, + { + "label": "document_type_habilitation_thesis", + "value": "habilitation_thesis" + }, + { + "label": "document_type_advanced_studies_thesis", + "value": "advanced_studies_thesis" + }, + { + "label": "document_type_other_thesis", + "value": "other_thesis" + } + ] }, { - "label": "document_type_habilitation_thesis", - "value": "habilitation_thesis" + "label": "document_type_coar:c_8042", + "value": "coar:c_8042" }, { - "label": "document_type_advanced_studies_thesis", - "value": "advanced_studies_thesis" - }, - { - "label": "document_type_other_thesis", - "value": "other_thesis" + "label": "document_type_coar:c_1843", + "value": "coar:c_1843" } ] - }, - { - "label": "document_type_coar:c_8042", - "value": "coar:c_8042" - }, - { - "label": "document_type_coar:c_1843", - "value": "coar:c_1843" } - ], - "expressionProperties": { - "templateOptions.required": "true" } } -} +} \ No newline at end of file diff --git a/sonar/dedicated/hepvs/projects/jsonschemas/hepvs/projects/project-v1.0.0_src.json b/sonar/dedicated/hepvs/projects/jsonschemas/hepvs/projects/project-v1.0.0_src.json index 7aafdcc5..d5fd5bfb 100644 --- a/sonar/dedicated/hepvs/projects/jsonschemas/hepvs/projects/project-v1.0.0_src.json +++ b/sonar/dedicated/hepvs/projects/jsonschemas/hepvs/projects/project-v1.0.0_src.json @@ -55,11 +55,13 @@ "title": "Project summary", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5, - "limitWords": 250 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5, + "limitWords": 250 + } } } }, @@ -69,10 +71,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } }, @@ -82,10 +86,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } }, @@ -96,9 +102,13 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -106,9 +116,11 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, @@ -121,9 +133,13 @@ "title": "User", "type": "string", "pattern": "^https://sonar.ch/api/users/.*?$", - "form": { - "remoteOptions": { - "type": "users" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "users" + } + } } } } @@ -131,29 +147,37 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, "approvalDate": { "title": "Date of approval by the Team Leader", "type": "string", - "form": { - "type": "datepicker" + "widget": { + "formlyConfig": { + "type": "datepicker" + } } }, "projectSponsor": { "title": "Project sponsor", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "projects", - "field": "metadata.projectSponsor.suggest,metadata.innerSearcher.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "projects", + "field": "metadata.projectSponsor.suggest,metadata.innerSearcher.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, @@ -167,28 +191,29 @@ "Scientific collaborator" ], "default": "Lecturer/professor", - "form": { - "type": "select", - "options": [ - { - "label": "Lecturer/professor", - "value": "Lecturer/professor" - }, - { - "label": "Doctoral student", - "value": "Doctoral student" - }, - { - "label": "Animators", - "value": "Animators" - }, - { - "label": "Scientific collaborator", - "value": "Scientific collaborator" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "Lecturer/professor", + "value": "Lecturer/professor" + }, + { + "label": "Doctoral student", + "value": "Doctoral student" + }, + { + "label": "Animators", + "value": "Animators" + }, + { + "label": "Scientific collaborator", + "value": "Scientific collaborator" + } + ] } - ], - "templateOptions": { - "wrappers": [] } } }, @@ -204,36 +229,37 @@ "Training and professionalization" ], "default": "Education, childhood and the learning Society 21", - "form": { - "type": "select", - "options": [ - { - "label": "Education, childhood and the learning Society 21", - "value": "Education, childhood and the learning Society 21" - }, - { - "label": "Emotions, learning, and well-being at school", - "value": "Emotions, learning, and well-being at school" - }, - { - "label": "Fundamental learning", - "value": "Fundamental learning" - }, - { - "label": "Creativity, transformations and innovations in education", - "value": "Creativity, transformations and innovations in education" - }, - { - "label": "Languages, arts, cultures: mediation and teaching", - "value": "Languages, arts, cultures: mediation and teaching" - }, - { - "label": "Training and professionalization", - "value": "Training and professionalization" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "Education, childhood and the learning Society 21", + "value": "Education, childhood and the learning Society 21" + }, + { + "label": "Emotions, learning, and well-being at school", + "value": "Emotions, learning, and well-being at school" + }, + { + "label": "Fundamental learning", + "value": "Fundamental learning" + }, + { + "label": "Creativity, transformations and innovations in education", + "value": "Creativity, transformations and innovations in education" + }, + { + "label": "Languages, arts, cultures: mediation and teaching", + "value": "Languages, arts, cultures: mediation and teaching" + }, + { + "label": "Training and professionalization", + "value": "Training and professionalization" + } + ] } - ], - "templateOptions": { - "wrappers": [] } } }, @@ -245,12 +271,16 @@ "title": "First and last name", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "projects", - "field": "metadata.projectSponsor.suggest,metadata.innerSearcher.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "projects", + "field": "metadata.projectSponsor.suggest,metadata.innerSearcher.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } } @@ -266,36 +296,37 @@ "Languages, arts, cultures: mediation and teaching", "Training and professionalization" ], - "form": { - "type": "select", - "options": [ - { - "label": "Education, childhood and the learning Society 21", - "value": "Education, childhood and the learning Society 21" - }, - { - "label": "Emotions, learning, and well-being at school", - "value": "Emotions, learning, and well-being at school" - }, - { - "label": "Fundamental learning", - "value": "Fundamental learning" - }, - { - "label": "Creativity, transformations and innovations in education", - "value": "Creativity, transformations and innovations in education" - }, - { - "label": "Languages, arts, cultures: mediation and teaching", - "value": "Languages, arts, cultures: mediation and teaching" - }, - { - "label": "Training and professionalization", - "value": "Training and professionalization" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "Education, childhood and the learning Society 21", + "value": "Education, childhood and the learning Society 21" + }, + { + "label": "Emotions, learning, and well-being at school", + "value": "Emotions, learning, and well-being at school" + }, + { + "label": "Fundamental learning", + "value": "Fundamental learning" + }, + { + "label": "Creativity, transformations and innovations in education", + "value": "Creativity, transformations and innovations in education" + }, + { + "label": "Languages, arts, cultures: mediation and teaching", + "value": "Languages, arts, cultures: mediation and teaching" + }, + { + "label": "Training and professionalization", + "value": "Training and professionalization" + } + ] } - ], - "templateOptions": { - "wrappers": [] } } }, @@ -309,28 +340,29 @@ "Suspended" ], "default": "In progress", - "form": { - "type": "select", - "options": [ - { - "label": "In progress", - "value": "In progress" - }, - { - "label": "Completed", - "value": "Completed" - }, - { - "label": "Abandoned", - "value": "Abandoned" - }, - { - "label": "Suspended", - "value": "Suspended" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "In progress", + "value": "In progress" + }, + { + "label": "Completed", + "value": "Completed" + }, + { + "label": "Abandoned", + "value": "Abandoned" + }, + { + "label": "Suspended", + "value": "Suspended" + } + ] } - ], - "templateOptions": { - "wrappers": [] } } }, @@ -345,6 +377,7 @@ "default": false }, "list": { + "title": "External partners", "type": "array", "minItems": 1, "items": { @@ -361,8 +394,12 @@ "title": "Institution", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -374,8 +411,12 @@ "searcherName" ] }, - "form": { - "hideExpression": "!field.parent.model || !field.parent.model.choice" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.parent.model || !field.parent.model.choice" + } + } } } }, @@ -395,12 +436,16 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "projects", - "field": "metadata.keywords.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "projects", + "field": "metadata.keywords.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } } @@ -409,49 +454,60 @@ "title": "Realization framework", "type": "array", "minItems": 1, + "uniqueItems": true, "items": { + "title": "Realization framework", "type": "string", - "minLength": 1 + "enum": [ + "Master", + "Master of Advanced Studies", + "Doctorate supported by the HEP-VS", + "Doctorate not supported by the HEP-VS", + "Internal research", + "Funded research", + "Post-doctorate supported by the HEP-VS", + "CAS or DAS" + ] }, - "form": { - "type": "multicheckbox", - "templateOptions": { - "wrappers": [], - "type": "array", - "options": [ - { - "label": "Master", - "value": "Master" - }, - { - "label": "Master of Advanced Studies", - "value": "Master of Advanced Studies" - }, - { - "label": "Doctorate supported by the HEP-VS", - "value": "Doctorate supported by the HEP-VS" - }, - { - "label": "Doctorate not supported by the HEP-VS", - "value": "Doctorate not supported by the HEP-VS" - }, - { - "label": "Internal research", - "value": "Internal research" - }, - { - "label": "Funded research", - "value": "Funded research" - }, - { - "label": "Post-doctorate supported by the HEP-VS", - "value": "Post-doctorate supported by the HEP-VS" - }, - { - "label": "CAS or DAS", - "value": "CAS or DAS" - } - ] + "widget": { + "formlyConfig": { + "type": "multicheckbox", + "props": { + "options": [ + { + "label": "Master", + "value": "Master" + }, + { + "label": "Master of Advanced Studies", + "value": "Master of Advanced Studies" + }, + { + "label": "Doctorate supported by the HEP-VS", + "value": "Doctorate supported by the HEP-VS" + }, + { + "label": "Doctorate not supported by the HEP-VS", + "value": "Doctorate not supported by the HEP-VS" + }, + { + "label": "Internal research", + "value": "Internal research" + }, + { + "label": "Funded research", + "value": "Funded research" + }, + { + "label": "Post-doctorate supported by the HEP-VS", + "value": "Post-doctorate supported by the HEP-VS" + }, + { + "label": "CAS or DAS", + "value": "CAS or DAS" + } + ] + } } } }, @@ -473,7 +529,7 @@ "type": { "type": "string", "enum": [ - "​Swiss National Science Foundation", + "\u200bSwiss National Science Foundation", "Swissuniversities", "HES-SO Valais-Wallis", "HES-SO", @@ -482,52 +538,58 @@ "Company", "Other (free field)" ], - "form": { - "type": "select", - "options": [ - { - "label": "​Swiss National Science Foundation", - "value": "​Swiss National Science Foundation" - }, - { - "label": "Swissuniversities", - "value": "Swissuniversities" - }, - { - "label": "HES-SO Valais-Wallis", - "value": "HES-SO Valais-Wallis" - }, - { - "label": "HES-SO", - "value": "HES-SO" - }, - { - "label": "Private foundation", - "value": "Private foundation" - }, - { - "label": "Public foundation", - "value": "Public foundation" - }, - { - "label": "Company", - "value": "Company" - }, - { - "label": "Other (free field)", - "value": "Other (free field)" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "\u200bSwiss National Science Foundation", + "value": "\u200bSwiss National Science Foundation" + }, + { + "label": "Swissuniversities", + "value": "Swissuniversities" + }, + { + "label": "HES-SO Valais-Wallis", + "value": "HES-SO Valais-Wallis" + }, + { + "label": "HES-SO", + "value": "HES-SO" + }, + { + "label": "Private foundation", + "value": "Private foundation" + }, + { + "label": "Public foundation", + "value": "Public foundation" + }, + { + "label": "Company", + "value": "Company" + }, + { + "label": "Other (free field)", + "value": "Other (free field)" + } + ] } - ] + } } }, "number": { "title": "Funding number", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || !model.type || (model.type !== '​Swiss National Science Foundation' && model.type !== 'Swissuniversities')", - "expressionProperties": { - "templateOptions.required": "model && (model.type === '​Swiss National Science Foundation' || model.type === 'Swissuniversities')" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && (model.type === '\u200bSwiss National Science Foundation' || model.type === 'Swissuniversities')", + "hide": "!model || !model.type || (model.type !== '\u200bSwiss National Science Foundation' && model.type !== 'Swissuniversities')" + } } } }, @@ -535,10 +597,12 @@ "title": "Name", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || !model.type || model.type === '​Swiss National Science Foundation' || model.type === 'Swissuniversities'", - "expressionProperties": { - "templateOptions.required": "model && model.type !== '​Swiss National Science Foundation' && model.type !== 'Swissuniversities'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type !== '\u200bSwiss National Science Foundation' && model.type !== 'Swissuniversities'", + "hide": "!model || !model.type || model.type === '\u200bSwiss National Science Foundation' || model.type === 'Swissuniversities'" + } } } } @@ -551,16 +615,24 @@ "required": [ "type" ], - "form": { - "hideExpression": "field.parent.model.choice === false" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.model.choice === false" + } + } } }, "fundingReceived": { "title": "Funding was granted for the project", "type": "boolean", "default": true, - "form": { - "hideExpression": "field.parent.model.choice === false" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.model.choice === false" + } + } } } }, @@ -613,116 +685,117 @@ "Animator", "Other" ], - "form": { - "type": "select", - "options": [ - { - "label": "Apprentice", - "value": "Apprentice" - }, - { - "label": "Social Assistant", - "value": "Social Assistant" - }, - { - "label": "Guidance counsellor", - "value": "Guidance counsellor" - }, - { - "label": "Director, head of establishment", - "value": "Director, head of establishment" - }, - { - "label": "Director, head of HE training", - "value": "Director, head of HE training" - }, - { - "label": "Dean of a school", - "value": "Dean of a school" - }, - { - "label": "Vice-rector HE", - "value": "Vice-rector HE" - }, - { - "label": "Student", - "value": "Student" - }, - { - "label": "Allophone student", - "value": "Allophone student" - }, - { - "label": "Student in special education", - "value": "Student in special education" - }, - { - "label": "Primary teacher", - "value": "Primary teacher" - }, - { - "label": "Secondary teacher", - "value": "Secondary teacher" - }, - { - "label": "Tertiary teacher", - "value": "Tertiary teacher" - }, - { - "label": "Special education teacher", - "value": "Special education teacher" - }, - { - "label": "Student in training", - "value": "Student in training" - }, - { - "label": "Trainer", - "value": "Trainer" - }, - { - "label": "Inspector", - "value": "Inspector" - }, - { - "label": "Logopedist", - "value": "Logopedist" - }, - { - "label": "Classroom teacher", - "value": "Classroom teacher" - }, - { - "label": "Mediator", - "value": "Mediator" - }, - { - "label": "Parents", - "value": "Parents" - }, - { - "label": "Practitioner-trainer", - "value": "Practitioner-trainer" - }, - { - "label": "Psychologist", - "value": "Psychologist" - }, - { - "label": "Psychomotrician", - "value": "Psychomotrician" - }, - { - "label": "Animator", - "value": "Animator" - }, - { - "label": "Other", - "value": "Other" + "widget": { + "formlyConfig": { + "type": "select", + "props": { + "options": [ + { + "label": "Apprentice", + "value": "Apprentice" + }, + { + "label": "Social Assistant", + "value": "Social Assistant" + }, + { + "label": "Guidance counsellor", + "value": "Guidance counsellor" + }, + { + "label": "Director, head of establishment", + "value": "Director, head of establishment" + }, + { + "label": "Director, head of HE training", + "value": "Director, head of HE training" + }, + { + "label": "Dean of a school", + "value": "Dean of a school" + }, + { + "label": "Vice-rector HE", + "value": "Vice-rector HE" + }, + { + "label": "Student", + "value": "Student" + }, + { + "label": "Allophone student", + "value": "Allophone student" + }, + { + "label": "Student in special education", + "value": "Student in special education" + }, + { + "label": "Primary teacher", + "value": "Primary teacher" + }, + { + "label": "Secondary teacher", + "value": "Secondary teacher" + }, + { + "label": "Tertiary teacher", + "value": "Tertiary teacher" + }, + { + "label": "Special education teacher", + "value": "Special education teacher" + }, + { + "label": "Student in training", + "value": "Student in training" + }, + { + "label": "Trainer", + "value": "Trainer" + }, + { + "label": "Inspector", + "value": "Inspector" + }, + { + "label": "Logopedist", + "value": "Logopedist" + }, + { + "label": "Classroom teacher", + "value": "Classroom teacher" + }, + { + "label": "Mediator", + "value": "Mediator" + }, + { + "label": "Parents", + "value": "Parents" + }, + { + "label": "Practitioner-trainer", + "value": "Practitioner-trainer" + }, + { + "label": "Psychologist", + "value": "Psychologist" + }, + { + "label": "Psychomotrician", + "value": "Psychomotrician" + }, + { + "label": "Animator", + "value": "Animator" + }, + { + "label": "Other", + "value": "Other" + } + ] } - ], - "templateOptions": { - "wrappers": [] } } }, @@ -730,10 +803,12 @@ "title": "Type of actor", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || !model.choice || model.choice !== 'Other'", - "expressionProperties": { - "templateOptions.required": "model && model.choice === 'Other'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.choice === 'Other'", + "hide": "!model || !model.choice || model.choice !== 'Other'" + } } } }, @@ -758,11 +833,13 @@ "title": "What are the benefits and quality improvements in the research in this project?", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5, - "limitWords": 250 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5, + "limitWords": 250 + } } } }, @@ -770,11 +847,13 @@ "title": "What are the benefits of research in training?", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5, - "limitWords": 250 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5, + "limitWords": 250 + } } } }, @@ -782,11 +861,13 @@ "title": "What is the impact of the research on the professional environment?", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5, - "limitWords": 250 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5, + "limitWords": 250 + } } } }, @@ -794,11 +875,13 @@ "title": "What is the impact of research on public action or on internal or external governance?", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5, - "limitWords": 250 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5, + "limitWords": 250 + } } } }, @@ -816,10 +899,12 @@ "title": "Why?", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || !model.choice", - "expressionProperties": { - "templateOptions.required": "model && model.choice" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.choice", + "hide": "!model || !model.choice" + } } } } @@ -843,6 +928,7 @@ "default": false }, "mandate": { + "title": "Mandate", "type": "string", "default": "State of Valais, Education service", "enum": [ @@ -855,53 +941,61 @@ "Other locality (Switzerland)", "Other" ], - "form": { - "type": "select", - "options": [ - { - "label": "State of Valais, Education service", - "value": "State of Valais, Education service" - }, - { - "label": "State of Valais, Higher education service", - "value": "State of Valais, Higher education service" - }, - { - "label": "State of Valais, other services", - "value": "State of Valais, other services" - }, - { - "label": "State of Valais, parastatal institution", - "value": "State of Valais, parastatal institution" - }, - { - "label": "Locality (Valais)", - "value": "Locality (Valais)" - }, - { - "label": "Other canton (Switzerland)", - "value": "Other canton (Switzerland)" - }, - { - "label": "Other locality (Switzerland)", - "value": "Other locality (Switzerland)" + "widget": { + "formlyConfig": { + "type": "select", + "expressions": { + "hide": "!model || !model.choice" }, - { - "label": "Other", - "value": "Other" + "props": { + "options": [ + { + "label": "State of Valais, Education service", + "value": "State of Valais, Education service" + }, + { + "label": "State of Valais, Higher education service", + "value": "State of Valais, Higher education service" + }, + { + "label": "State of Valais, other services", + "value": "State of Valais, other services" + }, + { + "label": "State of Valais, parastatal institution", + "value": "State of Valais, parastatal institution" + }, + { + "label": "Locality (Valais)", + "value": "Locality (Valais)" + }, + { + "label": "Other canton (Switzerland)", + "value": "Other canton (Switzerland)" + }, + { + "label": "Other locality (Switzerland)", + "value": "Other locality (Switzerland)" + }, + { + "label": "Other", + "value": "Other" + } + ] } - ], - "hideExpression": "!model || !model.choice" + } } }, "name": { "title": "Name", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || !model.mandate || ['State of Valais, Education service', 'State of Valais, Higher education service'].includes(model.mandate)", - "expressionProperties": { - "templateOptions.required": "model && model.mandate && !['State of Valais, Education service', 'State of Valais, Higher education service'].includes(model.mandate)" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.mandate && !['State of Valais, Education service', 'State of Valais, Higher education service'].includes(model.mandate)", + "hide": "!model || !model.mandate || ['State of Valais, Education service', 'State of Valais, Higher education service'].includes(model.mandate)" + } } } }, @@ -909,14 +1003,16 @@ "title": "Brief description of the mandate", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5 - }, - "hideExpression": "!model || !model.choice", - "expressionProperties": { - "templateOptions.required": "model && model.choice" + "widget": { + "formlyConfig": { + "type": "textarea", + "expressions": { + "props.required": "model && model.choice", + "hide": "!model || !model.choice" + }, + "props": { + "rows": 5 + } } } } @@ -945,14 +1041,16 @@ "title": "Brief description of the report", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5 - }, - "hideExpression": "!model || !model.choice", - "expressionProperties": { - "templateOptions.required": "model && model.choice" + "widget": { + "formlyConfig": { + "type": "textarea", + "expressions": { + "props.required": "model && model.choice", + "hide": "!model || !model.choice" + }, + "props": { + "rows": 5 + } } } } @@ -969,10 +1067,12 @@ "title": "How are research results used in training?", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5 + } } } }, diff --git a/sonar/json_schemas/users_json_schema.py b/sonar/json_schemas/users_json_schema.py index c993d25f..b722c444 100644 --- a/sonar/json_schemas/users_json_schema.py +++ b/sonar/json_schemas/users_json_schema.py @@ -51,7 +51,7 @@ def process(self): reachable_roles = current_user_record.\ get_all_reachable_roles() - schema['properties']['role']['form']['options'] = [{ + schema['properties']['role']['widget']['formlyConfig']['props']['options'] = [{ 'label': 'role_{role}'.format(role=role), 'value': role } for role in reachable_roles] diff --git a/sonar/modules/collections/jsonschemas/collections/collection-v1.0.0_src.json b/sonar/modules/collections/jsonschemas/collections/collection-v1.0.0_src.json index 6ada7577..8ba54f70 100644 --- a/sonar/modules/collections/jsonschemas/collections/collection-v1.0.0_src.json +++ b/sonar/modules/collections/jsonschemas/collections/collection-v1.0.0_src.json @@ -46,17 +46,21 @@ "language" ] }, - "form": { - "validation": { - "validators": { - "uniqueValueKeysInObject": { - "keys": [ - "language" - ] + "widget": { + "formlyConfig": { + "props": { + "validation": { + "validators": { + "uniqueValueKeysInObject": { + "keys": [ + "language" + ] + } + }, + "messages": { + "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" + } } - }, - "messages": { - "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" } } } @@ -74,10 +78,12 @@ "title": "Value", "type": "string", "minLength": 1, - "form": { - "type": "markdown", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "markdown", + "props": { + "rows": 5 + } } } }, @@ -103,9 +109,13 @@ "title": "Organisation", "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -113,9 +123,11 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, @@ -187,4 +199,4 @@ "required": [ "name" ] -} +} \ No newline at end of file diff --git a/sonar/modules/deposits/jsonschemas/deposits/deposit-v1.0.0_src.json b/sonar/modules/deposits/jsonschemas/deposits/deposit-v1.0.0_src.json index db99275b..0632b5c6 100644 --- a/sonar/modules/deposits/jsonschemas/deposits/deposit-v1.0.0_src.json +++ b/sonar/modules/deposits/jsonschemas/deposits/deposit-v1.0.0_src.json @@ -145,29 +145,33 @@ "rejected", "ask_for_changes" ], - "form": { - "options": [ - { - "label": "deposit_status_in_progress", - "value": "in_progress" - }, - { - "label": "deposit_status_to_validate", - "value": "to_validate" - }, - { - "label": "deposit_status_validated", - "value": "validated" - }, - { - "label": "deposit_status_rejected", - "value": "rejected" - }, - { - "label": "deposit_status_ask_for_changes", - "value": "ask_for_changes" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "deposit_status_in_progress", + "value": "in_progress" + }, + { + "label": "deposit_status_to_validate", + "value": "to_validate" + }, + { + "label": "deposit_status_validated", + "value": "validated" + }, + { + "label": "deposit_status_rejected", + "value": "rejected" + }, + { + "label": "deposit_status_ask_for_changes", + "value": "ask_for_changes" + } + ] } - ] + } } }, "step": { @@ -217,25 +221,29 @@ "reject", "ask_for_changes" ], - "form": { - "options": [ - { - "label": "deposit_log_action_submit", - "value": "submit" - }, - { - "label": "deposit_log_action_approve", - "value": "approve" - }, - { - "label": "deposit_log_action_reject", - "value": "reject" - }, - { - "label": "deposit_log_action_ask_for_changes", - "value": "ask_for_changes" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "deposit_log_action_submit", + "value": "submit" + }, + { + "label": "deposit_log_action_approve", + "value": "approve" + }, + { + "label": "deposit_log_action_reject", + "value": "reject" + }, + { + "label": "deposit_log_action_ask_for_changes", + "value": "ask_for_changes" + } + ] } - ] + } } }, "date": { @@ -289,10 +297,12 @@ "title": "Title", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 3 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 3 + } } } }, @@ -315,11 +325,12 @@ "$ref": "language-v1.0.0.json" } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -330,16 +341,24 @@ "title": "Publication place", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model.documentType || !['coar:c_2f33', 'coar:c_f744', 'coar:c_8a7e', 'coar:c_ecc8', 'coar:c_12cc', 'coar:c_18cc', 'coar:c_18cw', 'coar:c_5ce6', 'coar:c_15cd', 'coar:c_2659', 'coar:c_0640', 'coar:c_2cd9', 'coar:c_2fe3', 'coar:c_93fc', 'coar:c_18ww', 'coar:c_18wz', 'coar:c_18wq', 'coar:c_186u', 'coar:c_18op', 'coar:c_ba1f', 'coar:c_18hj', 'coar:c_18ws', 'coar:c_18gh', 'coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'coar:c_8042', 'coar:c_1843'].includes(model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!model?.documentType || !['coar:c_2f33', 'coar:c_f744', 'coar:c_8a7e', 'coar:c_ecc8', 'coar:c_12cc', 'coar:c_18cc', 'coar:c_18cw', 'coar:c_5ce6', 'coar:c_15cd', 'coar:c_2659', 'coar:c_0640', 'coar:c_2cd9', 'coar:c_2fe3', 'coar:c_93fc', 'coar:c_18ww', 'coar:c_18wz', 'coar:c_18wq', 'coar:c_186u', 'coar:c_18op', 'coar:c_ba1f', 'coar:c_18hj', 'coar:c_18ws', 'coar:c_18gh', 'coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'coar:c_8042', 'coar:c_1843'].includes(model.documentType)" + } + } } }, "publisher": { "title": "Publisher", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model.documentType || !['coar:c_2f33', 'coar:c_f744', 'coar:c_8a7e', 'coar:c_ecc8', 'coar:c_12cc', 'coar:c_18cc', 'coar:c_18cw', 'coar:c_5ce6', 'coar:c_15cd', 'coar:c_2659', 'coar:c_0640', 'coar:c_2cd9', 'coar:c_2fe3', 'coar:c_93fc', 'coar:c_18ww', 'coar:c_18wz', 'coar:c_18wq', 'coar:c_186u', 'coar:c_18op', 'coar:c_ba1f', 'coar:c_18hj', 'coar:c_18ws', 'coar:c_18gh', 'coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'coar:c_8042', 'coar:c_1843'].includes(model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!model?.documentType || !['coar:c_2f33', 'coar:c_f744', 'coar:c_8a7e', 'coar:c_ecc8', 'coar:c_12cc', 'coar:c_18cc', 'coar:c_18cw', 'coar:c_5ce6', 'coar:c_15cd', 'coar:c_2659', 'coar:c_0640', 'coar:c_2cd9', 'coar:c_2fe3', 'coar:c_93fc', 'coar:c_18ww', 'coar:c_18wz', 'coar:c_18wq', 'coar:c_186u', 'coar:c_18op', 'coar:c_ba1f', 'coar:c_18hj', 'coar:c_18ws', 'coar:c_18gh', 'coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'coar:c_8042', 'coar:c_1843'].includes(model.documentType)" + } + } } }, "documentDate": { @@ -348,13 +367,15 @@ "type": "string", "minLength": 1, "pattern": "^[0-9]{4}$", - "form": { - "templateOptions": { - "placeholder": "Example: 2020" - }, - "validation": { - "messages": { - "patternMessage": "Format is not valid: YYYY." + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: 2020", + "validation": { + "messages": { + "patternMessage": "Format is not valid: YYYY." + } + } } } } @@ -402,135 +423,141 @@ "bf:Strn", "pmid" ], - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] - }, - "options": [ - { - "label": "bf:Doi", - "value": "bf:Doi", - "preferred": true - }, - { - "label": "pmid", - "value": "pmid", - "preferred": true - }, - { - "label": "bf:Isbn", - "value": "bf:Isbn", - "preferred": true - }, - { - "label": "bf:AudioIssueNumber", - "value": "bf:AudioIssueNumber" - }, - { - "label": "bf:Ean", - "value": "bf:Ean" - }, - { - "label": "bf:Gtin14Number", - "value": "bf:Gtin14Number" - }, - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Isan", - "value": "bf:Isan" - }, - { - "label": "bf:Ismn", - "value": "bf:Ismn" - }, - { - "label": "bf:Isrc", - "value": "bf:Isrc" - }, - { - "label": "bf:Issn", - "value": "bf:Issn" - }, - { - "label": "bf:IssnL", - "value": "bf:IssnL" - }, - { - "label": "bf:Local", - "value": "bf:Local" - }, - { - "label": "bf:MatrixNumber", - "value": "bf:MatrixNumber" - }, - { - "label": "bf:MusicDistributorNumber", - "value": "bf:MusicDistributorNumber" - }, - { - "label": "bf:MusicPlate", - "value": "bf:MusicPlate" - }, - { - "label": "bf:MusicPublisherNumber", - "value": "bf:MusicPublisherNumber" - }, - { - "label": "bf:PublisherNumber", - "value": "bf:PublisherNumber" - }, - { - "label": "bf:Upc", - "value": "bf:Upc" - }, - { - "label": "bf:Urn", - "value": "bf:Urn" - }, - { - "label": "bf:VideoRecordingNumber", - "value": "bf:VideoRecordingNumber" - }, - { - "label": "uri", - "value": "uri" - }, - { - "label": "bf:ReportNumber", - "value": "bf:ReportNumber" - }, - { - "label": "bf:Strn", - "value": "bf:Strn" + ], + "props": { + "options": [ + { + "label": "bf:Doi", + "value": "bf:Doi", + "preferred": true + }, + { + "label": "pmid", + "value": "pmid", + "preferred": true + }, + { + "label": "bf:Isbn", + "value": "bf:Isbn", + "preferred": true + }, + { + "label": "bf:AudioIssueNumber", + "value": "bf:AudioIssueNumber" + }, + { + "label": "bf:Ean", + "value": "bf:Ean" + }, + { + "label": "bf:Gtin14Number", + "value": "bf:Gtin14Number" + }, + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Isan", + "value": "bf:Isan" + }, + { + "label": "bf:Ismn", + "value": "bf:Ismn" + }, + { + "label": "bf:Isrc", + "value": "bf:Isrc" + }, + { + "label": "bf:Issn", + "value": "bf:Issn" + }, + { + "label": "bf:IssnL", + "value": "bf:IssnL" + }, + { + "label": "bf:Local", + "value": "bf:Local" + }, + { + "label": "bf:MatrixNumber", + "value": "bf:MatrixNumber" + }, + { + "label": "bf:MusicDistributorNumber", + "value": "bf:MusicDistributorNumber" + }, + { + "label": "bf:MusicPlate", + "value": "bf:MusicPlate" + }, + { + "label": "bf:MusicPublisherNumber", + "value": "bf:MusicPublisherNumber" + }, + { + "label": "bf:PublisherNumber", + "value": "bf:PublisherNumber" + }, + { + "label": "bf:Upc", + "value": "bf:Upc" + }, + { + "label": "bf:Urn", + "value": "bf:Urn" + }, + { + "label": "bf:VideoRecordingNumber", + "value": "bf:VideoRecordingNumber" + }, + { + "label": "uri", + "value": "uri" + }, + { + "label": "bf:ReportNumber", + "value": "bf:ReportNumber" + }, + { + "label": "bf:Strn", + "value": "bf:Strn" + } + ] } - ] + } } }, "value": { "key": "identified_by_value", "title": "Value", - "form" : { - "templateOptions" : { - "placeholder" : "Example (DOI): 10.3406/spira.2016.1748" - } - }, "type": "string", - "minLength": 1 + "minLength": 1, + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example (DOI): 10.3406/spira.2016.1748" + } + } + } }, "source": { "title": "Source", "type": "string", "minLength": 1, - "form": { - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" - }, - "hideExpression": "!model || (model.type !== 'bf:Local')" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || (model.type !== 'bf:Local')" + } + } } } }, @@ -544,11 +571,12 @@ "value" ] }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -578,10 +606,14 @@ "title": "Volume", "type": "string", "minLength": 1, - "form": { - "hideExpression": "field.parent.parent.model && !['coar:c_3248', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.model.documentType)", - "templateOptions": { - "placeholder": "Example: 1, 4-5, …" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.parent.model && !['coar:c_3248', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.model.documentType)" + }, + "props": { + "placeholder": "Example: 1, 4-5, \u2026" + } } } }, @@ -589,10 +621,14 @@ "title": "Number", "type": "string", "minLength": 1, - "form": { - "hideExpression": "field.parent.parent.model && !['coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.model.documentType)", - "templateOptions": { - "placeholder": "Example: 10, 22-24, …" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.parent.model && !['coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.model.documentType)" + }, + "props": { + "placeholder": "Example: 10, 22-24, \u2026" + } } } }, @@ -600,9 +636,11 @@ "title": "Pages", "type": "string", "minLength": 1, - "form": { - "templateOptions": { - "placeholder": "Examples: 135, 5-27, …" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Examples: 135, 5-27, \u2026" + } } } }, @@ -610,8 +648,12 @@ "title": "Year", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "editors": { @@ -621,8 +663,12 @@ "type": "string", "minLength": 1 }, - "form": { - "hideExpression": "field.parent.parent.model && ['coar:c_6501'].includes(field.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.parent.model && ['coar:c_6501'].includes(field.parent.parent.model.documentType)" + } + } } }, "publisher": { @@ -680,17 +726,24 @@ "value" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, - "form": { - "hideExpression": "field.parent.model && !['coar:c_3248', 'coar:c_5794', 'coar:c_6670', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_816b', 'coar:c_998f', 'coar:c_dcae04bc'].includes(field.parent.model.documentType)", - "templateOptions": { + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.model && !['coar:c_3248', 'coar:c_5794', 'coar:c_6670', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_816b', 'coar:c_998f', 'coar:c_dcae04bc'].includes(field.parent.model.documentType)" + }, "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -710,9 +763,11 @@ "title": "Public note", "type": "string", "minLength": 1, - "form": { - "templateOptions": { - "placeholder": "Example: Published version" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Published version" + } } } }, @@ -721,24 +776,27 @@ "type": "string", "minLength": 1, "pattern": "^https?://.+", - "form": { - "templateOptions": { - "placeholder": "Example: https://www.rero.ch" - }, - "validation": { - "messages": { - "patternMessage": "Should be a valid URL format." + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: https://www.rero.ch", + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + } } } } } } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -754,11 +812,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/collections/.*?$", - "form": { - "remoteTypeahead": { - "type": "collections", - "field": "name.value.suggest", - "label": "label" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "collections", + "field": "name.value.suggest", + "label": "label" + } + } } } } @@ -767,11 +829,12 @@ "$ref" ] }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -801,20 +864,23 @@ "title": "Abstract", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 3 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 3 + } } } } } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -841,7 +907,9 @@ "title": "Values", "type": "array", "minItems": 1, - "default": [null], + "default": [ + null + ], "items": { "type": "string", "minLength": 1 @@ -849,11 +917,12 @@ } } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -881,9 +950,11 @@ "title": "Date", "type": "string", "pattern": "^[0-9]{4}(-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))?$", - "form": { - "templateOptions": { - "placeholder": "Example: 2019 or 2019-05-05" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: 2019 or 2019-05-05" + } } } } @@ -897,12 +968,15 @@ "required": [ "degree" ], - "form": { - "hideExpression": "field.parent.model && !['coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'habilitation_thesis', 'advanced_studies_thesis', 'other_thesis'].includes(field.parent.model.documentType)", - "templateOptions": { + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.parent.model && !['coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'habilitation_thesis', 'advanced_studies_thesis', 'other_thesis'].includes(field.parent.model.documentType)" + }, "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -1024,12 +1098,16 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField1.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField1.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } } @@ -1040,12 +1118,16 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField2.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField2.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } } @@ -1056,12 +1138,16 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField3.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField3.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } } @@ -1087,9 +1173,11 @@ "title": "Public note", "type": "string", "minLength": 1, - "form": { - "templateOptions": { - "placeholder": "Example: Research dataset" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Research dataset" + } } } }, @@ -1098,24 +1186,27 @@ "type": "string", "minLength": 1, "pattern": "^https?://.+", - "form": { - "templateOptions": { - "placeholder": "Example: https://www.rero.ch" - }, - "validation": { - "messages": { - "patternMessage": "Should be a valid URL format." + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: https://www.rero.ch", + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + } } } } } } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } } @@ -1148,12 +1239,16 @@ "description": "Last name, first name, ex: Doe, John", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "contribution.agent.preferred_name.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "contribution.agent.preferred_name.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, @@ -1174,38 +1269,40 @@ "dgs", "prt" ], - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] - }, - "options": [ - { - "label": "contribution_role_cre", - "value": "cre" - }, - { - "label": "contribution_role_ctb", - "value": "ctb" - }, - { - "label": "contribution_role_edt", - "value": "edt" - }, - { - "label": "contribution_role_dgc", - "value": "dgc" - }, - { - "label": "contribution_role_dgs", - "value": "dgs" - }, - { - "label": "contribution_role_prt", - "value": "prt" + ], + "props": { + "options": [ + { + "label": "contribution_role_cre", + "value": "cre" + }, + { + "label": "contribution_role_ctb", + "value": "ctb" + }, + { + "label": "contribution_role_edt", + "value": "edt" + }, + { + "label": "contribution_role_dgc", + "value": "dgc" + }, + { + "label": "contribution_role_dgs", + "value": "dgs" + }, + { + "label": "contribution_role_prt", + "value": "prt" + } + ] } - ] + } } }, "orcid": { @@ -1213,9 +1310,11 @@ "type": "string", "minLength": 1, "pattern": "^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]$", - "form": { - "templateOptions": { - "placeholder": "Example: 1111-2222-3333-4444" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: 1111-2222-3333-4444" + } } } }, @@ -1231,11 +1330,12 @@ } } }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -1250,16 +1350,22 @@ "oneOf": [ { "title": "Existing project", + "type": "object", + "additionnalProperties": false, "properties": { "$ref": { "title": "Project", "type": "string", "pattern": "^https://sonar.ch/api/projects/.*?$", - "form": { - "remoteTypeahead": { - "type": "projects", - "field": "metadata.name.suggest", - "label": "name" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "projects", + "field": "metadata.name.suggest", + "label": "name" + } + } } } } @@ -1270,6 +1376,8 @@ }, { "title": "Add a new project", + "additionnalProperties": false, + "type": "object", "properties": { "name": { "title": "Name", @@ -1280,10 +1388,12 @@ "title": "Description", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5 + } } } }, @@ -1292,10 +1402,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } }, @@ -1304,10 +1416,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } } @@ -1325,11 +1439,12 @@ } ] }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, @@ -1362,11 +1477,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/subdivisions/.*?$", - "form": { - "remoteTypeahead": { - "type": "subdivisions", - "field": "name.value.suggest", - "label": "label" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "subdivisions", + "field": "name.value.suggest", + "label": "label" + } + } } } } @@ -1375,16 +1494,17 @@ "$ref" ] }, - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "card" - ] + ], + "props": {} } } }, "masked": { - "$ref":"masked-v1.0.0.json" + "$ref": "masked-v1.0.0.json" } } }, diff --git a/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json b/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json index d72290a4..349520ea 100644 --- a/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json +++ b/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json @@ -95,11 +95,17 @@ "minLength": 1, "format": "uri", "pattern": "^https?://.*", - "form": { - "hideExpression": "true", - "validation": { - "messages": { - "patternMessage": "Should be a valid URL format." + "widget": { + "formlyConfig": { + "expressions": { + "hide": "true" + }, + "props": { + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + } } } } @@ -109,8 +115,12 @@ "description": "If the value is set to true, the file will point to the external link.", "type": "boolean", "default": false, - "form": { - "hideExpression": "true" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "true" + } + } } }, "access": { @@ -122,23 +132,27 @@ "coar:c_16ec" ], "default": "coar:c_abf2", - "form": { - "options": [ - { - "label": "coar:c_abf2", - "value": "coar:c_abf2" - }, - { - "label": "coar:c_f1cf", - "value": "coar:c_f1cf" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" }, - { - "label": "coar:c_16ec", - "value": "coar:c_16ec" + "props": { + "options": [ + { + "label": "coar:c_abf2", + "value": "coar:c_abf2" + }, + { + "label": "coar:c_f1cf", + "value": "coar:c_f1cf" + }, + { + "label": "coar:c_16ec", + "value": "coar:c_16ec" + } + ] } - ], - "expressionProperties": { - "templateOptions.required": "true" } } }, @@ -146,10 +160,12 @@ "title": "Access allowed from the organisation's IP addresses", "type": "boolean", "default": true, - "form": { - "hideExpression": "!model || !model.access || model.access === 'coar:c_abf2'", - "expressionProperties": { - "templateOptions.required": "model && model.access && model.access !== 'coar:c_abf2'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.access && model.access !== 'coar:c_abf2'", + "hide": "!model || !model.access || model.access === 'coar:c_abf2'" + } } } }, @@ -160,10 +176,12 @@ "minLength": 1, "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "hideExpression": "!model || !model.access || model.access !== 'coar:c_f1cf'", - "expressionProperties": { - "templateOptions.required": "model && model.access && model.access === 'coar:c_f1cf'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.access && model.access === 'coar:c_f1cf'", + "hide": "!model || !model.access || model.access !== 'coar:c_f1cf'" + } } } } @@ -176,7 +194,6 @@ ], "propertiesOrder": [ "label", - "order", "access", "embargo_date", "restricted_outside_organisation", @@ -233,9 +250,13 @@ "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", "minLength": 1, - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -244,9 +265,11 @@ "$ref" ] }, - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, @@ -267,11 +290,12 @@ "type": "string", "const": "bf:Title", "default": "bf:Title", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -322,8 +346,12 @@ "language" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -352,11 +380,12 @@ "type": "string", "const": "bf:Language", "default": "bf:Language", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -373,9 +402,11 @@ "value" ] }, - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, @@ -416,10 +447,14 @@ "required": [ "editionDesignation" ], - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -440,17 +475,21 @@ "bf:Publication", "bf:Manufacture" ], - "form": { - "options": [ - { - "label": "bf:Publication", - "value": "bf:Publication" - }, - { - "label": "bf:Manufacture", - "value": "bf:Manufacture" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:Publication", + "value": "bf:Publication" + }, + { + "label": "bf:Manufacture", + "value": "bf:Manufacture" + } + ] } - ] + } } }, "statement": { @@ -469,21 +508,25 @@ "bf:Agent", "Date" ], - "form": { - "options": [ - { - "label": "bf:Place", - "value": "bf:Place" - }, - { - "label": "bf:Agent", - "value": "bf:Agent" - }, - { - "label": "Date", - "value": "Date" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:Place", + "value": "bf:Place" + }, + { + "label": "bf:Agent", + "value": "bf:Agent" + }, + { + "label": "Date", + "value": "Date" + } + ] } - ] + } } }, "label": { @@ -514,10 +557,14 @@ "label" ] }, - "form": { - "hide": true, - "expressionProperties": { - "templateOptions.required": "field.parent.model.type && field.parent.model.type !== 'bf:Publication'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "field.parent.model.type && field.parent.model.type !== 'bf:Publication'" + }, + "props": { + "hide": true + } } } }, @@ -526,10 +573,14 @@ "type": "string", "minLength": 1, "pattern": "^[0-9]{4}(-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))?$", - "form": { - "placeholder": "Example: 2019 or 2019-01-01", - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + }, + "props": { + "placeholder": "Example: 2019 or 2019-01-01" + } } } }, @@ -538,9 +589,15 @@ "type": "string", "minLength": 1, "pattern": "^[0-9]{4}(-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))?$", - "form": { - "placeholder": "Example: 2019 or 2019-01-01", - "hideExpression": "!model || (model.type !== 'bf:Publication' || !model.startDate)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!model || (model.type !== 'bf:Publication' || !model.startDate)" + }, + "props": { + "placeholder": "Example: 2019 or 2019-01-01" + } + } } } }, @@ -554,9 +611,11 @@ "type" ] }, - "form": { - "expressionProperties": { - "templateOptions.required": "field.parent.model && !['coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_3e5a', 'coar:c_ba08', coar:c_5794', 'coar:c_6670'].includes(field.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "field.parent.model && !['coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_5794', 'coar:c_6670'].includes(field.parent.model.documentType)" + } } } }, @@ -565,8 +624,12 @@ "description": "Extent of the resource, i.e. the number of pages or volumes.", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "otherMaterialCharacteristics": { @@ -574,8 +637,12 @@ "description": "Other Material Characteristics, i.e. illustrations, black and white, or coloured.", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "formats": { @@ -588,8 +655,12 @@ "type": "string", "minLength": 1 }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "additionalMaterials": { @@ -597,8 +668,12 @@ "description": "Accompanying material of the resource, i.e. maps.", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "series": { @@ -626,8 +701,12 @@ "name" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "notes": { @@ -639,8 +718,12 @@ "type": "string", "minLength": 1 }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "abstracts": { @@ -656,10 +739,12 @@ "title": "Value", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 3 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 3 + } } } }, @@ -672,10 +757,14 @@ "language" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -717,101 +806,105 @@ "bf:ReportNumber", "bf:Strn" ], - "form": { - "options": [ - { - "label": "bf:AudioIssueNumber", - "value": "bf:AudioIssueNumber" - }, - { - "label": "bf:Doi", - "value": "bf:Doi" - }, - { - "label": "bf:Ean", - "value": "bf:Ean" - }, - { - "label": "bf:Gtin14Number", - "value": "bf:Gtin14Number" - }, - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Isan", - "value": "bf:Isan" - }, - { - "label": "bf:Isbn", - "value": "bf:Isbn" - }, - { - "label": "bf:Ismn", - "value": "bf:Ismn" - }, - { - "label": "bf:Isrc", - "value": "bf:Isrc" - }, - { - "label": "bf:Issn", - "value": "bf:Issn" - }, - { - "label": "bf:IssnL", - "value": "bf:IssnL" - }, - { - "label": "bf:Local", - "value": "bf:Local" - }, - { - "label": "bf:MatrixNumber", - "value": "bf:MatrixNumber" - }, - { - "label": "bf:MusicDistributorNumber", - "value": "bf:MusicDistributorNumber" - }, - { - "label": "bf:MusicPlate", - "value": "bf:MusicPlate" - }, - { - "label": "bf:MusicPublisherNumber", - "value": "bf:MusicPublisherNumber" - }, - { - "label": "bf:PublisherNumber", - "value": "bf:PublisherNumber" - }, - { - "label": "bf:Upc", - "value": "bf:Upc" - }, - { - "label": "bf:Urn", - "value": "bf:Urn" - }, - { - "label": "bf:VideoRecordingNumber", - "value": "bf:VideoRecordingNumber" - }, - { - "label": "uri", - "value": "uri" - }, - { - "label": "bf:ReportNumber", - "value": "bf:ReportNumber" - }, - { - "label": "bf:Strn", - "value": "bf:Strn" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:AudioIssueNumber", + "value": "bf:AudioIssueNumber" + }, + { + "label": "bf:Doi", + "value": "bf:Doi" + }, + { + "label": "bf:Ean", + "value": "bf:Ean" + }, + { + "label": "bf:Gtin14Number", + "value": "bf:Gtin14Number" + }, + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Isan", + "value": "bf:Isan" + }, + { + "label": "bf:Isbn", + "value": "bf:Isbn" + }, + { + "label": "bf:Ismn", + "value": "bf:Ismn" + }, + { + "label": "bf:Isrc", + "value": "bf:Isrc" + }, + { + "label": "bf:Issn", + "value": "bf:Issn" + }, + { + "label": "bf:IssnL", + "value": "bf:IssnL" + }, + { + "label": "bf:Local", + "value": "bf:Local" + }, + { + "label": "bf:MatrixNumber", + "value": "bf:MatrixNumber" + }, + { + "label": "bf:MusicDistributorNumber", + "value": "bf:MusicDistributorNumber" + }, + { + "label": "bf:MusicPlate", + "value": "bf:MusicPlate" + }, + { + "label": "bf:MusicPublisherNumber", + "value": "bf:MusicPublisherNumber" + }, + { + "label": "bf:PublisherNumber", + "value": "bf:PublisherNumber" + }, + { + "label": "bf:Upc", + "value": "bf:Upc" + }, + { + "label": "bf:Urn", + "value": "bf:Urn" + }, + { + "label": "bf:VideoRecordingNumber", + "value": "bf:VideoRecordingNumber" + }, + { + "label": "uri", + "value": "uri" + }, + { + "label": "bf:ReportNumber", + "value": "bf:ReportNumber" + }, + { + "label": "bf:Strn", + "value": "bf:Strn" + } + ] } - ] + } } }, "value": { @@ -823,16 +916,24 @@ "title": "Note", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "qualifier": { "title": "Qualifier", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "acquisitionTerms": { @@ -844,10 +945,12 @@ "title": "Source", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || model.type !== 'bf:Local'", - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || model.type !== 'bf:Local'" + } } } }, @@ -860,8 +963,12 @@ "invalid or cancelled" ], "validationMessage": "ISBN/ISSN status should be selected in the list below.", - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -878,10 +985,14 @@ "value" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -927,10 +1038,14 @@ "label" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -959,11 +1074,15 @@ "type": "string", "minLength": 1, "pattern": "^https?://.+", - "form": { - "placeholder": "Example: https://www.rero.ch", - "validation": { - "messages": { - "patternMessage": "Should be a valid URL format." + "widget": { + "formlyConfig": { + "props": { + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + }, + "placeholder": "Example: https://www.rero.ch" } } } @@ -977,8 +1096,12 @@ "title": "Public note", "type": "string", "minLength": 1, - "form": { - "placeholder": "Example: Published version" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Published version" + } + } } } }, @@ -991,8 +1114,12 @@ "publicNote" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "relatedTo": { @@ -1015,11 +1142,15 @@ "type": "string", "pattern": "^https?://.+", "minLength": 1, - "form": { - "placeholder": "Example: https://www.rero.ch", - "validation": { - "messages": { - "patternMessage": "Should be a valid URL format." + "widget": { + "formlyConfig": { + "props": { + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + }, + "placeholder": "Example: https://www.rero.ch" } } } @@ -1033,8 +1164,12 @@ "title": "Public note", "type": "string", "minLength": 1, - "form": { - "placeholder": "Example: Research dataset" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Research dataset" + } + } } } }, @@ -1047,8 +1182,12 @@ "publicNote" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "collections": { @@ -1063,11 +1202,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/collections/.*?$", - "form": { - "remoteTypeahead": { - "type": "collections", - "field": "name.value.suggest", - "label": "label" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "collections", + "field": "name.value.suggest", + "label": "label" + } + } } } } @@ -1076,10 +1219,14 @@ "$ref" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -1101,11 +1248,12 @@ "readOnly": true, "const": "bf:ClassificationUdc", "default": "bf:ClassificationUdc", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -1133,11 +1281,12 @@ "readOnly": true, "const": "bf:ClassificationDdc", "default": "bf:ClassificationDdc", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -1158,10 +1307,14 @@ } ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -1174,8 +1327,12 @@ "type": "string", "minLength": 1 }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "dissertation": { @@ -1202,8 +1359,12 @@ "title": "Date", "type": "string", "pattern": "^[0-9]{4}(-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))?$", - "form": { - "placeholder": "Example: 2019 or 2019-05-05" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: 2019 or 2019-05-05" + } + } } } }, @@ -1216,10 +1377,14 @@ "required": [ "degree" ], - "form": { - "hide": true - }, - "hideExpression": "field.parent.model && !['coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'habilitation_thesis', 'advanced_studies_thesis', 'other_thesis'].includes(field.parent.model.documentType)" + "hideExpression": "field.parent.model && !['coar:c_46ec', 'coar:c_7a1f', 'coar:c_db06', 'coar:c_bdcc', 'habilitation_thesis', 'advanced_studies_thesis', 'other_thesis'].includes(field.parent.model.documentType)", + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } + } }, "usageAndAccessPolicy": { "title": "Usage and access policy", @@ -1242,8 +1407,12 @@ "required": [ "license" ], - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "contribution": { @@ -1259,7 +1428,7 @@ "type": "object", "additionalProperties": false, "properties": { - "agent": { + "agent": { "title": "Agent", "type": "object", "additionalProperties": false, @@ -1269,11 +1438,12 @@ "type": "string", "const": "bf:Person", "default": "bf:Person", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -1281,12 +1451,16 @@ "title": "Preferred name", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "contribution.agent.preferred_name.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "contribution.agent.preferred_name.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, @@ -1302,27 +1476,33 @@ "bf:Identifier", "bf:Local" ], - "form": { - "options": [ - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Local", - "value": "bf:Local" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Local", + "value": "bf:Local" + } + ] } - ] + } } }, "source": { "title": "Source", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || model.type !== 'bf:Local'", - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || model.type !== 'bf:Local'" + } } } }, @@ -1341,24 +1521,36 @@ "type", "value" ], - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "date_of_birth": { "title": "Date of birth", "type": "string", "minLength": 4, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "date_of_death": { "title": "Date of death", "type": "string", "minLength": 4, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -1411,11 +1603,12 @@ "type": "string", "const": "bf:Organization", "default": "bf:Organization", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -1423,15 +1616,18 @@ "title": "Preferred name", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "contribution.agent.preferred_name.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "contribution.agent.preferred_name.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } - } }, "propertiesOrder": [ @@ -1474,11 +1670,12 @@ "type": "string", "const": "bf:Meeting", "default": "bf:Meeting", - "form": { - "templateOptions": { + "widget": { + "formlyConfig": { "wrappers": [ "hide" - ] + ], + "props": {} } } }, @@ -1486,12 +1683,16 @@ "title": "Preferred name", "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "contribution.agent.preferred_name.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "contribution.agent.preferred_name.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, @@ -1499,24 +1700,36 @@ "title": "Place", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "date": { "title": "Date", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "number": { "title": "Number", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -1550,10 +1763,14 @@ } ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -1570,9 +1787,11 @@ "title": "Year", "type": "string", "minLength": 1, - "form": { - "expressionProperties": { - "templateOptions.required": "!['coar:c_816b'].includes(field.parent.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "!['coar:c_816b'].includes(field.parent.parent.parent.model.documentType)" + } } } }, @@ -1580,24 +1799,36 @@ "title": "Volume", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!['coar:c_3248', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!['coar:c_3248', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.parent.model.documentType)" + } + } } }, "numberingIssue": { "title": "Issue", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!['coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!['coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc', 'coar:c_816b', 'coar:c_5794', 'coar:c_6670', 'coar:c_c94f'].includes(field.parent.parent.parent.model.documentType)" + } + } } }, "numberingPages": { "title": "Pages", "type": "string", "minLength": 1, - "form": { - "placeholder": "Examples: 135, 5-27, …" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Examples: 135, 5-27, \u2026" + } + } } }, "document": { @@ -1632,8 +1863,12 @@ "statement", "startDate" ], - "form": { - "hideExpression": "!['coar:c_3248', 'coar:c_5794', 'coar:c_6670'].includes(field.parent.parent.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!['coar:c_3248', 'coar:c_5794', 'coar:c_6670'].includes(field.parent.parent.parent.parent.model.documentType)" + } + } } }, "contribution": { @@ -1644,12 +1879,20 @@ "title": "Author or editor", "type": "string", "minLength": 1, - "form": { - "placeholder": "Example: Muller, Hans" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Muller, Hans" + } + } } }, - "form": { - "hideExpression": "!['coar:c_3248', 'coar:c_5794', 'coar:c_6670'].includes(field.parent.parent.parent.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!['coar:c_3248', 'coar:c_5794', 'coar:c_6670'].includes(field.parent.parent.parent.parent.model.documentType)" + } + } } }, "identifiedBy": { @@ -1689,101 +1932,105 @@ "bf:ReportNumber", "bf:Strn" ], - "form": { - "options": [ - { - "label": "bf:AudioIssueNumber", - "value": "bf:AudioIssueNumber" - }, - { - "label": "bf:Doi", - "value": "bf:Doi" - }, - { - "label": "bf:Ean", - "value": "bf:Ean" - }, - { - "label": "bf:Gtin14Number", - "value": "bf:Gtin14Number" - }, - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Isan", - "value": "bf:Isan" - }, - { - "label": "bf:Isbn", - "value": "bf:Isbn" - }, - { - "label": "bf:Ismn", - "value": "bf:Ismn" - }, - { - "label": "bf:Isrc", - "value": "bf:Isrc" - }, - { - "label": "bf:Issn", - "value": "bf:Issn" - }, - { - "label": "bf:IssnL", - "value": "bf:IssnL" - }, - { - "label": "bf:Local", - "value": "bf:Local" - }, - { - "label": "bf:MatrixNumber", - "value": "bf:MatrixNumber" - }, - { - "label": "bf:MusicDistributorNumber", - "value": "bf:MusicDistributorNumber" - }, - { - "label": "bf:MusicPlate", - "value": "bf:MusicPlate" - }, - { - "label": "bf:MusicPublisherNumber", - "value": "bf:MusicPublisherNumber" - }, - { - "label": "bf:PublisherNumber", - "value": "bf:PublisherNumber" - }, - { - "label": "bf:Upc", - "value": "bf:Upc" - }, - { - "label": "bf:Urn", - "value": "bf:Urn" - }, - { - "label": "bf:VideoRecordingNumber", - "value": "bf:VideoRecordingNumber" - }, - { - "label": "uri", - "value": "uri" - }, - { - "label": "bf:ReportNumber", - "value": "bf:ReportNumber" - }, - { - "label": "bf:Strn", - "value": "bf:Strn" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:AudioIssueNumber", + "value": "bf:AudioIssueNumber" + }, + { + "label": "bf:Doi", + "value": "bf:Doi" + }, + { + "label": "bf:Ean", + "value": "bf:Ean" + }, + { + "label": "bf:Gtin14Number", + "value": "bf:Gtin14Number" + }, + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Isan", + "value": "bf:Isan" + }, + { + "label": "bf:Isbn", + "value": "bf:Isbn" + }, + { + "label": "bf:Ismn", + "value": "bf:Ismn" + }, + { + "label": "bf:Isrc", + "value": "bf:Isrc" + }, + { + "label": "bf:Issn", + "value": "bf:Issn" + }, + { + "label": "bf:IssnL", + "value": "bf:IssnL" + }, + { + "label": "bf:Local", + "value": "bf:Local" + }, + { + "label": "bf:MatrixNumber", + "value": "bf:MatrixNumber" + }, + { + "label": "bf:MusicDistributorNumber", + "value": "bf:MusicDistributorNumber" + }, + { + "label": "bf:MusicPlate", + "value": "bf:MusicPlate" + }, + { + "label": "bf:MusicPublisherNumber", + "value": "bf:MusicPublisherNumber" + }, + { + "label": "bf:PublisherNumber", + "value": "bf:PublisherNumber" + }, + { + "label": "bf:Upc", + "value": "bf:Upc" + }, + { + "label": "bf:Urn", + "value": "bf:Urn" + }, + { + "label": "bf:VideoRecordingNumber", + "value": "bf:VideoRecordingNumber" + }, + { + "label": "uri", + "value": "uri" + }, + { + "label": "bf:ReportNumber", + "value": "bf:ReportNumber" + }, + { + "label": "bf:Strn", + "value": "bf:Strn" + } + ] } - ] + } } }, "value": { @@ -1795,16 +2042,24 @@ "title": "Note", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "qualifier": { "title": "Qualifier", "type": "string", "minLength": 1, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "acquisitionTerms": { @@ -1816,10 +2071,12 @@ "title": "Source", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || model.type !== 'bf:Local'", - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || model.type !== 'bf:Local'" + } } } }, @@ -1832,8 +2089,12 @@ "invalid or cancelled" ], "validationMessage": "ISBN/ISSN status should be selected in the list below.", - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -1850,8 +2111,12 @@ "value" ] }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } }, @@ -1876,10 +2141,14 @@ "document" ] }, - "form": { - "hide": true, - "expressionProperties": { - "templateOptions.required": "field.parent.model && ['coar:c_3248', 'coar:c_5794', 'coar:c_6670', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc'].includes(field.parent.model.documentType)" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "field.parent.model && ['coar:c_3248', 'coar:c_5794', 'coar:c_6670', 'coar:c_3e5a', 'coar:c_ba08', 'coar:c_beb9', 'coar:c_6501', 'coar:c_998f', 'coar:c_dcae04bc'].includes(field.parent.model.documentType)" + }, + "props": { + "hide": true + } } } }, @@ -1895,11 +2164,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/projects/.*?$", - "form": { - "remoteTypeahead": { - "type": "projects", - "label": "name", - "field": "metadata.name.suggest" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "projects", + "label": "name", + "field": "metadata.name.suggest" + } + } } } } @@ -1908,10 +2181,14 @@ "$ref" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -1925,17 +2202,25 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField1.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField1.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "customField2": { @@ -1945,17 +2230,25 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField2.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField2.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "customField3": { @@ -1965,21 +2258,29 @@ "items": { "type": "string", "minLength": 1, - "form": { - "remoteTypeahead": { - "type": "documents", - "field": "customField3.suggest", - "suggest": "/api/suggestions/completion", - "allowAdd": true + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "documents", + "field": "customField3.suggest", + "suggest": "/api/suggestions/completion", + "allowAdd": true + } + } } } }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } }, "masked": { - "$ref":"masked-v1.0.0.json" + "$ref": "masked-v1.0.0.json" }, "subdivisions": { "title": "Subdivisions", @@ -1993,11 +2294,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/subdivisions/.*?$", - "form": { - "remoteTypeahead": { - "type": "subdivisions", - "field": "name.value.suggest", - "label": "label" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "subdivisions", + "field": "name.value.suggest", + "label": "label" + } + } } } } @@ -2006,10 +2311,14 @@ "$ref" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } } @@ -2069,33 +2378,37 @@ "prt" ], "default": "cre", - "form": { - "options": [ - { - "label": "contribution_role_cre", - "value": "cre" - }, - { - "label": "contribution_role_ctb", - "value": "ctb" - }, - { - "label": "contribution_role_edt", - "value": "edt" - }, - { - "label": "contribution_role_dgc", - "value": "dgc" - }, - { - "label": "contribution_role_dgs", - "value": "dgs" - }, - { - "label": "contribution_role_prt", - "value": "prt" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "contribution_role_cre", + "value": "cre" + }, + { + "label": "contribution_role_ctb", + "value": "ctb" + }, + { + "label": "contribution_role_edt", + "value": "edt" + }, + { + "label": "contribution_role_dgc", + "value": "dgc" + }, + { + "label": "contribution_role_dgs", + "value": "dgs" + }, + { + "label": "contribution_role_prt", + "value": "prt" + } + ] } - ] + } } } }, @@ -2107,8 +2420,12 @@ "type": "string", "minLength": 1 }, - "form": { - "hide": true + "widget": { + "formlyConfig": { + "props": { + "hide": true + } + } } } } diff --git a/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json b/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json index ed04c782..c488979f 100644 --- a/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json +++ b/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json @@ -20,11 +20,17 @@ "type": "string", "pattern": "^[a-z0-9_-]{3,}$", "minLength": 3, - "form": { - "hideExpression": "field.model.pid", - "validation": { - "validators": { - "valueAlreadyExists": {} + "widget": { + "formlyConfig": { + "expressions": { + "hide": "field.model.pid" + }, + "props": { + "validation": { + "validators": { + "valueAlreadyExists": {} + } + } } } } @@ -47,10 +53,12 @@ "title": "Value", "type": "string", "minLength": 1, - "form": { - "type": "markdown", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "markdown", + "props": { + "rows": 5 + } } } }, @@ -58,18 +66,30 @@ "$ref": "interface_language-v1.0.0.json" } }, - "propertiesOrder": ["language", "value"], - "required": ["value", "language"] + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value", + "language" + ] }, - "form": { - "validation": { - "validators": { - "uniqueValueKeysInObject": { - "keys": ["language"] + "widget": { + "formlyConfig": { + "props": { + "validation": { + "validators": { + "uniqueValueKeysInObject": { + "keys": [ + "language" + ] + } + }, + "messages": { + "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" + } } - }, - "messages": { - "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" } } } @@ -87,10 +107,12 @@ "title": "Value", "type": "string", "minLength": 1, - "form": { - "type": "markdown", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "markdown", + "props": { + "rows": 5 + } } } }, @@ -98,19 +120,33 @@ "$ref": "interface_language-v1.0.0.json" } }, - "propertiesOrder": ["language", "value"], - "required": ["value", "language"] + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value", + "language" + ] }, - "form": { - "hideExpression": "!field.parent.model.isDedicated", - "validation": { - "validators": { - "uniqueValueKeysInObject": { - "keys": ["language"] - } + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.parent.model.isDedicated" }, - "messages": { - "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" + "props": { + "validation": { + "validators": { + "uniqueValueKeysInObject": { + "keys": [ + "language" + ] + } + }, + "messages": { + "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" + } + } } } } @@ -126,27 +162,37 @@ "description": "Organisation has a specific theme for his view.", "type": "boolean", "default": false, - "form": { - "hideExpression": "!field.model.isShared" + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.model.isShared" + } + } } }, "serverName": { "title": "Server name (without http)", "description": "Organisation server name for dedicated.", "type": "string", - "form": { - "hideExpression": "!field.model.isDedicated", - "expressionProperties": { - "templateOptions.required": "field.model.isDedicated" - }, - "validation": { - "validators": { - "uniqueValueKeysInObject": { - "keys": ["serverName"] - } + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "field.model.isDedicated", + "hide": "!field.model.isDedicated" }, - "messages": { - "uniqueValueKeysInObjectMessage": "This domain name must be unique." + "props": { + "validation": { + "validators": { + "uniqueValueKeysInObject": { + "keys": [ + "serverName" + ] + } + }, + "messages": { + "uniqueValueKeysInObjectMessage": "This domain name must be unique." + } + } } } } @@ -156,12 +202,16 @@ "description": "List of IP addresses or ranges that allow access to private files (access: embargoed or restricted), which are accessible only within the organisation. Note: the bibliographic record (metadata) is always public. Enter one rule per line.", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 10 - }, - "hideExpression": "!field.model.isShared" + "widget": { + "formlyConfig": { + "type": "textarea", + "expressions": { + "hide": "!field.model.isShared" + }, + "props": { + "rows": 10 + } + } } }, "arkNAAN": { @@ -173,12 +223,16 @@ "title": "Platform name", "type": "string", "minLength": 1, - "form": { - "type": "markdown", - "templateOptions": { - "rows": 5 - }, - "hideExpression": "!field.model.isDedicated" + "widget": { + "formlyConfig": { + "type": "markdown", + "expressions": { + "hide": "!field.model.isDedicated" + }, + "props": { + "rows": 5 + } + } } }, "documentsCustomField1": { @@ -204,8 +258,14 @@ "$ref": "language-v1.0.0.json" } }, - "propertiesOrder": ["language", "value"], - "required": ["value", "language"] + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value", + "language" + ] } }, "includeInFacets": { @@ -214,9 +274,16 @@ "default": false } }, - "propertiesOrder": ["label", "includeInFacets"], - "form": { - "hideExpression": "!field.parent.model.isDedicated" + "propertiesOrder": [ + "label", + "includeInFacets" + ], + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.parent.model.isDedicated" + } + } } }, "documentsCustomField2": { @@ -242,8 +309,14 @@ "$ref": "language-v1.0.0.json" } }, - "propertiesOrder": ["language", "value"], - "required": ["value", "language"] + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value", + "language" + ] } }, "includeInFacets": { @@ -252,9 +325,16 @@ "default": false } }, - "propertiesOrder": ["label", "includeInFacets"], - "form": { - "hideExpression": "!field.parent.model.isDedicated" + "propertiesOrder": [ + "label", + "includeInFacets" + ], + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.parent.model.isDedicated" + } + } } }, "documentsCustomField3": { @@ -280,8 +360,14 @@ "$ref": "language-v1.0.0.json" } }, - "propertiesOrder": ["language", "value"], - "required": ["value", "language"] + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value", + "language" + ] } }, "includeInFacets": { @@ -290,9 +376,16 @@ "default": false } }, - "propertiesOrder": ["label", "includeInFacets"], - "form": { - "hideExpression": "!field.parent.model.isDedicated" + "propertiesOrder": [ + "label", + "includeInFacets" + ], + "widget": { + "formlyConfig": { + "expressions": { + "hide": "!field.parent.model.isDedicated" + } + } } }, "publicDocumentFacets": { @@ -313,47 +406,54 @@ "subdivision" ] }, - "form": { - "type": "multicheckbox", - "templateOptions": { - "type": "array", - "translate": true, - "options": [ - { - "label": "document_type", - "value": "document_type" - }, - { - "label": "controlled_affiliation", - "value": "controlled_affiliation" - }, - { - "label": "year", - "value": "year" - }, - { - "label": "collection", - "value": "collection" - }, - { - "label": "language", - "value": "language" - }, - { - "label": "author", - "value": "author" - }, - { - "label": "subject", - "value": "subject" - }, - { - "label": "subdivision", - "value": "subdivision" - } - ] - }, - "hideExpression": "!field.parent.model.isDedicated" + "widget": { + "formlyConfig": { + "type": "multicheckbox", + "wrappers": [ + "form-field" + ], + "expressions": { + "hide": "!field.parent.model.isDedicated" + }, + "props": { + "type": "array", + "translate": true, + "options": [ + { + "label": "document_type", + "value": "document_type" + }, + { + "label": "controlled_affiliation", + "value": "controlled_affiliation" + }, + { + "label": "year", + "value": "year" + }, + { + "label": "collection", + "value": "collection" + }, + { + "label": "language", + "value": "language" + }, + { + "label": "author", + "value": "author" + }, + { + "label": "subject", + "value": "subject" + }, + { + "label": "subdivision", + "value": "subdivision" + } + ] + } + } } }, "_bucket": { @@ -408,7 +508,12 @@ "type": "integer" } }, - "required": ["bucket", "file_id", "version_id", "key"] + "required": [ + "bucket", + "file_id", + "version_id", + "key" + ] } } }, diff --git a/sonar/modules/subdivisions/jsonschemas/subdivisions/subdivision-v1.0.0_src.json b/sonar/modules/subdivisions/jsonschemas/subdivisions/subdivision-v1.0.0_src.json index c78abc18..6288eb16 100644 --- a/sonar/modules/subdivisions/jsonschemas/subdivisions/subdivision-v1.0.0_src.json +++ b/sonar/modules/subdivisions/jsonschemas/subdivisions/subdivision-v1.0.0_src.json @@ -46,17 +46,21 @@ "language" ] }, - "form": { - "validation": { - "validators": { - "uniqueValueKeysInObject": { - "keys": [ - "language" - ] + "widget": { + "formlyConfig": { + "props": { + "validation": { + "validators": { + "uniqueValueKeysInObject": { + "keys": [ + "language" + ] + } + }, + "messages": { + "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" + } } - }, - "messages": { - "uniqueValueKeysInObjectMessage": "Only one value per language is allowed" } } } @@ -69,9 +73,13 @@ "title": "Organisation", "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -79,9 +87,11 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } } @@ -92,4 +102,4 @@ "required": [ "name" ] -} +} \ No newline at end of file diff --git a/sonar/modules/users/jsonschemas/users/user-v1.0.0.json b/sonar/modules/users/jsonschemas/users/user-v1.0.0.json index bea4f2e2..8473e803 100644 --- a/sonar/modules/users/jsonschemas/users/user-v1.0.0.json +++ b/sonar/modules/users/jsonschemas/users/user-v1.0.0.json @@ -18,16 +18,24 @@ "title": "First name", "type": "string", "minLength": 1, - "form": { - "placeholder": "Example: John" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: John" + } + } } }, "last_name": { "title": "Last name", "type": "string", "minLength": 1, - "form": { - "placeholder": "Example: Doe" + "widget": { + "formlyConfig": { + "props": { + "placeholder": "Example: Doe" + } + } } }, "birth_date": { @@ -42,15 +50,19 @@ "type": "string", "format": "email", "pattern": "^.+@.+\\..+$", - "form": { - "validation": { - "validators": { - "valueAlreadyExists": { - "term": "email.analyzed" + "widget": { + "formlyConfig": { + "props": { + "validation": { + "validators": { + "valueAlreadyExists": { + "term": "email.analyzed" + } + }, + "messages": { + "pattern": "Email should have at least one `@` and one `.`." + } } - }, - "messages": { - "pattern": "Email should have at least one `@` and one `.`." } } } @@ -84,9 +96,13 @@ "title": "Organisation", "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -106,29 +122,33 @@ "submitter", "user" ], - "form": { - "options": [ - { - "label": "role_superuser", - "value": "superuser" - }, - { - "label": "role_admin", - "value": "admin" - }, - { - "label": "role_moderator", - "value": "moderator" - }, - { - "label": "role_submitter", - "value": "submitter" - }, - { - "label": "role_user", - "value": "user" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "role_superuser", + "value": "superuser" + }, + { + "label": "role_admin", + "value": "admin" + }, + { + "label": "role_moderator", + "value": "moderator" + }, + { + "label": "role_submitter", + "value": "submitter" + }, + { + "label": "role_user", + "value": "user" + } + ] } - ] + } } }, "subdivision": { @@ -139,11 +159,15 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/subdivisions/.*?$", - "form": { - "remoteTypeahead": { - "type": "subdivisions", - "field": "name.value.suggest", - "label": "label" + "widget": { + "formlyConfig": { + "props": { + "remoteTypeahead": { + "type": "subdivisions", + "field": "name.value.suggest", + "label": "label" + } + } } } } @@ -173,4 +197,4 @@ "role", "$schema" ] -} +} \ No newline at end of file diff --git a/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json b/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json index 1338f38f..96967c19 100644 --- a/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json +++ b/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json @@ -55,10 +55,12 @@ "title": "Description", "type": "string", "minLength": 1, - "form": { - "type": "textarea", - "templateOptions": { - "rows": 5 + "widget": { + "formlyConfig": { + "type": "textarea", + "props": { + "rows": 5 + } } } }, @@ -68,10 +70,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } }, @@ -81,10 +85,12 @@ "type": "string", "format": "date", "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", - "form": { - "type": "datepicker", - "templateOptions": { - "placeholder": "Example: 2020-12-01" + "widget": { + "formlyConfig": { + "type": "datepicker", + "props": { + "placeholder": "Example: 2020-12-01" + } } } }, @@ -100,27 +106,33 @@ "bf:Identifier", "bf:Local" ], - "form": { - "options": [ - { - "label": "bf:Identifier", - "value": "bf:Identifier" - }, - { - "label": "bf:Local", - "value": "bf:Local" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "bf:Identifier", + "value": "bf:Identifier" + }, + { + "label": "bf:Local", + "value": "bf:Local" + } + ] } - ] + } } }, "source": { "title": "Source", "type": "string", "minLength": 1, - "form": { - "hideExpression": "!model || model.type !== 'bf:Local'", - "expressionProperties": { - "templateOptions.required": "model && model.type === 'bf:Local'" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "model && model.type === 'bf:Local'", + "hide": "!model || model.type !== 'bf:Local'" + } } } }, @@ -139,10 +151,14 @@ "type", "value" ], - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -185,17 +201,21 @@ "coinvestigator" ], "default": "investigator", - "form": { - "options": [ - { - "label": "investigator", - "value": "investigator" - }, - { - "label": "coinvestigator", - "value": "coinvestigator" + "widget": { + "formlyConfig": { + "props": { + "options": [ + { + "label": "investigator", + "value": "investigator" + }, + { + "label": "coinvestigator", + "value": "coinvestigator" + } + ] } - ] + } } } }, @@ -230,10 +250,14 @@ "role" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -276,10 +300,14 @@ "agent" ] }, - "form": { - "hide": true, - "navigation": { - "essential": true + "widget": { + "formlyConfig": { + "props": { + "hide": true, + "navigation": { + "essential": true + } + } } } }, @@ -290,9 +318,13 @@ "$ref": { "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", - "form": { - "remoteOptions": { - "type": "organisations" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "organisations" + } + } } } } @@ -300,9 +332,11 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } }, @@ -315,9 +349,13 @@ "title": "User", "type": "string", "pattern": "^https://sonar.ch/api/users/.*?$", - "form": { - "remoteOptions": { - "type": "users" + "widget": { + "formlyConfig": { + "props": { + "remoteOptions": { + "type": "users" + } + } } } } @@ -325,9 +363,11 @@ "required": [ "$ref" ], - "form": { - "expressionProperties": { - "templateOptions.required": "true" + "widget": { + "formlyConfig": { + "expressions": { + "props.required": "true" + } } } } diff --git a/sonar/theme/templates/sonar/accounts/profile.html b/sonar/theme/templates/sonar/accounts/profile.html index 53465638..a8c8b6eb 100644 --- a/sonar/theme/templates/sonar/accounts/profile.html +++ b/sonar/theme/templates/sonar/accounts/profile.html @@ -24,6 +24,11 @@ {%- endblock settings_body %} +{%- block css %} + {{ super() }} + +{%- endblock %} + {%- block javascript %} diff --git a/sonar/theme/templates/sonar/manage.html b/sonar/theme/templates/sonar/manage.html index 7eed751d..a714aa6f 100644 --- a/sonar/theme/templates/sonar/manage.html +++ b/sonar/theme/templates/sonar/manage.html @@ -28,9 +28,9 @@ - - - + + + From ad3310a99161029e5bf2f578f47111adf816e21a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Wed, 24 Jul 2024 14:35:12 +0200 Subject: [PATCH 2/2] deployment: fix docker file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixes lxml conflict with uwsgi command for the deployment. * Adds safety exceptions. * Fixes some small cosmetics in the JSONSchemas. Co-Authored-by: Johnny Mariéthoz --- Dockerfile.base | 4 +- scripts/test | 8 +++- .../documents/document-v1.0.0_src.json | 4 +- .../organisation-v1.0.0_src.json | 9 ++-- .../users/jsonschemas/users/user-v1.0.0.json | 41 +++++++++---------- .../projects/project-v1.0.0_src.json | 8 +++- 6 files changed, 41 insertions(+), 33 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index c9b294a9..9c7a0f1f 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -22,11 +22,11 @@ # and includes Pip, Pipenv, Node.js, NPM and some few standard libraries # Invenio usually needs. -FROM python:3.9-slim-bullseye +FROM python:3.9-slim-bookworm # require debian packages RUN apt-get upgrade -y && apt-get update -y -RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc g++ pkg-config gnupg libc6-dev libxml2-dev libxmlsec1-dev libxmlsec1-openssl xpdf xpdf-utils ghostscript imagemagick && rm -rf /var/lib/apt/lists/* +RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc g++ pkg-config gnupg libc6-dev libxmlsec1-openssl xpdf xpdf-utils ghostscript imagemagick && rm -rf /var/lib/apt/lists/* RUN sed -i 's///g' /etc/ImageMagick-6/policy.xml RUN pip install --upgrade wheel pip poetry diff --git a/scripts/test b/scripts/test index 4e3c29f2..f4b7f2a4 100755 --- a/scripts/test +++ b/scripts/test @@ -45,9 +45,15 @@ fi # Vulnerability ID: 70612 # -> Vulnerability found in flask-cors version 4.0.1 # Vulnerability ID: 70624 +# -> Vulnerability found in werkzeug version 2.2.3 +# Vulnerability ID: 71595 +# -> Vulnerability found in werkzeug version 2.2.3 +# Vulnerability ID: 71594 +# -> Vulnerability found in urllib3 version 1.26.18 +# Vulnerability ID: 71608 echo "Check vulnerabilities:" -safety_exceptions="-i 40459 -i 51668 -i 42194 -i 42852 -i 62019 -i 67599 -i 51457 -i 70624 -i 70612" +safety_exceptions="-i 40459 -i 51668 -i 42194 -i 42852 -i 62019 -i 67599 -i 51457 -i 70624 -i 70612 -i 71595 -i 71594 -i 71608" msg=$(safety check -o text ${safety_exceptions}) || { echo "Safety vulnerabilites found for packages:" $(safety check -o bare ${safety_exceptions}) echo "Run:" "safety check -o screen ${safety_exceptions} | grep -i vulnerability" "for more details" diff --git a/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json b/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json index 349520ea..decb74b9 100644 --- a/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json +++ b/sonar/modules/documents/jsonschemas/documents/document-v1.0.0_src.json @@ -247,12 +247,14 @@ "type": "object", "properties": { "$ref": { + "title": "Organisation", "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", "minLength": 1, "widget": { "formlyConfig": { "props": { + "hideLabel": true, "remoteOptions": { "type": "organisations" } @@ -2324,10 +2326,10 @@ } }, "propertiesOrder": [ + "organisation", "documentType", "title", "language", - "organisation", "projects", "classification", "abstracts", diff --git a/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json b/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json index c488979f..b7127821 100644 --- a/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json +++ b/sonar/modules/organisations/jsonschemas/organisations/organisation-v1.0.0_src.json @@ -43,7 +43,6 @@ "description": { "title": "Descriptions", "type": "array", - "minItems": 1, "items": { "title": "Description", "type": "object", @@ -97,7 +96,6 @@ "footer": { "title": "Footers", "type": "array", - "minItems": 1, "items": { "title": "Footer", "type": "object", @@ -226,6 +224,7 @@ "widget": { "formlyConfig": { "type": "markdown", + "wrappers": ["form-field"], "expressions": { "hide": "!field.model.isDedicated" }, @@ -520,13 +519,13 @@ "propertiesOrder": [ "name", "code", + "description", + "arkNAAN", "isShared", "isDedicated", + "allowedIps", "serverName", "platformName", - "arkNAAN", - "allowedIps", - "description", "footer", "documentsCustomField1", "documentsCustomField2", diff --git a/sonar/modules/users/jsonschemas/users/user-v1.0.0.json b/sonar/modules/users/jsonschemas/users/user-v1.0.0.json index 8473e803..c415b353 100644 --- a/sonar/modules/users/jsonschemas/users/user-v1.0.0.json +++ b/sonar/modules/users/jsonschemas/users/user-v1.0.0.json @@ -43,7 +43,12 @@ "description": "Date in yyyy-mm-dd format, ex: 1970-01-01", "type": "string", "format": "date", - "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$" + "pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$", + "widget": { + "formlyConfig": { + "type": "datepicker" + } + } }, "email": { "title": "Email", @@ -91,6 +96,7 @@ }, "organisation": { "type": "object", + "title": "Organisation", "properties": { "$ref": { "title": "Organisation", @@ -107,21 +113,20 @@ } } }, - "required": [ - "$ref" - ] + "required": ["$ref"], + "widget": { + "formlyConfig": { + "props": { + "hideLabel": true + } + } + } }, "role": { "title": "Role", "type": "string", "minLength": 1, - "enum": [ - "superuser", - "admin", - "moderator", - "submitter", - "user" - ], + "enum": ["superuser", "admin", "moderator", "submitter", "user"], "widget": { "formlyConfig": { "props": { @@ -172,9 +177,7 @@ } } }, - "required": [ - "$ref" - ] + "required": ["$ref"] } }, "propertiesOrder": [ @@ -190,11 +193,5 @@ "postal_code", "city" ], - "required": [ - "first_name", - "last_name", - "email", - "role", - "$schema" - ] -} \ No newline at end of file + "required": ["first_name", "last_name", "email", "role", "$schema"] +} diff --git a/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json b/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json index 96967c19..0552710f 100644 --- a/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json +++ b/sonar/resources/projects/jsonschemas/projects/project-v1.0.0_src.json @@ -264,7 +264,7 @@ "funding_organisations": { "title": "Funding organisations", "type": "array", - "minItems": 0, + "minItems": 1, "items": { "title": "Funding organisation", "type": "object", @@ -316,6 +316,7 @@ "type": "object", "properties": { "$ref": { + "title": "Organisation", "type": "string", "pattern": "^https://sonar.ch/api/organisations/.*?$", "widget": { @@ -334,6 +335,9 @@ ], "widget": { "formlyConfig": { + "props": { + "hideLabel": true + }, "expressions": { "props.required": "true" } @@ -373,11 +377,11 @@ } }, "propertiesOrder": [ + "organisation", "name", "description", "startDate", "endDate", - "organisation", "identifiedBy", "investigators", "funding_organisations"