From 7bf8aafe578d99d0048b2419970b2d5b8c4ce487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 5 Sep 2024 08:14:42 +0200 Subject: [PATCH 1/2] data: Align project status enum values with dataset status enum values (DEV-4066) (#226) --- data/json/Rome.json | 2 +- data/json/aura-effizienz.json | 2 +- data/json/awg.json | 2 +- data/json/beol.json | 2 +- data/json/beyondthetext.json | 2 +- data/json/big-data-in-agriculture.json | 2 +- data/json/biz.json | 2 +- data/json/bruno-manser.json | 2 +- data/json/cache.json | 2 +- data/json/commode.json | 2 +- data/json/dasch.json | 2 +- data/json/decoso.json | 2 +- data/json/deir-el-medina.json | 1 + data/json/delille.json | 2 +- data/json/digitalagenda.json | 2 +- data/json/dokubib.json | 2 +- data/json/drawings.json | 2 +- data/json/eHKKA.json | 2 +- data/json/fagottino.json | 2 +- data/json/globalgeschichte.json | 2 +- data/json/hdm.json | 2 +- data/json/healing-arts.json | 2 +- data/json/igeoarchive.json | 2 +- data/json/incunabula.json | 2 +- data/json/kunsthalle.json | 2 +- data/json/lenzburg.json | 2 +- data/json/lhtt.json | 2 +- data/json/limc.json | 2 +- data/json/locusludi.json | 2 +- data/json/mark16.json | 2 +- data/json/mfmps.json | 2 +- data/json/mls.json | 2 +- data/json/nietzsche.json | 2 +- data/json/olympic.json | 2 +- data/json/operativetv.json | 2 +- data/json/participation-social.json | 2 +- data/json/portraits-pou.json | 2 +- data/json/posepi.json | 2 +- data/json/postkarten.json | 2 +- data/json/prethero.json | 2 +- data/json/prom_know.json | 2 +- data/json/reforme-geneve.json | 2 +- data/json/religious-speech.json | 2 +- data/json/rich.json | 2 +- data/json/roud.json | 2 +- data/json/sgv.json | 2 +- data/json/societesavoie.json | 2 +- data/json/stardom.json | 2 +- data/json/tanner.json | 2 +- data/json/tdk.json | 2 +- data/json/tds.json | 2 +- data/json/vitrocentre.json | 2 +- data/json/waldaucinema.json | 2 +- data/json/woposs.json | 2 +- data/json/wordweb.json | 2 +- resources/schema-metadata-draft.json | 20 +++++++++---------- resources/schema-metadata-final.json | 5 ++--- src/domain/model/draft_model.rs | 4 ++-- .../src/projects-repository/Tile.svelte | 2 +- 59 files changed, 70 insertions(+), 70 deletions(-) diff --git a/data/json/Rome.json b/data/json/Rome.json index 3922d2e5..9952c7aa 100644 --- a/data/json/Rome.json +++ b/data/json/Rome.json @@ -113,7 +113,7 @@ "url": "https://app.dasch.swiss/project/0118", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/aura-effizienz.json b/data/json/aura-effizienz.json index 90d4f5a8..7f714f28 100644 --- a/data/json/aura-effizienz.json +++ b/data/json/aura-effizienz.json @@ -151,7 +151,7 @@ "url": "https://germanistik.philhist.unibas.ch/de/aura-und-effizienz", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/awg.json b/data/json/awg.json index f247b322..465c3528 100644 --- a/data/json/awg.json +++ b/data/json/awg.json @@ -202,7 +202,7 @@ "url": "https://www.anton-webern.ch", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/beol.json b/data/json/beol.json index 06d9d56d..4f21c25f 100644 --- a/data/json/beol.json +++ b/data/json/beol.json @@ -133,7 +133,7 @@ "url": "https://beol.dasch.swiss/", "text": "Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/beyondthetext.json b/data/json/beyondthetext.json index 4ed0082d..7752302f 100644 --- a/data/json/beyondthetext.json +++ b/data/json/beyondthetext.json @@ -186,7 +186,7 @@ "url": "https://beyondthetext.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/big-data-in-agriculture.json b/data/json/big-data-in-agriculture.json index b7b3f86f..56d18a9a 100644 --- a/data/json/big-data-in-agriculture.json +++ b/data/json/big-data-in-agriculture.json @@ -102,7 +102,7 @@ "url": "http://www.unine.ch/geographie/en/home/recherche/--espace-et-pouvoir-a-lere-du-nu/research-projects/smart-farming.html", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/biz.json b/data/json/biz.json index 73886688..40e31344 100644 --- a/data/json/biz.json +++ b/data/json/biz.json @@ -251,7 +251,7 @@ "url": "https://www.bildungsgeschichte.uzh.ch/", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/bruno-manser.json b/data/json/bruno-manser.json index fc5c5fe1..c5369d87 100644 --- a/data/json/bruno-manser.json +++ b/data/json/bruno-manser.json @@ -96,7 +96,7 @@ "url": "https://www.bmf.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/cache.json b/data/json/cache.json index 130fd529..affe300d 100644 --- a/data/json/cache.json +++ b/data/json/cache.json @@ -84,7 +84,7 @@ "url": "http://www.cache.ch", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/commode.json b/data/json/commode.json index f586d314..80e77e48 100644 --- a/data/json/commode.json +++ b/data/json/commode.json @@ -62,7 +62,7 @@ "en": "1700 to 2020" } ], - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/dasch.json b/data/json/dasch.json index 3ea597be..e77a4b82 100644 --- a/data/json/dasch.json +++ b/data/json/dasch.json @@ -86,7 +86,7 @@ "url": "https://www.dasch.swiss/", "text": "Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/decoso.json b/data/json/decoso.json index 02cb782e..aa938505 100644 --- a/data/json/decoso.json +++ b/data/json/decoso.json @@ -104,7 +104,7 @@ "text": "German Democratic Republic" } ], - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/deir-el-medina.json b/data/json/deir-el-medina.json index af6159a4..ea54f2ab 100644 --- a/data/json/deir-el-medina.json +++ b/data/json/deir-el-medina.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/dasch-swiss/dsp-meta-svc/main/docs/services/metadata/schema-metadata.json", "project": { "__type": "Project", + "status": "Ongoing", "howToCite": "Deir el-Medina Hieroglyph Palaeography (2028). DaSCH. https://ark.dasch.swiss/ark:/72163/1/0853", "teaserText": "An online palaeography of hieroglyphs from the Ptolemaic temple of Deir el-Medina", "datasets": [ diff --git a/data/json/delille.json b/data/json/delille.json index 0f78bb6a..fa0dfd51 100644 --- a/data/json/delille.json +++ b/data/json/delille.json @@ -83,7 +83,7 @@ "url": "https://delille.philhist.unibas.ch/dokuwiki/doku.php?id=start", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/digitalagenda.json b/data/json/digitalagenda.json index a0d0eea1..06d94433 100644 --- a/data/json/digitalagenda.json +++ b/data/json/digitalagenda.json @@ -252,7 +252,7 @@ "url": "https://www.digitalagenda.ch/", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/dokubib.json b/data/json/dokubib.json index 500d6046..ba6d5e4d 100644 --- a/data/json/dokubib.json +++ b/data/json/dokubib.json @@ -72,7 +72,7 @@ "url": "https://data.dasch.swiss/dokubib/", "text": "Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/drawings.json b/data/json/drawings.json index 2cf16099..639a552d 100644 --- a/data/json/drawings.json +++ b/data/json/drawings.json @@ -182,7 +182,7 @@ "url": "https://ddd.unil.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/eHKKA.json b/data/json/eHKKA.json index 5ef64953..c35f725b 100644 --- a/data/json/eHKKA.json +++ b/data/json/eHKKA.json @@ -84,7 +84,7 @@ "url": "https://www.ehkka.ch/ehkka/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/fagottino.json b/data/json/fagottino.json index f92cefd0..9059bfa3 100644 --- a/data/json/fagottino.json +++ b/data/json/fagottino.json @@ -119,7 +119,7 @@ "url": "https://www.historical-bassoon.ch/", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/globalgeschichte.json b/data/json/globalgeschichte.json index 0e832c8d..281d8f6a 100644 --- a/data/json/globalgeschichte.json +++ b/data/json/globalgeschichte.json @@ -90,7 +90,7 @@ "url": "https://irf.fhnw.ch/handle/11654/31495", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/hdm.json b/data/json/hdm.json index d28df5f4..aa9984be 100644 --- a/data/json/hdm.json +++ b/data/json/hdm.json @@ -101,7 +101,7 @@ "url": "https://app.dasch.swiss/project/081C", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/healing-arts.json b/data/json/healing-arts.json index 33052a65..087d0f8a 100644 --- a/data/json/healing-arts.json +++ b/data/json/healing-arts.json @@ -88,7 +88,7 @@ "en": "Middle Ages" } ], - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/igeoarchive.json b/data/json/igeoarchive.json index 802a0c5b..8f7de9a3 100644 --- a/data/json/igeoarchive.json +++ b/data/json/igeoarchive.json @@ -151,7 +151,7 @@ "url": "https://app.dasch.swiss/project/n0eRr0vWTDOArdaBAZ-jQQ", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/incunabula.json b/data/json/incunabula.json index 075904d3..4e8bbd2b 100644 --- a/data/json/incunabula.json +++ b/data/json/incunabula.json @@ -95,7 +95,7 @@ } ], "howToCite": "Die Bilderfolgen der Basler Frühdrucke: Spätmittelalterliche Didaxe als Bild-Text-Lektüre (2012) DaSCH. ark.dasch.swiss/ark:/72163/1/0803", - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/kunsthalle.json b/data/json/kunsthalle.json index ab43ec5a..21bbd1f3 100644 --- a/data/json/kunsthalle.json +++ b/data/json/kunsthalle.json @@ -77,7 +77,7 @@ "url": "https://app.dasch.swiss/project/ExIK4BHPTaejCzk3saF0UQ", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/lenzburg.json b/data/json/lenzburg.json index 828fe78e..103e72bc 100644 --- a/data/json/lenzburg.json +++ b/data/json/lenzburg.json @@ -119,7 +119,7 @@ "url": "https://www.volkskunde.ch/sgv/archive-und-sammlungen/volksliederarchiv", "text": "External Project Website" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/lhtt.json b/data/json/lhtt.json index 9d2a1295..535f2e4f 100644 --- a/data/json/lhtt.json +++ b/data/json/lhtt.json @@ -311,7 +311,7 @@ "url": "https://lhtt.philhist.unibas.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/limc.json b/data/json/limc.json index d434ba6e..5c7836b5 100644 --- a/data/json/limc.json +++ b/data/json/limc.json @@ -121,7 +121,7 @@ "url": "https://weblimc.org/page/home/Basel", "text": "Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/locusludi.json b/data/json/locusludi.json index c60600c8..3da40066 100644 --- a/data/json/locusludi.json +++ b/data/json/locusludi.json @@ -115,7 +115,7 @@ "url": "https://app.dasch.swiss/project/sWbpL_RCTWKF6Y3aqxFZfA", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/mark16.json b/data/json/mark16.json index 70f0f94f..f6897d15 100644 --- a/data/json/mark16.json +++ b/data/json/mark16.json @@ -342,7 +342,7 @@ "url": "https://mark16.sib.swiss/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/mfmps.json b/data/json/mfmps.json index 5d557ef0..ddb59bf1 100644 --- a/data/json/mfmps.json +++ b/data/json/mfmps.json @@ -109,7 +109,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0116", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/mls.json b/data/json/mls.json index 59d80140..3a0f5600 100644 --- a/data/json/mls.json +++ b/data/json/mls.json @@ -195,7 +195,7 @@ "url": "https://mls.0807.dasch.swiss/home", "text": "Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/nietzsche.json b/data/json/nietzsche.json index 5f873344..89f33fc8 100644 --- a/data/json/nietzsche.json +++ b/data/json/nietzsche.json @@ -77,7 +77,7 @@ "url": "https://nietzsche.philhist.unibas.ch", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/olympic.json b/data/json/olympic.json index ba98d407..ea4afd97 100644 --- a/data/json/olympic.json +++ b/data/json/olympic.json @@ -84,7 +84,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0114", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/operativetv.json b/data/json/operativetv.json index a24270a7..384b2307 100644 --- a/data/json/operativetv.json +++ b/data/json/operativetv.json @@ -117,7 +117,7 @@ "url": "https://app.dasch.swiss/project/8faW0HwsTgGzu98tCYClig", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/participation-social.json b/data/json/participation-social.json index 9f4f319f..4e8c7029 100644 --- a/data/json/participation-social.json +++ b/data/json/participation-social.json @@ -97,7 +97,7 @@ "url": "https://ark.dasch.swiss/ark:/72163/1/083D", "text": "Discover Project Metadata" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/portraits-pou.json b/data/json/portraits-pou.json index 82701147..b82d6fd1 100644 --- a/data/json/portraits-pou.json +++ b/data/json/portraits-pou.json @@ -91,7 +91,7 @@ "text": "Ottoman" } ], - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/posepi.json b/data/json/posepi.json index c9c31fd5..9323b7cc 100644 --- a/data/json/posepi.json +++ b/data/json/posepi.json @@ -91,7 +91,7 @@ "url": "https://app.dasch.swiss/project/OYPOsaE5TLeQjhRC4QTwgQ", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/postkarten.json b/data/json/postkarten.json index dc1e71ec..72eb73e0 100644 --- a/data/json/postkarten.json +++ b/data/json/postkarten.json @@ -58,7 +58,7 @@ "funders": [ "http://ns.dasch.swiss/repository#dsp-0811-organization-000" ], - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/prethero.json b/data/json/prethero.json index cd71f151..82762545 100644 --- a/data/json/prethero.json +++ b/data/json/prethero.json @@ -87,7 +87,7 @@ "url": "https://medialitt.hypotheses.org/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/prom_know.json b/data/json/prom_know.json index 599a582b..598486c9 100644 --- a/data/json/prom_know.json +++ b/data/json/prom_know.json @@ -196,7 +196,7 @@ "url": "https://app.dasch.swiss/project/Lg4VTMu4QTSs8I-SPSCoqw", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/reforme-geneve.json b/data/json/reforme-geneve.json index bce7cfff..951e1e92 100644 --- a/data/json/reforme-geneve.json +++ b/data/json/reforme-geneve.json @@ -96,7 +96,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0111", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/religious-speech.json b/data/json/religious-speech.json index f40b6bc1..edf4c07d 100644 --- a/data/json/religious-speech.json +++ b/data/json/religious-speech.json @@ -131,7 +131,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0101", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/data/json/rich.json b/data/json/rich.json index a6c9ff9e..dd8d2dfb 100644 --- a/data/json/rich.json +++ b/data/json/rich.json @@ -92,7 +92,7 @@ "en": "1st century A.D. – 21st century A.D." } ], - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/roud.json b/data/json/roud.json index 51082fcc..a4c79533 100644 --- a/data/json/roud.json +++ b/data/json/roud.json @@ -97,7 +97,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0112", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/sgv.json b/data/json/sgv.json index 68514000..a0f3af8c 100644 --- a/data/json/sgv.json +++ b/data/json/sgv.json @@ -294,7 +294,7 @@ "url": "https://archiv.sgv-sstp.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/societesavoie.json b/data/json/societesavoie.json index 97803e8c..41a9db53 100644 --- a/data/json/societesavoie.json +++ b/data/json/societesavoie.json @@ -106,7 +106,7 @@ "url": "https://app.dasch.swiss/project/0121", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/stardom.json b/data/json/stardom.json index 8cfbb754..294ff5fc 100644 --- a/data/json/stardom.json +++ b/data/json/stardom.json @@ -121,7 +121,7 @@ "url": "https://app.ls-prod-server.dasch.swiss/project/0107", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/tanner.json b/data/json/tanner.json index 0e1e9ba9..b70a34a5 100644 --- a/data/json/tanner.json +++ b/data/json/tanner.json @@ -112,7 +112,7 @@ "url": "https://app.dasch.swiss/project/0102", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/tdk.json b/data/json/tdk.json index c0c8d947..2c4e496d 100644 --- a/data/json/tdk.json +++ b/data/json/tdk.json @@ -181,7 +181,7 @@ "url": "https://aegyptologie.philhist.unibas.ch/de/forschung/forschungsprojekte/university-of-basel-kings-valley-project/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/tds.json b/data/json/tds.json index 89785887..7e465637 100644 --- a/data/json/tds.json +++ b/data/json/tds.json @@ -276,7 +276,7 @@ "url": "http://theatresdesociete.unil.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/vitrocentre.json b/data/json/vitrocentre.json index fc604c36..18b7d70a 100644 --- a/data/json/vitrocentre.json +++ b/data/json/vitrocentre.json @@ -78,7 +78,7 @@ "url": "https://vitrosearch.ch/en", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/waldaucinema.json b/data/json/waldaucinema.json index 10c8560c..b3c16421 100644 --- a/data/json/waldaucinema.json +++ b/data/json/waldaucinema.json @@ -124,7 +124,7 @@ "url": "https://app.dasch.swiss/project/Y9hvowDvRKy8Mkq5anCDnw", "text": "Discover Project Data" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/woposs.json b/data/json/woposs.json index bf998cd7..8f7e46dd 100644 --- a/data/json/woposs.json +++ b/data/json/woposs.json @@ -282,7 +282,7 @@ "url": "https://woposs.unine.ch/", "text": "External Project Website" }, - "status": "ongoing" + "status": "Ongoing" }, "datasets": [ { diff --git a/data/json/wordweb.json b/data/json/wordweb.json index f8316389..65591ae3 100644 --- a/data/json/wordweb.json +++ b/data/json/wordweb.json @@ -100,7 +100,7 @@ "url": "https://app.dasch.swiss/project/qhOve-cKTmSkiIU81W0lDQ", "text": "Discover Project Data" }, - "status": "finished" + "status": "Finished" }, "datasets": [ { diff --git a/resources/schema-metadata-draft.json b/resources/schema-metadata-draft.json index aec92643..61f1da39 100644 --- a/resources/schema-metadata-draft.json +++ b/resources/schema-metadata-draft.json @@ -132,12 +132,11 @@ }, "status": { "type": "string", - "description": "The status of the dataset.", + "description": "The status of the Project.", "enum": [ - "ongoing", - "finished" - ], - "default": "ongoing" + "Ongoing", + "Finished" + ] }, "name": { "type": "string", @@ -268,13 +267,14 @@ }, "required": [ "__type", - "shortcode", - "name", - "startDate", - "teaserText", "datasets", + "disciplines", "keywords", - "disciplines" + "name", + "shortcode", + "startDate", + "status", + "teaserText" ], "additionalProperties": false }, diff --git a/resources/schema-metadata-final.json b/resources/schema-metadata-final.json index e8490722..e59e4152 100644 --- a/resources/schema-metadata-final.json +++ b/resources/schema-metadata-final.json @@ -134,9 +134,8 @@ "type": "string", "description": "The status of the dataset.", "enum": [ - "finished" - ], - "default": "ongoing" + "Finished" + ] }, "name": { "type": "string", diff --git a/src/domain/model/draft_model.rs b/src/domain/model/draft_model.rs index a4e0a6ee..74548de0 100644 --- a/src/domain/model/draft_model.rs +++ b/src/domain/model/draft_model.rs @@ -80,9 +80,9 @@ fn test_try_from_shortcode() { #[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq)] pub enum DraftProjectStatus { #[default] - #[serde(rename = "ongoing")] + #[serde(rename = "Ongoing")] Ongoing, - #[serde(rename = "finished")] + #[serde(rename = "Finished")] Finished, } diff --git a/web-frontend/src/projects-repository/Tile.svelte b/web-frontend/src/projects-repository/Tile.svelte index 3404f0bd..a9ff8cee 100644 --- a/web-frontend/src/projects-repository/Tile.svelte +++ b/web-frontend/src/projects-repository/Tile.svelte @@ -8,7 +8,7 @@
Status {metadata.status} Date: Thu, 5 Sep 2024 08:22:06 +0200 Subject: [PATCH 2/2] build: Use cargo version for publishing images from release tags (DEV-4076) (#225) --- .github/workflows/publish.yml | 6 +++--- justfile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 62ab2585..451d550c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -61,7 +61,7 @@ jobs: name: manifest runs-on: ubuntu-latest needs: [publish_amd64, publish_arm64] - if: github.ref == 'refs/heads/main' || (github.event_name == 'create' && startsWith(github.ref, 'refs/tags/dsp-meta-cmd')) + if: github.ref == 'refs/heads/main' || (github.event_name == 'create' && startsWith(github.ref, 'refs/tags')) outputs: tag: ${{ steps.output_docker_image_tag.outputs.tag }} steps: @@ -83,7 +83,7 @@ jobs: name: Trigger deployment to DEV runs-on: ubuntu-latest needs: publish_manifest - if: github.ref == 'refs/heads/main' || (github.event_name == 'create' && startsWith(github.ref, 'refs/tags/dsp-meta-cmd')) + if: github.ref == 'refs/heads/main' steps: - name: Trigger deployment to DEV env: @@ -98,7 +98,7 @@ jobs: release-please: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' || (github.event_name == 'create' && startsWith(github.ref, 'refs/tags/dsp-meta-cmd')) + if: github.ref == 'refs/heads/main' steps: - uses: googleapis/release-please-action@v4 with: diff --git a/justfile b/justfile index bdfaac73..8d261dde 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,8 @@ DOCKER_REPO := "daschswiss/dsp-meta" CARGO_VERSION := `cargo metadata --format-version=1 --no-deps | jq --raw-output '.packages[].version'` COMMIT_HASH := `git log --pretty=format:'%h' -n 1` -IMAGE_TAG := CARGO_VERSION + "-" + COMMIT_HASH +GIT_TAG := `git describe --tags --exact-match 2>/dev/null || true` +IMAGE_TAG := if GIT_TAG == "" { CARGO_VERSION + "-" + COMMIT_HASH } else { GIT_TAG } DOCKER_IMAGE := DOCKER_REPO + ":" + IMAGE_TAG # List all recipes