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.

Sign up for GitHub

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 #101

Merged
merged 3 commits into from
Feb 13, 2025
Merged

[pull] dev from KelvinTegelaar:dev #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4099b2b
remove beta link
JohnDuprey Feb 13, 2025
d80c64f
fix table width
JohnDuprey Feb 13, 2025
e53ac48
add role assignments to arm
JohnDuprey Feb 13, 2025
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
13 changes: 13 additions & 0 deletions deployment/AzureDeploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@
"functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]",
"functionAppRegion": "[resourceGroup().location]"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]",
"dependsOn": [
"[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
],
"properties": {
"roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]",
"principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
"scope": "[resourceGroup().id]"
}
}
],
"outputs": {}
Expand Down
13 changes: 13 additions & 0 deletions deployment/AzureDeploymentTemplate_regionoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@
"functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]",
"functionAppRegion": "[resourceGroup().location]"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]",
"dependsOn": [
"[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
],
"properties": {
"roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]",
"principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
"scope": "[resourceGroup().id]"
}
}
],
"outputs": {}
Expand Down
6 changes: 1 addition & 5 deletions src/data/Extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
"helpText": "This integration allows you to manage your CSP licensing from CIPP. Purchase new licenses while adding or editing users in CIPP. Not a Sherweb partner? Sign up for the Sherweb Cloud Services for MSPs program.",
"mappingRequired": true,
"links": [
{
"name": "Register for beta",
"url": "https://go.cyberdrain.com/sherweb"
},
{
"name": "Sherweb Cloud Services for MSPs",
"url": "https://info.sherweb.com/sherweb-cloud-services-for-msps"
Expand Down Expand Up @@ -495,7 +491,7 @@
"label": "Enable Integration"
},
{
"type": "password",
"type": "textField",
"name": "CFZTNA.ClientID",
"label": "CloudFlare Tunnel Service Account Client ID"
},
Expand Down
4 changes: 2 additions & 2 deletions src/pages/cipp/advanced/table-maintenance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,15 @@ const Page = () => {
};

return (
<Container maxWidth="xl" sx={{ mt: 4 }}>
<Container maxWidth={false} sx={{ mt: 4, width: "100%" }}>
<Typography variant="h4" gutterBottom>
{pageTitle}
</Typography>
<Alert severity="warning" sx={{ mb: 2 }}>
This page allows you to view and manage data in Azure Tables. This is advanced functionality
that should only be used when directed by CyberDrain support.
</Alert>
<Grid container spacing={2}>
<Grid sx={{ flexGrow: 1, display: "flex" }} container spacing={2}>
<Grid item size={3}>
<CippPropertyListCard
title="Tables"
Expand Down