Skip to content

[pull] dev from KelvinTegelaar:dev #66

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

Merged
merged 36 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
608f3c2
Merge pull request #2534 from KelvinTegelaar/dev
KelvinTegelaar Jun 7, 2024
4269a2c
Merge pull request #2557 from KelvinTegelaar/dev
KelvinTegelaar Jun 14, 2024
3acfdb1
Merge pull request #2592 from KelvinTegelaar/dev
KelvinTegelaar Jun 24, 2024
6224b50
Merge pull request #2605 from KelvinTegelaar/dev
KelvinTegelaar Jun 26, 2024
3a763c8
Merge pull request #2646 from KelvinTegelaar/dev
KelvinTegelaar Jul 9, 2024
961f085
Merge pull request #2649 from KelvinTegelaar/dev
JohnDuprey Jul 9, 2024
498e5ec
Merge pull request #2657 from KelvinTegelaar/dev
JohnDuprey Jul 11, 2024
1502bc3
Merge pull request #2707 from KelvinTegelaar/dev
KelvinTegelaar Jul 19, 2024
1d02056
Merge pull request #2735 from KelvinTegelaar/dev
JohnDuprey Jul 26, 2024
8db8c70
Merge pull request #2764 from KelvinTegelaar/dev
KelvinTegelaar Aug 2, 2024
275641e
fix titlebutton link
JohnDuprey Aug 5, 2024
39e5cbb
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 7, 2024
6fdd68b
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 8, 2024
6a77f2b
Add confirmation dialog to save standards
JohnDuprey Aug 8, 2024
5739fc4
fix link
JohnDuprey Aug 8, 2024
681c8ff
Merge pull request #2789 from JohnDuprey/dev
JohnDuprey Aug 8, 2024
28a551d
Up version
JohnDuprey Aug 8, 2024
80257c2
Merge pull request #2790 from JohnDuprey/dev
JohnDuprey Aug 8, 2024
c7086e0
Merge pull request #2791 from KelvinTegelaar/dev
JohnDuprey Aug 8, 2024
1e89c98
add missing country codes
rdkempt Aug 9, 2024
dee4761
Merge pull request #2792 from rdkempt/main
KelvinTegelaar Aug 9, 2024
c7f2a34
Merge pull request #2787 from kris6673/dev
KelvinTegelaar Aug 9, 2024
e08e875
Update standards.json - fixed typo
isgq-github01 Aug 11, 2024
b73ddd1
Merge pull request #2801 from isgq-github01/patch-1
KelvinTegelaar Aug 12, 2024
7ee823b
Up version
JohnDuprey Aug 12, 2024
38e9982
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 12, 2024
e0d3b5f
Merge pull request #2806 from JohnDuprey/dev
JohnDuprey Aug 12, 2024
aff9148
Add processor function support
JohnDuprey Aug 14, 2024
a7308f4
Add extension call to action support
JohnDuprey Aug 14, 2024
2cc024f
CIPP-SAM API Permissions
JohnDuprey Aug 14, 2024
0be696c
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Aug 14, 2024
135facb
Merge pull request #2813 from JohnDuprey/dev
JohnDuprey Aug 14, 2024
edf1178
Handle default permission objects
JohnDuprey Aug 14, 2024
197c6a5
remove permissions when SP is deleted
JohnDuprey Aug 14, 2024
630e4e1
Update CippAppPermissionBuilder.jsx
JohnDuprey Aug 14, 2024
9ccd7f1
Merge pull request #2814 from JohnDuprey/dev
JohnDuprey Aug 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Tools/Start-CippDevEmulators.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
Write-Host "Starting CIPP Dev Emulators"
Write-Host 'Starting CIPP Dev Emulators'
Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
$Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa

$Process = Read-Host -Prompt 'Start Process Function (y/N)?'

if ($Process -eq 'y') {
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa`; new-tab --title 'CIPP-API-Processor' -d $Path\CIPP-API-Processor pwsh -c func start --port 7072
} else {
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
}

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "6.2.0",
"version": "6.2.2",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.2.0
6.2.2
4 changes: 2 additions & 2 deletions src/components/contentcards/CippButtonCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function CippButtonCard({
titleType = 'normal',
CardButton,
children,
isFetching,
isFetching = false,
className = 'h-100',
}) {
return (
Expand All @@ -32,6 +32,6 @@ CippButtonCard.propTypes = {
titleType: PropTypes.string,
CardButton: PropTypes.element.isRequired,
children: PropTypes.element.isRequired,
isFetching: PropTypes.bool.isRequired,
isFetching: PropTypes.bool,
className: PropTypes.string,
}
6 changes: 5 additions & 1 deletion src/components/forms/RFFComponents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ export const RFFSelectSearch = ({
retainInput = true,
isLoading = false,
allowCreate = false,
onCreateOption,
refreshFunction,
...props
}) => {
Expand Down Expand Up @@ -589,7 +590,7 @@ export const RFFSelectSearch = ({
)}
</CFormLabel>
{allowCreate ? (
<Creatable {...selectProps} isClearable={true} />
<Creatable {...selectProps} isClearable={true} onCreateOption={onCreateOption} />
) : (
<Select {...selectProps} isClearable={!onChange} />
)}
Expand All @@ -612,6 +613,9 @@ RFFSelectSearch.propTypes = {
onInputChange: PropTypes.func,
isLoading: PropTypes.bool,
refreshFunction: PropTypes.func,
allowCreate: PropTypes.bool,
onCreateOption: PropTypes.func,
retainInput: PropTypes.bool,
values: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.string, name: PropTypes.string }))
.isRequired,
}
12 changes: 10 additions & 2 deletions src/components/tables/CellGenericFormat.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ function nocolour(iscolourless, content) {
export function CellTip(cell, overflow = false) {
return (
<CTooltip content={String(cell)}>
<div className="celltip-content-nowrap">{String(cell)}</div>
{overflow ? (
<div className="celltip-content">{String(cell)}</div>
) : (
<div className="celltip-content-nowrap">{String(cell)}</div>
)}
</CTooltip>
)
}

export const cellGenericFormatter =
({ warning = false, reverse = false, colourless = true, noDataIsFalse } = {}) =>
({ warning = false, reverse = false, colourless = true, noDataIsFalse, wrap = false } = {}) =>
// eslint-disable-next-line react/display-name
(row, index, column, id) => {
const cell = column.selector(row)
Expand All @@ -51,6 +55,10 @@ export const cellGenericFormatter =
</a>
)
}

if (wrap) {
return CellTip(cell, true)
}
return CellTip(cell)
}
if (typeof cell === 'number') {
Expand Down
4 changes: 2 additions & 2 deletions src/components/tables/CellTip.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ export const CellTipButton = (value, display) => {
)
}

export const CellTip = (value, overflow = false) => {
export const CellTip = (value, wrap = false) => {
if (!value) {
return <div />
}
if (!overflow) {
if (!wrap) {
return (
<CTooltip content={value}>
<div className="celltip-content-nowrap">{String(value)}</div>
Expand Down
Loading