Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dev from KelvinTegelaar:dev #60

Merged
merged 10 commits into from
Nov 2, 2023
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:

- Please search the existing feature request to see if there has been a similar issue filed.

- If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://cipp.app/docs/dev/).
- If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://docs.cipp.app/dev-documentation/cipp-dev-guide/setting-up-for-local-development).

- Repeat feature requests are allowed if the previous request has been closed for more than 30 days

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Close_Stale_Issues_and_PRs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/stale@v4
with:
stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://cipp.app/GettingStarted/Contributions/ . Please notify the team if you are working on this yourself.'
stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://docs.cipp.app/dev-documentation/contributing-to-the-code . Please notify the team if you are working on this yourself.'
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
stale-issue-label: 'no-activity'
exempt-issue-labels: 'planned'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Comment_on_Issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
issue-number: ${{ github.event.issue.number }}
body: |
Thank you for creating a bug. Please make sure your bug is indeed a unique case by checking current and past issues, and reading the complete documentation at https://kelvintegelaar.github.io/CIPP
Thank you for creating a bug. Please make sure your bug is indeed a unique case by checking current and past issues, and reading the complete documentation at https://docs.cipp.app/
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug.".

Without confirming, your report will be closed in 24 hours. If you'd like this bug to be assigned to you, please comment "I would like to work on this please!".
Expand All @@ -35,5 +35,5 @@ jobs:
Your current priority is set to "No Priority". No Priority Feature requests automatically get closed in two days if a contributor does not accept the FR.

If you are a sponsor you can request an upgrade of priority. To upgrade the priority type "I would like to upgrade the priority".
If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://cipp.app/docs/dev/. Contributors to the CIPP project reserve the right to close feature requests at will.
If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://docs.cipp.app/dev-documentation/contributing-to-the-code. Contributors to the CIPP project reserve the right to close feature requests at will.
If you'd like this feature request to be assigned to you, please comment "I would like to work on this please!".
2 changes: 1 addition & 1 deletion src/components/forms/RFFComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ export const RFFSelectSearch = ({
isMulti={multi}
/>
)}
<RFFCFormFeedback meta={meta} />
{meta.error && meta.touched && <span className="text-danger">{meta.error}</span>}
</div>
)
}}
Expand Down
46 changes: 23 additions & 23 deletions src/data/standards.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "standards.MailContacts.GeneralContact.Enabled",
"cat": "Global",
"helpText": "",
"helpText": "Receives emails about updates about subscriptions etc",
"addedComponent": {
"type": "input",
"name": "standards.MailContacts.GeneralContact.Mail",
Expand All @@ -13,7 +13,7 @@
{
"name": "standards.MailContacts.SecurityContact.Enabled",
"cat": "Global",
"helpText": "",
"helpText": "Receives emails about security alerts or advisories by Microsoft",
"addedComponent": {
"type": "input",
"name": "standards.MailContacts.SecurityContact.Mail",
Expand All @@ -24,7 +24,7 @@
{
"name": "standards.MailContacts.MarketingContact.Enabled",
"cat": "Global",
"helpText": "",
"helpText": "Receives the emails related to marketing; new features etc",
"addedComponent": {
"type": "input",
"name": "standards.MailContacts.MarketingContact.Mail",
Expand All @@ -35,7 +35,7 @@
{
"name": "standards.MailContacts.TechContact.Enabled",
"cat": "Global",
"helpText": "",
"helpText": "Receives emails related to possible technical issues, service disruptions, etc",
"addedComponent": {
"type": "input",
"name": "standards.MailContacts.TechContact.Mail",
Expand All @@ -46,7 +46,7 @@
{
"name": "standards.AuditLog",
"cat": "Global",
"helpText": "",
"helpText": "Also runs Enable-OrganizationCustomization if needed",
"addedComponent": null,
"label": "Enable the Unified Audit Log"
},
Expand All @@ -67,21 +67,21 @@
{
"name": "standards.ModernAuth",
"cat": "Global",
"helpText": "",
"helpText": "Modern Authentication is enabled by default. This standard is no longer required and can be safely disabled",
"addedComponent": null,
"label": "Enable Modern Authentication"
},
{
"name": "standards.DisableBasicAuth",
"cat": "Global",
"helpText": "",
"helpText": "Basic Authentication is disabled by default. This standard is no longer required and can be safely disabled",
"addedComponent": null,
"label": "Disable Basic Authentication"
},
{
"name": "standards.DisableBasicAuthSMTP",
"cat": "Global",
"helpText": "",
"helpText": "Disables SMTP AUTH for the organization. This is the default for new tenants. Can be overridden by enabling SMTP AUTH on specific users",
"addedComponent": null,
"label": "Disable SMTP Basic Authentication"
},
Expand All @@ -95,14 +95,14 @@
{
"name": "standards.PWnumberMatchingRequiredState",
"cat": "AAD",
"helpText": "",
"helpText": "Passwordless with number matching is now enabled by default. This standard is no longer required and can be safely disabled",
"addedComponent": null,
"label": "Enable Passwordless with Number Matching"
},
{
"cat": "AAD",
"name": "standards.PWdisplayAppInformationRequiredState",
"helpText": "",
"helpText": "Enables the MS authenticator app to display information about the app that is requesting authentication",
"addedComponent": null,
"label": "Enable Passwordless with Location information and Number Matching"
},
Expand Down Expand Up @@ -151,21 +151,21 @@
{
"cat": "AAD",
"name": "standards.SecurityDefaults",
"helpText": "",
"helpText": "Enables security defaults for the tenant. This has a lot of implications and should be carefully considered before enabling",
"addedComponent": null,
"label": "Enable Security Defaults"
},
{
"cat": "AAD",
"name": "standards.PasswordExpireDisabled",
"helpText": "",
"helpText": "Disables the expiration of passwords for the tenant",
"addedComponent": null,
"label": "Do not expire passwords"
},
{
"cat": "AAD",
"name": "standards.DisableSecurityGroupUsers",
"helpText": "",
"helpText": "Completely disables the creation of security groups by users. This also breaks the ability to manage groups themselves, or create Teams",
"addedComponent": null,
"label": "Disable Security Group creation by users"
},
Expand Down Expand Up @@ -210,14 +210,14 @@
{
"cat": "AAD",
"name": "standards.NudgeMFA.enable",
"helpText": "",
"helpText": "Enables registration campaign for the tenant",
"addedComponent": null,
"label": "Request to setup Authenticator if not setup yet."
},
{
"cat": "AAD",
"name": "standards.NudgeMFA.disable",
"helpText": "",
"helpText": "Disables registration campaign for the tenant",
"addedComponent": null,
"label": "Disables the request to setup Authenticator if setup."
},
Expand All @@ -238,7 +238,7 @@
{
"cat": "AAD",
"name": "standards.UndoOauth",
"helpText": "",
"helpText": "Disables App consent and set to Allow user consent for apps",
"addedComponent": null,
"label": "Undo App Consent Standard"
},
Expand All @@ -252,7 +252,7 @@
{
"cat": "AAD",
"name": "standards.EnableFIDO2",
"helpText": "",
"helpText": "Enables the FIDO2 authenticationMethod for the tenant",
"addedComponent": null,
"label": "Enable FIDO2 capabilities"
},
Expand Down Expand Up @@ -298,14 +298,14 @@
{
"name": "standards.AutoExpandArchive",
"cat": "Exchange",
"helpText": "",
"helpText": "Enables auto-expanding archives for the tenant",
"addedComponent": null,
"label": "Enable Auto-expanding archives"
},
{
"name": "standards.SpoofWarn.enable",
"cat": "Exchange",
"helpText": "",
"helpText": "Adds indicators to e-mail messages received from external senders in Outlook. Works on all Outlook clients/OWA",
"addedComponent": null,
"label": "Enable Spoofing warnings for Outlook (This e-mail is external identifiers)"
},
Expand Down Expand Up @@ -340,7 +340,7 @@
{
"name": "standards.ActivityBasedTimeout",
"cat": "Global",
"helpText": "",
"helpText": "Enables and sets Idle session timeout for Microsoft 365 to 1 hour. This policy affects most M365 web apps",
"addedComponent": null,
"label": "Enable 1 hour Activity based Timeout"
},
Expand Down Expand Up @@ -414,7 +414,7 @@
{
"name": "standards.intuneDeviceRetirementDays.Enabled",
"cat": "Intune",
"helpText": "",
"helpText": "A value between 0 and 270 is supported. A value of 0 disables retirement.",
"addedComponent": {
"type": "input",
"name": "standards.intuneDeviceRetirementDays.days",
Expand Down Expand Up @@ -485,14 +485,14 @@
{
"name": "standards.DeletedUserRentention",
"cat": "SharePoint",
"helpText": "",
"helpText": "Sets the retenton period for deleted users OneDrive to 1 year/365 days",
"addedComponent": null,
"label": "Retain a deleted user OneDrive for 1 year"
},
{
"name": "standards.DisableUserSiteCreate",
"cat": "SharePoint",
"helpText": "",
"helpText": "Disables users from creating new SharePoint sites",
"addedComponent": null,
"label": "Disable site creation by standard users"
},
Expand Down
6 changes: 3 additions & 3 deletions src/views/cipp/CIPPSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ const GeneralSettings = () => {
documentation on how to add permissions{' '}
<a
target="_blank"
href="https://cipp.app/docs/user/gettingstarted/permissions/#manual-sam-setup"
href="https://docs.cipp.app/setup/installation/permissions#manual-permissions"
>
here
</a>
Expand Down Expand Up @@ -452,13 +452,13 @@ const GeneralSettings = () => {
<>
<TableModalButton
className="me-3"
data={permissionsResult.data.Results?.Memberships.filter(
data={permissionsResult.data.Results?.Memberships?.filter(
(p) => p['@odata.type'] == '#microsoft.graph.group',
)}
title="Groups"
/>
<TableModalButton
data={permissionsResult.data.Results?.Memberships.filter(
data={permissionsResult.data.Results?.Memberships?.filter(
(p) => p['@odata.type'] == '#microsoft.graph.directoryRole',
)}
title="Roles"
Expand Down
4 changes: 3 additions & 1 deletion src/views/endpoint/intune/MEMAddPolicy.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ const AddPolicy = () => {
<h3 className="text-primary">Step 2</h3>
<h5 className="card-title mb-4">
Enter the raw JSON for this policy. See{' '}
<a href="https://cipp.app/EndpointManagement/IntunePolicyTemplates">this</a> for more
<a href="https://docs.cipp.app/user-documentation/endpoint/mem/add-policy-template">
this
</a>{' '}
information.
</h5>
</center>
Expand Down
2 changes: 1 addition & 1 deletion src/views/identity/administration/UserActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function UserActions({ tenantDomain, userId, userEmail, className
}

const editLink = `/identity/administration/users/edit?tenantDomain=${tenantDomain}&userId=${userId}`
const editMailboxLink = `/email/administration/edit-mailbox-permissions?tenantDomain=${tenantDomain}&userId=${userId}`
const editMailboxLink = `/email/administration/edit-mailbox-permissions?tenantDomain=${tenantDomain}&userId=${userEmail}`

const actions = [
{
Expand Down
6 changes: 1 addition & 5 deletions src/views/tenant/administration/GDAPWizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ const GDAPWizard = () => {
<hr className="my-4" />
<CCallout color="info">
The GDAP migration tool requires setup. Please check the documentation{' '}
<a
className="mb-2"
href="https://cipp.app/docs/user/usingcipp/GDAP/migration/"
target="_blank"
>
<a className="mb-2" href="https://docs.cipp.app/setup/gdap/index" target="_blank">
here.
</a>
<br /> <br />
Expand Down
23 changes: 21 additions & 2 deletions src/views/tenant/administration/ListGDAPRelationships.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,17 @@ const GDAPRelationships = () => {
exportSelector: 'endDateTime',
cell: (row) => (row['autoExtendDuration'] === 'PT0S' ? 'No' : 'Yes'),
},
{
name: 'Includes CA Role',
selector: (row) => row?.accessDetails,
sortable: true,
cell: (row) =>
row?.accessDetails?.unifiedRoles?.filter(
(e) => e.roleDefinitionId === '62e90394-69f5-4237-9190-012177145e10',
).length > 0
? 'Yes'
: 'No',
},
{
name: 'Actions',
cell: Actions,
Expand All @@ -178,9 +189,17 @@ const GDAPRelationships = () => {
tenantSelector={false}
datatable={{
filterlist: [
{ filterName: 'Active Relationships', filter: '"status":"active"' },
{ filterName: 'Terminated Relationships', filter: '"status":"Terminated"' },
{ filterName: 'Active Relationships', filter: 'Complex: status eq active' },
{ filterName: 'Terminated Relationships', filter: 'Complex: status eq terminated' },
{ filterName: 'Pending Relationships', filter: 'Pending' },
{
filterName: 'Active with Auto Extend',
filter: 'Complex: status eq active; autoExtendDuration ne PT0S',
},
{
filterName: 'Active without Auto Extend',
filter: 'Complex: status eq active; autoExtendDuration eq PT0S',
},
],
tableProps: {
selectableRows: true,
Expand Down
2 changes: 1 addition & 1 deletion src/views/tenant/standards/ApplyStandard.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const ApplyStandard = () => {
>
<CCallout color="danger">
Ensure you read{' '}
<a href="https://cipp.app/docs/user/usingcipp/tenantadministration/standards/#meet-the-standards">
<a href="https://docs.cipp.app/user-documentation/tenant/standards/apply-standard">
the documentation fully
</a>{' '}
before proceeding with this wizard. Some of the changes cannot be reverted by CIPP.
Expand Down
2 changes: 1 addition & 1 deletion src/views/tenant/standards/ListAppliedStandards.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ const ListAppliedStandards = () => {
name: template.name,
}))}
placeholder="Select a template"
label="Choose your Transport Rule templates to apply"
label="Choose your Exchange Connector templates to apply"
/>
)}
</Condition>
Expand Down