diff --git a/.github/workflows/pr-first-response.yml b/.github/workflows/pr-first-response.yml index f54c8b91ba..b2161c0d79 100644 --- a/.github/workflows/pr-first-response.yml +++ b/.github/workflows/pr-first-response.yml @@ -8,19 +8,43 @@ jobs: send-response: runs-on: ubuntu-latest steps: - - name: Fetch random comment 🗣️ - uses: JamesIves/fetch-api-data-action@v2.1.0 - with: - ENDPOINT: https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment - CONFIGURATION: '{ "method": "POST", "headers": {"Authorization": "Bearer ${{ secrets.OUR_BOT_API_TOKEN }}", "Content-Type": "application/json" }, "body": { "repo": "${{ github.repository }}", "number": "${{ github.event.number }}", "actor": "${{ github.actor }}", "commentType": "opened-pr-first-comment"} }' - - name: Add PR comment - if: "${{ env.fetch-api-data != '' }}" - uses: actions/github-script@v5 + - name: Install dependencies + run: | + npm install node-fetch@2 + - name: Fetch random comment 🗣️ and add it to the PR + uses: actions/github-script@v6 with: script: | - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: `${{ env.fetch-api-data }}` - }) \ No newline at end of file + const fetch = require('node-fetch') + + const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', { + method: 'post', + body: JSON.stringify({ + repo: '${{ github.repository }}', + number: '${{ github.event.number }}', + actor: '${{ github.actor }}', + commentType: 'opened-pr-first-comment' + }), + headers: { + 'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}', + 'Content-Type': 'application/json' + } + }); + + try { + const data = await response.text(); + + if(response.status === 200 && data !== '') { + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: data + }); + } else { + console.log("Status code did not indicate success:", response.status); + console.log("Returned data:", data); + } + } catch(error) { + console.log(error); + } diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs index b55c598cac..30f7c1da65 100644 --- a/src/Umbraco.Core/Models/MemberType.cs +++ b/src/Umbraco.Core/Models/MemberType.cs @@ -161,7 +161,7 @@ namespace Umbraco.Cms.Core.Models } else { - var tuple = new MemberTypePropertyProfileAccess(false, false, true); + var tuple = new MemberTypePropertyProfileAccess(false, false, value); _memberTypePropertyTypes.Add(propertyTypeAlias, tuple); } } diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs index b939eb15a5..84d44133d2 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs @@ -310,6 +310,33 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models Debug.Print(json); } + [Test] + [TestCase(false, false, false)] + [TestCase(true, false, false)] + [TestCase(true, true, false)] + [TestCase(true, true, true)] + public void Can_Set_Is_Member_Specific_Property_Type_Options(bool isSensitive, bool canView, bool canEdit) + { + var propertyTypeAlias = "testType"; + MemberType memberType = BuildMemberType(); + var propertyType = new PropertyTypeBuilder() + .WithAlias("testType") + .Build(); + + memberType.AddPropertyType(propertyType); + + memberType.SetIsSensitiveProperty(propertyTypeAlias, isSensitive); + memberType.SetMemberCanViewProperty(propertyTypeAlias, canView); + memberType.SetMemberCanEditProperty(propertyTypeAlias, canEdit); + + Assert.Multiple(() => + { + Assert.AreEqual(isSensitive, memberType.IsSensitiveProperty(propertyTypeAlias)); + Assert.AreEqual(canView, memberType.MemberCanViewProperty(propertyTypeAlias)); + Assert.AreEqual(canEdit, memberType.MemberCanEditProperty(propertyTypeAlias)); + }); + } + private static MemberType BuildMemberType() { var builder = new MemberTypeBuilder();