Skip to content

Commit

Permalink
improved update
Browse files Browse the repository at this point in the history
  • Loading branch information
@JFriel
JFriel committed Oct 17, 2024
1 parent 14a16c0 commit c7770f0
Show file tree
Hide file tree
Showing 17 changed files with 241 additions and 571 deletions.
4 changes: 2 additions & 2 deletions Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public partial class HomeBoxUI : UserControl
{
private IActivateItems _activator;
private bool _doneSetup;
private Type _openType;
private System.Type _openType;

private RDMPCollectionCommonFunctionality CommonTreeFunctionality { get; } = new();

Expand All @@ -37,7 +37,7 @@ public HomeBoxUI()
olvRecent.ItemActivate += OlvRecent_ItemActivate;
}

public void SetUp(IActivateItems activator, string title, Type openType, AtomicCommandUIFactory factory,
public void SetUp(IActivateItems activator, string title, System.Type openType, AtomicCommandUIFactory factory,
params IAtomicCommand[] newCommands)
{
_openType = openType;
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ataset
# Changelog
All notable changes to this project will be documented in this file.

Expand Down
8 changes: 8 additions & 0 deletions Rdmp.Core/Datasets/PureDataset.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Amazon.Auth.AccessControlPolicy.ActionIdentifiers;
using NPOI.SS.Formula.Atp;
using NPOI.SS.Formula.Functions;
using SynthEHR;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -59,6 +61,12 @@ public PureDate(DateTime dateTime)

public PureDate() { }


public DateTime ToDateTime()
{
return new DateTime(Year, Month??1, Day??1, 0, 0, 0);
}

public bool IsBefore(PureDate date)
{
if (Year < date.Year) return true;
Expand Down
102 changes: 51 additions & 51 deletions Rdmp.Core/Datasets/PureDatasetProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,45 @@ public override void AddExistingDataset(string name, string url)
}
}

public Curation.Data.Datasets.Dataset Create(string title, string publisherUid, List<PurePerson> people, Visibility visibility, PureDate publicationDate)
{
//this works but i'm not sure it's linking up with the person correctly

var pureDataset = new PureDataset();
pureDataset.Title = new ENGBWrapper(title);
pureDataset.ManagingOrganization = new PureSystem(Configuration.Organisation_ID, "Organization");
pureDataset.Type = new URITerm("/dk/atira/pure/dataset/datasettypes/dataset/dataset", new ENGBWrapper("Dataset"));
pureDataset.Publisher = new PureSystem(publisherUid, "Publisher");

pureDataset.Persons = people;
pureDataset.Visibility = visibility;
pureDataset.Organizations = [new PureSystem(Configuration.Organisation_ID, "Organization")];
pureDataset.PublicationAvailableDate = publicationDate;

var serializeOptions = new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
WriteIndented = true
};

var jsonString = JsonSerializer.Serialize(pureDataset, serializeOptions);

var uri = $"{Configuration.Url}/data-sets";
var httpContent = new StringContent(jsonString, Encoding.UTF8, "application/json");

var response = Task.Run(async () => await _client.PutAsync(uri, httpContent)).Result;
if (response.StatusCode != HttpStatusCode.Created)
{
throw new Exception("Error");
}
var detailsString = Task.Run(async () => await response.Content.ReadAsStringAsync()).Result;
PureDataset pd = JsonConvert.DeserializeObject<PureDataset>(detailsString);
var dataset = new Curation.Data.Datasets.Dataset(Repository, pureDataset.Title.en_GB);
dataset.Provider_ID = Configuration.ID;
dataset.Url = pd.PortalURL;
dataset.SaveToDatabase();
return dataset;
}
//public Curation.Data.Datasets.Dataset Create(string title, string publisherUid, List<PurePerson> people, Visibility visibility, PureDate publicationDate)
//{
// //this works but i'm not sure it's linking up with the person correctly

// var pureDataset = new PureDataset();
// pureDataset.Title = new ENGBWrapper(title);
// pureDataset.ManagingOrganization = new PureSystem(Configuration.Organisation_ID, "Organization");
// pureDataset.Type = new URITerm("/dk/atira/pure/dataset/datasettypes/dataset/dataset", new ENGBWrapper("Dataset"));
// pureDataset.Publisher = new PureSystem(publisherUid, "Publisher");

// pureDataset.Persons = people;
// pureDataset.Visibility = visibility;
// pureDataset.Organizations = [new PureSystem(Configuration.Organisation_ID, "Organization")];
// pureDataset.PublicationAvailableDate = publicationDate;

// var serializeOptions = new JsonSerializerOptions
// {
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
// WriteIndented = true
// };

// var jsonString = JsonSerializer.Serialize(pureDataset, serializeOptions);

// var uri = $"{Configuration.Url}/data-sets";
// var httpContent = new StringContent(jsonString, Encoding.UTF8, "application/json");

// var response = Task.Run(async () => await _client.PutAsync(uri, httpContent)).Result;
// if (response.StatusCode != HttpStatusCode.Created)
// {
// throw new Exception("Error");
// }
// var detailsString = Task.Run(async () => await response.Content.ReadAsStringAsync()).Result;
// PureDataset pd = JsonConvert.DeserializeObject<PureDataset>(detailsString);
// var dataset = new Curation.Data.Datasets.Dataset(Repository, pureDataset.Title.en_GB);
// dataset.Provider_ID = Configuration.ID;
// dataset.Url = pd.PortalURL;
// dataset.SaveToDatabase();
// return dataset;
//}

public override void Update(string uuid, PluginDataset datasetUpdates)
{
Expand Down Expand Up @@ -158,19 +158,19 @@ public override Curation.Data.Datasets.Dataset FetchDatasetByID(int id)
}


public List<PureSystem> FetchPublishers()
{
var uri = $"{Configuration.Url}/publishers";
var response = Task.Run(async () => await _client.GetAsync(uri)).Result;
if (response.StatusCode != HttpStatusCode.OK)
{
throw new Exception("Error");
}
var detailsString = Task.Run(async () => await response.Content.ReadAsStringAsync()).Result;
List<PureSystem> publishers = JsonConvert.DeserializeObject<List<PureSystem>>(detailsString);
return publishers;
//public List<PurePublisher> FetchPublishers()
//{
// var uri = $"{Configuration.Url}/publishers";
// var response = Task.Run(async () => await _client.GetAsync(uri)).Result;
// if (response.StatusCode != HttpStatusCode.OK)
// {
// throw new Exception("Error");
// }
// var detailsString = Task.Run(async () => await response.Content.ReadAsStringAsync()).Result;
// List<PurePublisher> publishers = JsonConvert.DeserializeObject<List<PurePublisher>>(detailsString);
// return publishers;

}
//}

public override Curation.Data.Datasets.Dataset Create()
{
Expand Down
5 changes: 4 additions & 1 deletion Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,9 @@
<value>..\StandardRegex31.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="AllDatasetProviderConfigurationsNode" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\AllDatasetProviderConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\famfamfam\folder_table.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="DatasetProviderConfiguration" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\famfamfam\cog.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
4 changes: 3 additions & 1 deletion Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,7 @@ public enum RDMPConcept
RegexRedaction,
RegexRedactionConfiguration,
RegexRedactionKey,
AllRegexRedactionConfigurationsNode
AllRegexRedactionConfigurationsNode,
DatasetProviderConfiguration,
AllDatasetProviderConfigurationsNode
}
8 changes: 4 additions & 4 deletions Rdmp.Core/Providers/CatalogueChildProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public class CatalogueChildProvider : ICoreChildProvider
public HashSet<AggregateConfiguration> OrphanAggregateConfigurations;
public AggregateConfiguration[] TemplateAggregateConfigurations;

public AllDatasetConfigurationsNode AllDatasetConfigurationsNode { get; set; }
public AllDatasetProviderConfigurationsNode AllDatasetProviderConfigurationsNode { get; set; }
public DatasetProviderConfiguration[] DatasetProviderConfigurations { get; set; }


Expand Down Expand Up @@ -459,9 +459,9 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
AllRegexRedactionConfigurationsNode = new AllRegexRedactionConfigurationsNode();
AddChildren(AllRegexRedactionConfigurationsNode);

AllDatasetConfigurationsNode = new AllDatasetConfigurationsNode();
AllDatasetProviderConfigurationsNode = new AllDatasetProviderConfigurationsNode();
DatasetProviderConfigurations = GetAllObjects<DatasetProviderConfiguration>(repository);
AddChildren(AllDatasetConfigurationsNode);
AddChildren(AllDatasetProviderConfigurationsNode);

AllDatasets = GetAllObjects<Curation.Data.Datasets.Dataset>(repository);
AllDatasetsNode = new AllDatasetsNode();
Expand Down Expand Up @@ -628,7 +628,7 @@ private void AddChildren(AllDatasetsNode allDatasetsNode)
AddToDictionaries(children, descendancy);
}

private void AddChildren(AllDatasetConfigurationsNode allDatasetConfigurationNode)
private void AddChildren(AllDatasetProviderConfigurationsNode allDatasetConfigurationNode)
{
var children = new HashSet<object>(DatasetProviderConfigurations);
var descendancy = new DescendancyList(allDatasetConfigurationNode);
Expand Down
2 changes: 2 additions & 0 deletions Rdmp.Core/Providers/DataExportChildProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,8 @@ public override void UpdateTo(ICoreChildProvider other)
AllDatasetsNode = dxOther.AllDatasetsNode;
AllRegexRedactionConfigurations = dxOther.AllRegexRedactionConfigurations;
AllRegexRedactionConfigurationsNode = dxOther.AllRegexRedactionConfigurationsNode;
AllDatasetProviderConfigurationsNode = dxOther.AllDatasetProviderConfigurationsNode;
AllDataAccessCredentialsNode = dxOther.AllDataAccessCredentialsNode;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Rdmp.Core/Providers/ICoreChildProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public interface ICoreChildProvider : IChildProvider

AllRegexRedactionConfigurationsNode AllRegexRedactionConfigurationsNode { get; }

AllDatasetConfigurationsNode AllDatasetConfigurationsNode { get; }
AllDatasetProviderConfigurationsNode AllDatasetProviderConfigurationsNode { get; }
AllObjectSharingNode AllObjectSharingNode { get; }
ObjectImport[] AllImports { get; }
ObjectExport[] AllExports { get; }
Expand Down
4 changes: 2 additions & 2 deletions Rdmp.Core/Providers/Nodes/AllDatasetProviderConfigurationsNode.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Rdmp.Core.Providers.Nodes;

public class AllDatasetConfigurationsNode : SingletonNode
public class AllDatasetProviderConfigurationsNode : SingletonNode
{
public AllDatasetConfigurationsNode():base("Dataset Provider Configurations") { }
public AllDatasetProviderConfigurationsNode():base("Dataset Provider Configurations") { }
}
5 changes: 1 addition & 4 deletions Rdmp.UI/Collections/ConfigurationsCollectionUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ private IAtomicCommand[] GetWhitespaceRightClickMenu()
new ExecuteCommandCreateNewDatasetUI(_activator){
OverrideCommandName="Add New Dataset", SuggestedCategory="Datasets"
},
new ExecuteCommandCreateNewPureDatasetUI(_activator){
OverrideCommandName="Create New Pure Dataset", SuggestedCategory="Pure Datasets"
},
new ExecuteCommandImportExistingPureDatasetUI(_activator)
{
OverrideCommandName="Import Existing Pure Dataset", SuggestedCategory="Pure Datasets"
Expand All @@ -55,7 +52,7 @@ public override void SetItemActivator(IActivateItems activator)
//tlvConfigurations.AddObject(Activator.CoreChildProvider.DatasetRootFolder);
tlvConfigurations.AddObject(Activator.CoreChildProvider.AllDatasetsNode);
tlvConfigurations.AddObject(Activator.CoreChildProvider.AllRegexRedactionConfigurationsNode);
tlvConfigurations.AddObject(Activator.CoreChildProvider.AllDatasetConfigurationsNode);
tlvConfigurations.AddObject(Activator.CoreChildProvider.AllDatasetProviderConfigurationsNode);
tlvConfigurations.Refresh();
}

Expand Down
30 changes: 0 additions & 30 deletions Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPureDatasetUI.cs
View file

This file was deleted.

Loading

0 comments on commit c7770f0

Please sign in to comment.