Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • Fix/xxxx-activateGitlab
  • Fix/xxxx-brokenTag
  • Heinrichs-main-patch-59520
  • Hotfix/2132-editingDeletingInclusion
  • Hotfix/2141-fileUploadErrors
  • Hotfix/2202-fixNaNQuota
  • Hotfix/2254-fixContentLenghtCalculation
  • Hotfix/2307-noLinkedTimeout
  • Hotfix/2313-fixModifiedDate
  • Hotfix/2346-fixPolicy
  • Hotfix/2371-fixGitLabinRCV
  • Hotfix/2428-savingRwthRdsS3
  • Hotfix/2452-linkedDeletion
  • Hotfix/2459-EncodingPath
  • Hotfix/xxxx-lock
  • Issue/1792-newMetadataStructure
  • Issue/1951-quotaImplementation
  • Issue/1999-gitlabResourcesLib
  • Issue/2000-gitlabResourcesAPI
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2102-gitLabResTypeRCV
  • Issue/2151-NamespaceRDSWorm
  • Issue/2155-ArchiveLinkedResource
  • Issue/2162-fixFolderResponse
  • Issue/2162-fixFolderResponsev2
  • Issue/2195-missingModifiedDate
  • Issue/2246-quotaResoval
  • Issue/2275-DocuGitlabResourceType
  • Issue/2278-gitlabToS
  • Issue/2279-gitlabMetaInformation
  • Issue/2309-docs
  • Issue/2326-supportedOrganizations
  • Issue/2328-noFailOnLog
  • Issue/2349-gitlabHttps
  • Issue/2414-resourceTypesAffilAndAllocQuota
  • Issue/2433-resourcesApi
  • Issue/2462-removeTraces
  • Issue/2464-invalidateMeta
  • Issue/2583-treeBug
  • Issue/2586-migrateBlob
  • Test/xxxx-enablingGitLab
  • Test/xxxx-usingPresignedForUL
  • dev
  • gitkeep
  • main
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v1.1.3
  • v1.1.4
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.11.0
  • v1.11.1
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.5.1
  • v1.5.2
  • v1.5.3
  • v1.5.4
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.7.1
  • v1.7.2
  • v1.7.3
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.8.3
  • v1.8.4
  • v1.8.5
  • v1.8.6
  • v1.8.7
  • v1.9.0
  • v1.9.1
  • v1.9.2
  • v1.9.3
  • v1.9.4
83 results

Target

Select target project
  • coscine/backend/libraries/resource-types
1 result
Select Git revision
  • Fix/xxxx-activateGitlab
  • Fix/xxxx-brokenTag
  • Heinrichs-main-patch-59520
  • Hotfix/2132-editingDeletingInclusion
  • Hotfix/2141-fileUploadErrors
  • Hotfix/2202-fixNaNQuota
  • Hotfix/2254-fixContentLenghtCalculation
  • Hotfix/2307-noLinkedTimeout
  • Hotfix/2313-fixModifiedDate
  • Hotfix/2346-fixPolicy
  • Hotfix/2371-fixGitLabinRCV
  • Hotfix/2428-savingRwthRdsS3
  • Hotfix/2452-linkedDeletion
  • Hotfix/2459-EncodingPath
  • Hotfix/xxxx-lock
  • Issue/1792-newMetadataStructure
  • Issue/1951-quotaImplementation
  • Issue/1999-gitlabResourcesLib
  • Issue/2000-gitlabResourcesAPI
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2102-gitLabResTypeRCV
  • Issue/2151-NamespaceRDSWorm
  • Issue/2155-ArchiveLinkedResource
  • Issue/2162-fixFolderResponse
  • Issue/2162-fixFolderResponsev2
  • Issue/2195-missingModifiedDate
  • Issue/2246-quotaResoval
  • Issue/2275-DocuGitlabResourceType
  • Issue/2278-gitlabToS
  • Issue/2279-gitlabMetaInformation
  • Issue/2309-docs
  • Issue/2326-supportedOrganizations
  • Issue/2328-noFailOnLog
  • Issue/2349-gitlabHttps
  • Issue/2414-resourceTypesAffilAndAllocQuota
  • Issue/2433-resourcesApi
  • Issue/2462-removeTraces
  • Issue/2464-invalidateMeta
  • Issue/2583-treeBug
  • Issue/2586-migrateBlob
  • Test/xxxx-enablingGitLab
  • Test/xxxx-usingPresignedForUL
  • dev
  • gitkeep
  • main
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v1.1.3
  • v1.1.4
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.11.0
  • v1.11.1
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.5.1
  • v1.5.2
  • v1.5.3
  • v1.5.4
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.7.1
  • v1.7.2
  • v1.7.3
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.8.3
  • v1.8.4
  • v1.8.5
  • v1.8.6
  • v1.8.7
  • v1.9.0
  • v1.9.1
  • v1.9.2
  • v1.9.3
  • v1.9.4
83 results
Show changes
Commits on Source (4)
...@@ -7,4 +7,5 @@ public class SpecificType ...@@ -7,4 +7,5 @@ public class SpecificType
public Config? Config { get; set; } public Config? Config { get; set; }
public Name? Name { get; set; } public Name? Name { get; set; }
public ResourceTypeStatus? Status { get; set; } public ResourceTypeStatus? Status { get; set; }
public List<string>? SupportedOrganizations { get; set; }
} }
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -646,7 +646,8 @@ public sealed class ResourceTypeFactory ...@@ -646,7 +646,8 @@ public sealed class ResourceTypeFactory
gitlabResourceTypeModel.Update(gitlabResourceType); gitlabResourceTypeModel.Update(gitlabResourceType);
} }
else else
{; {
;
var gitlabResourceType = new GitlabResourceType() var gitlabResourceType = new GitlabResourceType()
{ {
...@@ -777,8 +778,30 @@ public sealed class ResourceTypeFactory ...@@ -777,8 +778,30 @@ public sealed class ResourceTypeFactory
} }
} }
[Obsolete("GetResourceTypes() is deprecated, please use GetSpecificResourceTypes(ResourceTypeStatus status) instead.")]
public IEnumerable<string> GetResourceTypes() public IEnumerable<string> GetResourceTypes()
{ {
return _specificTypes.Where(x => x.Value.Status == ResourceTypeStatus.Active).Select(x => x.Key); return _specificTypes.Where(x => x.Value.Status == ResourceTypeStatus.Active).Select(x => x.Key);
} }
public IEnumerable<SpecificType> GetSpecificResourceTypes()
{
return _specificTypes.Select(x => x.Value);
}
public IEnumerable<SpecificType> GetSpecificResourceTypes(ResourceTypeStatus status)
{
return GetSpecificResourceTypes().Where(x => x.Status == status);
}
public IEnumerable<SpecificType> GetSpecificResourceTypes(string OrganizationRor)
{
return GetSpecificResourceTypes().Where(x => x.SupportedOrganizations is not null
&& (x.SupportedOrganizations.Contains(OrganizationRor) || x.SupportedOrganizations.Contains("*")));
}
public IEnumerable<SpecificType> GetSpecificResourceTypes(string OrganizationRor, ResourceTypeStatus status)
{
return GetSpecificResourceTypes(OrganizationRor).Where(x => x.Status == status);
}
} }
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Coscine.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
<AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName> <AssemblyName>Coscine.$(MSBuildProjectName)</AssemblyName>
<Version>1.8.4</Version> <Version>1.8.5</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
"de": "GitLab", "de": "GitLab",
"en": "GitLab" "en": "GitLab"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [ "*" ]
}, },
"linked": { "linked": {
"type": "linked", "type": "linked",
...@@ -15,7 +16,8 @@ ...@@ -15,7 +16,8 @@
"de": "Linked", "de": "Linked",
"en": "Linked" "en": "Linked"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [ "*" ]
}, },
"rdsrwth": { "rdsrwth": {
"type": "rds", "type": "rds",
...@@ -26,7 +28,11 @@ ...@@ -26,7 +28,11 @@
"de": "FDS", "de": "FDS",
"en": "RDS" "en": "RDS"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [
"https://ror.org/04xfq0f34",
"https://ror.org/04tqgg260"
]
}, },
"rdsude": { "rdsude": {
"type": "rds", "type": "rds",
...@@ -37,7 +43,8 @@ ...@@ -37,7 +43,8 @@
"de": "FDS UDE", "de": "FDS UDE",
"en": "RDS UDE" "en": "RDS UDE"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [ "https://ror.org/04mz5ra38" ]
}, },
"rdsnrw": { "rdsnrw": {
"type": "rds", "type": "rds",
...@@ -48,7 +55,21 @@ ...@@ -48,7 +55,21 @@
"de": "FDS NRW", "de": "FDS NRW",
"en": "RDS NRW" "en": "RDS NRW"
}, },
"status": "hidden" "status": "hidden",
"supportedOrganizations": [
"https://ror.org/00edvg943",
"https://ror.org/04x02q560",
"https://ror.org/03hj8rz96",
"https://ror.org/03dv91853",
"https://ror.org/00ftx0026",
"https://ror.org/04p7ekn23",
"https://ror.org/04wdt0z89",
"https://ror.org/014nnvj65",
"https://ror.org/04eka8j06",
"https://ror.org/02nkxrq89",
"https://ror.org/00pv45a02",
"https://ror.org/04m2anh63"
]
}, },
"rdstudo": { "rdstudo": {
"type": "rds", "type": "rds",
...@@ -59,7 +80,8 @@ ...@@ -59,7 +80,8 @@
"de": "FDS TUDo", "de": "FDS TUDo",
"en": "RDS TUDo" "en": "RDS TUDo"
}, },
"status": "hidden" "status": "hidden",
"supportedOrganizations": [ "https://ror.org/01k97gp34" ]
}, },
"rdss3rwth": { "rdss3rwth": {
"type": "rdss3", "type": "rdss3",
...@@ -71,7 +93,11 @@ ...@@ -71,7 +93,11 @@
"de": "FDS S3", "de": "FDS S3",
"en": "RDS S3" "en": "RDS S3"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [
"https://ror.org/04xfq0f34",
"https://ror.org/04tqgg260"
]
}, },
"rdss3ude": { "rdss3ude": {
"type": "rdss3", "type": "rdss3",
...@@ -83,7 +109,8 @@ ...@@ -83,7 +109,8 @@
"de": "FDS S3 UDE", "de": "FDS S3 UDE",
"en": "RDS S3 UDE" "en": "RDS S3 UDE"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [ "https://ror.org/04mz5ra38" ]
}, },
"rdss3nrw": { "rdss3nrw": {
"type": "rdss3", "type": "rdss3",
...@@ -95,7 +122,21 @@ ...@@ -95,7 +122,21 @@
"de": "FDS S3 NRW", "de": "FDS S3 NRW",
"en": "RDS S3 NRW" "en": "RDS S3 NRW"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [
"https://ror.org/00edvg943",
"https://ror.org/04x02q560",
"https://ror.org/03hj8rz96",
"https://ror.org/03dv91853",
"https://ror.org/00ftx0026",
"https://ror.org/04p7ekn23",
"https://ror.org/04wdt0z89",
"https://ror.org/014nnvj65",
"https://ror.org/04eka8j06",
"https://ror.org/02nkxrq89",
"https://ror.org/00pv45a02",
"https://ror.org/04m2anh63"
]
}, },
"rdss3tudo": { "rdss3tudo": {
"type": "rdss3", "type": "rdss3",
...@@ -108,7 +149,8 @@ ...@@ -108,7 +149,8 @@
"de": "FDS S3 TUDo", "de": "FDS S3 TUDo",
"en": "RDS S3 TUDo" "en": "RDS S3 TUDo"
}, },
"status": "hidden" "status": "hidden",
"supportedOrganizations": [ "https://ror.org/01k97gp34" ]
}, },
"rdss3wormrwth": { "rdss3wormrwth": {
"type": "rdss3", "type": "rdss3",
...@@ -121,6 +163,10 @@ ...@@ -121,6 +163,10 @@
"de": "FDS S3 Worm RWTH", "de": "FDS S3 Worm RWTH",
"en": "RDS S3 Worm RWTH" "en": "RDS S3 Worm RWTH"
}, },
"status": "active" "status": "active",
"supportedOrganizations": [
"https://ror.org/04xfq0f34",
"https://ror.org/04tqgg260"
]
} }
} }
\ No newline at end of file