diff --git a/Deployment/appPackage/manifest.json b/Deployment/appPackage/manifest.json index 038261b..8dcdb40 100644 --- a/Deployment/appPackage/manifest.json +++ b/Deployment/appPackage/manifest.json @@ -1,7 +1,7 @@ { "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.11/MicrosoftTeams.schema.json", "manifestVersion": "1.11", - "version": "0.5", + "version": "0.5.1", "id": "bef61400-db9b-41d4-a617-403deb7bbe77", "packageName": "com.microsoft.teams.extension", "developer": { diff --git a/Deployment/provisioning/EOC-Provision.ps1 b/Deployment/provisioning/EOC-Provision.ps1 index c894ae8..3c83215 100644 --- a/Deployment/provisioning/EOC-Provision.ps1 +++ b/Deployment/provisioning/EOC-Provision.ps1 @@ -1,7 +1,6 @@ param([string]$AdminEmail, [string]$TenantName) - $FilePath = Read-Host "Please enter site template XML schema file path"; $FilePath = $FilePath.Trim(); @@ -29,30 +28,31 @@ $EOCSiteURL = "/sites/TEOCSite" Connect-PnPOnline -Url $TenantURL -Interactive try { - Write-Host "Checking if site already exists at $EOCSiteURL" - $site = Get-PnPTenantSite -Url $TenantURL$EOCSiteURL -ErrorAction SilentlyContinue -} -catch{ - -} - -if ($site -ne $null) -{ - Write-Host "Site already exists, exiting the PowerShell script" - return; -} -else -{ - Write-Host "Site doesn't exist, creating new site at $EOCSiteURL" -} + Write-Host "Checking if site already exists at $EOCSiteURL" + $site = Get-PnPTenantSite -Url $TenantURL$EOCSiteURL -ErrorAction SilentlyContinue -New-PnPSite -Type TeamSiteWithoutMicrosoft365Group -Title TEOC -Url $TenantURL$EOCSiteURL -Owner $AdminEmail + if ($site -ne $null) + { + Write-Host "Site already exists, exiting the PowerShell script" + return; + } + else + { + Write-Host "Site doesn't exist, creating new site at $EOCSiteURL" + } -Connect-PnPOnline -Url $TenantURL$EOCSiteURL -Interactive + New-PnPSite -Type TeamSiteWithoutMicrosoft365Group -Title TEOC -Url $TenantURL$EOCSiteURL -Owner $AdminEmail -ErrorAction Stop -WarningAction SilentlyContinue -Write-Host "Creating lists in the EOC site" + Connect-PnPOnline -Url $TenantURL$EOCSiteURL -Interactive -Invoke-PnPSiteTemplate -Path $FilePath + Write-Host "Creating lists in TEOC site" -Write-Host "EOC App Provision complete." + Invoke-PnPSiteTemplate -Path $FilePath -ErrorAction Stop -WarningAction SilentlyContinue + + Write-Host "TEOC App Provision complete." +} +catch{ + Write-Host "`nError Message: " $_.Exception.Message + Write-Host "`nTEOC App Provisioning failed." +} diff --git a/EOC-TeamsFx/tabs/src/assets/Images/Manage Incident Types.svg b/EOC-TeamsFx/tabs/src/assets/Images/Manage Incident Types.svg new file mode 100644 index 0000000..07d5c0a --- /dev/null +++ b/EOC-TeamsFx/tabs/src/assets/Images/Manage Incident Types.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/EOC-TeamsFx/tabs/src/assets/Images/Manage Roles.svg b/EOC-TeamsFx/tabs/src/assets/Images/Manage Roles.svg new file mode 100644 index 0000000..4a98d1e --- /dev/null +++ b/EOC-TeamsFx/tabs/src/assets/Images/Manage Roles.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/EOC-TeamsFx/tabs/src/common/graphConfig.ts b/EOC-TeamsFx/tabs/src/common/graphConfig.ts index 9a02b57..8d9f701 100644 --- a/EOC-TeamsFx/tabs/src/common/graphConfig.ts +++ b/EOC-TeamsFx/tabs/src/common/graphConfig.ts @@ -15,7 +15,7 @@ export const listsGraphEndpoint = "/lists"; export const columnsGraphEndpoint = "/columns"; export const usersGraphEndpoint = "https://graph.microsoft.com/v1.0/users/"; export const teamsAppsGraphEndpoint = "https://graph.microsoft.com/v1.0/appCatalogs/teamsApps/"; -export const newsTabTeamsAppIdGraphEndpoint = "https://graph.microsoft.com/v1.0/appCatalogs/teamsApps/0ae35b36-0fd7-422e-805b-d53af1579093"; +export const newsTabTeamsAppIdGraphEndpoint = "https://graph.microsoft.com/v1.0/appCatalogs/teamsApps/2a527703-1f6f-4559-a332-d8a7d288cd88"; export const assessmentTabTeamsAppIdGraphEndpoint = "https://graph.microsoft.com/v1.0/appCatalogs/teamsApps/2a527703-1f6f-4559-a332-d8a7d288cd88"; export const allAppsGraphEndpoint = "/appCatalogs/teamsApps?$filter=distributionMethod eq 'organization'"; export const betaGraphEndpoint = "https://graph.microsoft.com/beta/teams/"; diff --git a/EOC-TeamsFx/tabs/src/components/Dashboard.tsx b/EOC-TeamsFx/tabs/src/components/Dashboard.tsx index e479a12..740f2c4 100644 --- a/EOC-TeamsFx/tabs/src/components/Dashboard.tsx +++ b/EOC-TeamsFx/tabs/src/components/Dashboard.tsx @@ -322,6 +322,18 @@ class Dashboard extends React.PureComponent { successIndicator={false} /> +
+ + Manage Roles + Manage Roles + +
+
+ + Manage Incident Types + Manage Incident Types + +