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

Formatting #2859

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Formatting #2859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c476963
Update AzureDeploymentTemplate.json
OwenIbarra Aug 27, 2024
2173e51
Update AzureDeploymentTemplate_regionoptions.json
OwenIbarra Aug 27, 2024
b72a4e7
Update DevAzureDeploymentTemplate.json
OwenIbarra Aug 27, 2024
1c4d5dd
Update DevAzureDeploymentTemplate_regionoptions.json
OwenIbarra Aug 27, 2024
6083434
Update SettingsExtensionMappings.jsx
OwenIbarra Aug 27, 2024
43491ff
Typo
OwenIbarra Aug 28, 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
2 changes: 1 addition & 1 deletion deployment/AzureDeploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
6 changes: 3 additions & 3 deletions deployment/AzureDeploymentTemplate_regionoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPP",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"GithubRepository": {
Expand All @@ -20,7 +20,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down Expand Up @@ -197,7 +197,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
6 changes: 3 additions & 3 deletions deployment/DevAzureDeploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPPDev",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"TenantID": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down Expand Up @@ -250,7 +250,7 @@
"name": "[variables('funcStorageName')]",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "funStorageName"
"displayName": "funcStorageName"
},
"sku": {
"name": "Standard_LRS"
Expand Down
4 changes: 2 additions & 2 deletions deployment/DevAzureDeploymentTemplate_regionoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultValue": "CIPP",
"type": "string",
"metadata": {
"description": "Name use as base-template to named the resources deployed in Azure."
"description": "Name used as base-template to name the resources deployed in Azure."
}
},
"TenantID": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"defaultValue": "GeneratedPassword",
"type": "string",
"metadata": {
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
"description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
}
},
"GithubAPIRepository": {
Expand Down
8 changes: 4 additions & 4 deletions src/views/cipp/app-settings/SettingsExtensionMappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export function SettingsExtensionMappings({ type }) {
</>
)
}
const halocolumns = [
const haloColumns = [
{
name: 'Tenant',
selector: (row) => row.Tenant?.displayName,
Expand Down Expand Up @@ -205,7 +205,7 @@ export function SettingsExtensionMappings({ type }) {
},
]

const ninjacolumns = [
const ninjaColumns = [
{
name: 'Tenant',
selector: (row) => row.Tenant?.displayName,
Expand Down Expand Up @@ -286,7 +286,7 @@ export function SettingsExtensionMappings({ type }) {
<CippTable
showFilter={true}
reportName="none"
columns={halocolumns}
columns={haloColumns}
data={haloMappingsArray}
isModal={true}
/>
Expand Down Expand Up @@ -439,7 +439,7 @@ export function SettingsExtensionMappings({ type }) {
<CippTable
showFilter={true}
reportName="none"
columns={ninjacolumns}
columns={ninjaColumns}
data={ninjaMappingsArray}
isModal={true}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/views/endpoint/applications/ApplicationsAddRMM.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ const AddRMM = () => {
<RFFCFormInput
type="text"
name="customGroup"
label="Custom Group Names seperated by comma. Wildcards (*) are allowed"
label="Custom Group Names separated by comma. Wildcards (*) are allowed"
/>
</Condition>
</CForm>
Expand Down
Loading