Fix the duplicates and revert the unique checking (#3458)

Co-authored-by: sima-zhu <sizhu@microsoft.com>
This commit is contained in:
Azure SDK Bot 2022-03-22 10:38:56 -07:00 committed by GitHub
parent 183db457fd
commit aa1751f3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -90,17 +90,6 @@ function GetPackageLookup($packageList) {
Write-Host "Found more than one package entry for $($pkg.Package) selecting the first non-hidden one."
}
}
if ($pkg.PSObject.Members.Name -contains "GroupId" -and ($pkg.New -eq "true") -and $pkg.Package) {
$pkgKey = $pkg.Package
if (!$packageLookup.ContainsKey($pkgKey)) {
$packageLookup[$pkgKey] = $pkg
}
else {
$packageValue = $packageLookup[$pkgKey]
Write-Host "Found more than one package entry for $($packageValue.Package) selecting the first one with groupId $($packageValue.GroupId), skipping $($pkg.GroupId)"
}
}
}
return $packageLookup
@ -116,7 +105,7 @@ $onboardedPackages = &$GetOnboardedDocsMsPackagesFn `
$metadata = (Get-CSVMetadata).Where({
$_.Package `
-and $onboardedPackages.ContainsKey($_.Package) `
-and $_.Hide -ne 'true'
-and $_.Hide -ne 'true'
})
$fileMetadata = @()
@ -177,7 +166,6 @@ foreach ($package in $packagesForToc.Values) {
}
$serviceNameList = $services.Keys | Sort-Object
$toc = @()
foreach ($service in $serviceNameList) {
Write-Host "Building service: $service"
@ -186,14 +174,11 @@ foreach ($service in $serviceNameList) {
# Client packages get individual entries
$clientPackages = $packagesForToc.Values.Where({ $_.ServiceName -eq $service -and ('client' -eq $_.Type) })
$clientPackages = $clientPackages | Sort-Object 'Package', 'GroupId' | Get-Unique
if ($clientPackages) {
foreach ($clientPackage in $clientPackages) {
$packageItems += GetClientPackageNode -clientPackage $clientPackage
}
$clientPackages = $clientPackages | Sort-Object -Property Package
foreach ($clientPackage in $clientPackages) {
$packageItems += GetClientPackageNode -clientPackage $clientPackage
}
# All management packages go under a single `Management` header in the ToC
$mgmtPackages = $packagesForToc.Values.Where({ $_.ServiceName -eq $service -and ('mgmt' -eq $_.Type) })
$mgmtPackages = $mgmtPackages | Sort-Object -Property Package
@ -207,7 +192,7 @@ foreach ($service in $serviceNameList) {
# There could be multiple packages, ensure this is treated as an array
# even if it is a single package
children = @($children)
};
}
}
$uncategorizedPackages = $packagesForToc.Values.Where({ $_.ServiceName -eq $service -and !(@('client', 'mgmt') -contains $_.Type) })
@ -218,13 +203,13 @@ foreach ($service in $serviceNameList) {
}
$serviceReadmeBaseName = $service.ToLower().Replace(' ', '-')
$serviceTocEntry = [PSCustomObject]@{
name = $service;
href = "~/docs-ref-services/{moniker}/$serviceReadmeBaseName.md"
landingPageType = 'Service'
items = @($packageItems)
}
$toc += $serviceTocEntry
}
@ -286,7 +271,6 @@ if ($otherPackages) {
}
}
}
$toc += [PSCustomObject]@{
name = 'Other';
landingPageType = 'Service';