6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDatasetsToConfiguration.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System.Linq;
using Rdmp.Core.CommandExecution.Combining;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.Providers;
using Rdmp.Core.Repositories.Construction;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandAddDatasetsToConfiguration : BasicCommandExecution
{
    private readonly ExtractionConfiguration _targetExtractionConfiguration;

    private IExtractableDataSet[] _toadd;

    /// <summary>
    /// True if <see cref="_toadd"/> is a suggestion of available datasets from which the user must pick.
    /// False if <see cref="_toadd"/> reflects an already made selection (e.g. a drag and drop operation).
    /// </summary>
    private bool _userMustPick;

    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems activator,
        ExtractableDataSetCombineable sourceExtractableDataSetCombineable,
        ExtractionConfiguration targetExtractionConfiguration)
        : this(activator, targetExtractionConfiguration)
    {
        SetExtractableDataSets(false, sourceExtractableDataSetCombineable.ExtractableDataSets);
    }

    [UseWithObjectConstructor]
    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
        ExtractableDataSet extractableDataSet, ExtractionConfiguration targetExtractionConfiguration)
        : this(itemActivator, targetExtractionConfiguration)
    {
        SetExtractableDataSets(false, extractableDataSet);
    }

    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
        ExtractionConfiguration targetExtractionConfiguration) : base(itemActivator)
    {
        _targetExtractionConfiguration = targetExtractionConfiguration;

        if (_targetExtractionConfiguration.IsReleased)
            SetImpossible("Extraction is Frozen because it has been released and is readonly, try cloning it instead");

        //if we don't yet know what datasets to add (i.e. haven't called SetExtractableDataSets)
        if (_toadd == null)
            if (itemActivator.CoreChildProvider is DataExportChildProvider childProvider)
            {
                //use the ones that are not already in the ExtractionConfiguration
                var _datasets = childProvider.GetDatasets(targetExtractionConfiguration)
                    .Select(n => n.ExtractableDataSet).ToArray();
                var _importableDataSets = childProvider.ExtractableDataSets.Except(_datasets)

                    //where it can be used in any Project OR this project only
                    .Where(ds => ds.Project_ID == null || ds.Project_ID == targetExtractionConfiguration.Project_ID)
                    .ToArray();

                SetExtractableDataSets(true, _importableDataSets);
            }
            else
            {
                SetImpossible("CoreChildProvider was not DataExportChildProvider");
            }
    }

    private void SetExtractableDataSets(bool userMustPick, params IExtractableDataSet[] toAdd)
    {
        _userMustPick = userMustPick;
        var alreadyInConfiguration = _targetExtractionConfiguration.GetAllExtractableDataSets().ToArray();
        _toadd = toAdd.Except(alreadyInConfiguration).ToArray();

        if (!_toadd.Any())
            SetImpossible("ExtractionConfiguration already contains this dataset(s)");
    }

    public override void Execute()
    {
        base.Execute();

        if (_userMustPick)
        {
            if (!SelectMany(new DialogArgs
            {
                WindowTitle = "Select Datasets",
                TaskDescription =
                        "Select the Datasets you would like to be exported as part of your Extraction Configuration."
            }, _toadd.Cast<ExtractableDataSet>().ToArray(), out var selected))
                return;

            foreach (var ds in selected)
                _targetExtractionConfiguration.AddDatasetToConfiguration(ds);
        }
        else
        {
            foreach (var ds in _toadd)
                _targetExtractionConfiguration.AddDatasetToConfiguration(ds);
        }

        Publish(_targetExtractionConfiguration);
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
        iconProvider.GetImage(RDMPConcept.ExtractableDataSet, OverlayKind.Import);
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System.Linq;
8	using Rdmp.Core.CommandExecution.Combining;
9	using Rdmp.Core.DataExport.Data;
10	using Rdmp.Core.Icons.IconProvision;
11	using Rdmp.Core.Providers;
12	using Rdmp.Core.Repositories.Construction;
13	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
14	using SixLabors.ImageSharp;
15	using SixLabors.ImageSharp.PixelFormats;
16
17	namespace Rdmp.Core.CommandExecution.AtomicCommands;
18
19	public class ExecuteCommandAddDatasetsToConfiguration : BasicCommandExecution
20	{
21	private readonly ExtractionConfiguration _targetExtractionConfiguration;
22
23	private IExtractableDataSet[] _toadd;
24
25	/// <summary>
26	/// True if <see cref="_toadd"/> is a suggestion of available datasets from which the user must pick.
27	/// False if <see cref="_toadd"/> reflects an already made selection (e.g. a drag and drop operation).
28	/// </summary>
29	private bool _userMustPick;
30
31	public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems activator,
32	ExtractableDataSetCombineable sourceExtractableDataSetCombineable,
33	ExtractionConfiguration targetExtractionConfiguration)
34	: this(activator, targetExtractionConfiguration)	×
35	{
36	SetExtractableDataSets(false, sourceExtractableDataSetCombineable.ExtractableDataSets);	×
37	}	×
38
39	[UseWithObjectConstructor]
40	public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
41	ExtractableDataSet extractableDataSet, ExtractionConfiguration targetExtractionConfiguration)
42	: this(itemActivator, targetExtractionConfiguration)	×
43	{
44	SetExtractableDataSets(false, extractableDataSet);	×
45	}	×
46
47	public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
48	ExtractionConfiguration targetExtractionConfiguration) : base(itemActivator)	×
49	{
50	_targetExtractionConfiguration = targetExtractionConfiguration;	×
51
52	if (_targetExtractionConfiguration.IsReleased)	×
53	SetImpossible("Extraction is Frozen because it has been released and is readonly, try cloning it instead");	×
54
55	//if we don't yet know what datasets to add (i.e. haven't called SetExtractableDataSets)
56	if (_toadd == null)	×
57	if (itemActivator.CoreChildProvider is DataExportChildProvider childProvider)	×
58	{
59	//use the ones that are not already in the ExtractionConfiguration
60	var _datasets = childProvider.GetDatasets(targetExtractionConfiguration)	×
61	.Select(n => n.ExtractableDataSet).ToArray();	×
62	var _importableDataSets = childProvider.ExtractableDataSets.Except(_datasets)	×
63		×
64	//where it can be used in any Project OR this project only	×
65	.Where(ds => ds.Project_ID == null \|\| ds.Project_ID == targetExtractionConfiguration.Project_ID)	×
66	.ToArray();	×
67
68	SetExtractableDataSets(true, _importableDataSets);	×
69	}
70	else
71	{
72	SetImpossible("CoreChildProvider was not DataExportChildProvider");	×
73	}
74	}	×
75
76	private void SetExtractableDataSets(bool userMustPick, params IExtractableDataSet[] toAdd)
77	{
78	_userMustPick = userMustPick;	×
79	var alreadyInConfiguration = _targetExtractionConfiguration.GetAllExtractableDataSets().ToArray();	×
80	_toadd = toAdd.Except(alreadyInConfiguration).ToArray();	×
81
82	if (!_toadd.Any())	×
83	SetImpossible("ExtractionConfiguration already contains this dataset(s)");	×
84	}	×
85
86	public override void Execute()
87	{
88	base.Execute();	×
89
90	if (_userMustPick)	×
91	{
92	if (!SelectMany(new DialogArgs	×
93	{	×
94	WindowTitle = "Select Datasets",	×
95	TaskDescription =	×
96	"Select the Datasets you would like to be exported as part of your Extraction Configuration."	×
97	}, _toadd.Cast<ExtractableDataSet>().ToArray(), out var selected))	×
98	return;	×
99
100	foreach (var ds in selected)	×
101	_targetExtractionConfiguration.AddDatasetToConfiguration(ds);	×
102	}
103	else
104	{
105	foreach (var ds in _toadd)	×
106	_targetExtractionConfiguration.AddDatasetToConfiguration(ds);	×
107	}
108
109	Publish(_targetExtractionConfiguration);	×
110	}	×
111
112	public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
113	iconProvider.GetImage(RDMPConcept.ExtractableDataSet, OverlayKind.Import);	×
114	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous