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

53.06

/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.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;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.Icons.IconOverlays;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;

public sealed class ExtractableColumnStateBasedIconProvider : IObjectStateBasedIconProvider
{
    private static readonly Image<Rgba32> BasicImage = Image.Load<Rgba32>(CatalogueIcons.ExtractableColumn);

    public Image<Rgba32> GetImageIfSupportedObject(object o)
    {
        if (o is not ExtractableColumn col)
            return null;

        var toReturn = BasicImage;

        //if the current state is to hash add the overlay
        if (col.HashOnDataRelease)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);

        if (col.CatalogueExtractionInformation?.IsPrimaryKey ?? false)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key);
        if (col.CatalogueExtractionInformation?.IsExtractionIdentifier ?? false)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);

        var ei = col.CatalogueExtractionInformation;

        //its parent ExtractionInformation still exists then we can determine its category
        return ei == null
            ? toReturn
            : ei.ExtractionCategory switch
            {
                ExtractionCategory.ProjectSpecific =>
                    IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable),
                ExtractionCategory.Core => IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable),
                ExtractionCategory.Supplemental => IconOverlayProvider.GetOverlay(toReturn,
                    OverlayKind.Extractable_Supplemental),
                ExtractionCategory.SpecialApprovalRequired => IconOverlayProvider.GetOverlay(toReturn,
                    OverlayKind.Extractable_SpecialApproval),
                ExtractionCategory.Internal => IconOverlayProvider.GetOverlay(toReturn,
                    OverlayKind.Extractable_Internal),
                ExtractionCategory.Deprecated => IconOverlayProvider.GetOverlay(
                    IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable), OverlayKind.Deprecated),
                _ => throw new ArgumentOutOfRangeException(nameof(o))
            };
    }
}

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;
8	using Rdmp.Core.Curation.Data;
9	using Rdmp.Core.DataExport.Data;
10	using Rdmp.Core.Icons.IconOverlays;
11	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
12	using SixLabors.ImageSharp;
13	using SixLabors.ImageSharp.PixelFormats;
14
15	namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
16
17	public sealed class ExtractableColumnStateBasedIconProvider : IObjectStateBasedIconProvider
18	{
19	private static readonly Image<Rgba32> BasicImage = Image.Load<Rgba32>(CatalogueIcons.ExtractableColumn);	2✔
20
21	public Image<Rgba32> GetImageIfSupportedObject(object o)
22	{
23	if (o is not ExtractableColumn col)	368✔
24	return null;	336✔
25
26	var toReturn = BasicImage;	32✔
27
28	//if the current state is to hash add the overlay
29	if (col.HashOnDataRelease)	32!
30	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);	×
31
32	if (col.CatalogueExtractionInformation?.IsPrimaryKey ?? false)	32!
33	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key);	×
34	if (col.CatalogueExtractionInformation?.IsExtractionIdentifier ?? false)	32!
35	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);	14✔
36
37	var ei = col.CatalogueExtractionInformation;	32✔
38
39	//its parent ExtractionInformation still exists then we can determine its category
40	return ei == null	32!
41	? toReturn	32✔
42	: ei.ExtractionCategory switch	32✔
43	{	32✔
44	ExtractionCategory.ProjectSpecific =>	32✔
45	IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable),	×
46	ExtractionCategory.Core => IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable),	32✔
47	ExtractionCategory.Supplemental => IconOverlayProvider.GetOverlay(toReturn,	×
48	OverlayKind.Extractable_Supplemental),	×
49	ExtractionCategory.SpecialApprovalRequired => IconOverlayProvider.GetOverlay(toReturn,	×
50	OverlayKind.Extractable_SpecialApproval),	×
51	ExtractionCategory.Internal => IconOverlayProvider.GetOverlay(toReturn,	×
52	OverlayKind.Extractable_Internal),	×
53	ExtractionCategory.Deprecated => IconOverlayProvider.GetOverlay(	×
54	IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable), OverlayKind.Deprecated),	×
55	_ => throw new ArgumentOutOfRangeException(nameof(o))	×
56	};	32✔
57	}
58	}

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