Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,14 @@ protected enum KeyValueType

protected static void ValidateKeysFormat(StringValues keys)
{
foreach (var key in keys)
foreach (var key in keys.Where(k => string.IsNullOrWhiteSpace(k)))
{
if (string.IsNullOrWhiteSpace(key))
{
throw new UserFriendlyException("There are empty Keys captured which are required");
}
throw new UserFriendlyException("There are empty Keys captured which are required");
}

if (!IsValidInput(key))
{
throw new UserFriendlyException("The following characters are allowed for Keys: " + validInputPattern);
}
foreach (var key in keys.Where(k => !string.IsNullOrWhiteSpace(k) && !IsValidInput(k)))
{
throw new UserFriendlyException("The following characters are allowed for Keys: " + validInputPattern);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,18 +316,18 @@ internal static ReportColumnsMap CreateNewMap(UpsertReportColumnsMapDto upsertRe

// Generate column names for fields without user-provided mappings
// For formversion provider, use Key (CHEFS Property Name) as the source; for others, use Label
var autoGeneratedColumnNames = new Dictionary<string, string>();
foreach (var field in fieldsMap.Fields)
{
if (!userProvidedMappings.ContainsKey(field.Path))
{
var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider);
var sanitizedName = SanitizeColumnName(columnNameSource);
var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames);
autoGeneratedColumnNames[field.Path] = uniqueName;
usedColumnNames.Add(uniqueName);
}
}
var autoGeneratedColumnNames = fieldsMap.Fields
.Where(field => !userProvidedMappings.ContainsKey(field.Path))
.ToDictionary(
field => field.Path,
field => {
var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider);
var sanitizedName = SanitizeColumnName(columnNameSource);
var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames);
usedColumnNames.Add(uniqueName);
return uniqueName;
}
);

// Create mapping rows
var mapRows = fieldsMap.Fields.Select(field =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
if (CurrentUser.IsAuthenticated && CurrentUser.FindClaimValue("has_multiple_tenants") == "true")
isAuthorizedForTenantSwitch = true;

bool isAuthorizedForPaymentConfiguration = await PermissionChecker.IsGrantedAsync("SettingManagement.ConfigurePayments");
}
<abp-dropdown id="user-dropdown">
<abp-dropdown-button class="btn-dropdown" text="@CurrentTenant.Name" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Text.Json;
using System.Threading.Tasks;
using Unity.GrantManager.Applications;
using Unity.GrantManager.GrantApplications;
using Unity.GrantManager.Intakes;
using Unity.Modules.Shared;
Expand All @@ -14,15 +13,15 @@

public interface IApplicantAppService : IApplicationService
{
Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intakeMap, Guid applicationId);

Check failure on line 16 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 16 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 16 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 16 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 16 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)
Task<ApplicantAgent> CreateApplicantAgentAsync(ApplicantAgentDto applicantAgentDto);

Check failure on line 17 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'ApplicantAgent' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 17 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'ApplicantAgent' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 17 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'ApplicantAgent' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 17 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'ApplicantAgent' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 17 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'ApplicantAgent' could not be found (are you missing a using directive or an assembly reference?)
Task<Applicant> RelateSupplierToApplicant(ApplicantSupplierEto applicantSupplierEto);

Check failure on line 18 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 18 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 18 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 18 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 18 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)
Task RelateDefaultSupplierAsync(ApplicantAgentDto applicantAgentDto);
Task<Applicant> UpdateApplicantOrgMatchAsync(Applicant applicant);

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 20 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)
Task<int> GetNextUnityApplicantIdAsync();
Task<bool> IsUnityApplicantIdAvailableAsync(string unityApplicantId, Guid currentApplicantId);
Task<JsonDocument> GetApplicantLookUpAutocompleteQueryAsync(string? applicantLookUpQuery);
Task<PagedResultDto<ApplicantListDto>> GetListAsync(ApplicantListRequestDto input);
Task<Applicant> PartialUpdateApplicantSummaryAsync(Guid applicantId, PartialUpdateDto<UpdateApplicantSummaryDto> input);

Check failure on line 25 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Applicat...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 25 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Unity.GrantManage...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 25 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.Gra...

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 25 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / test-project (applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Unity....

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 25 in applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

View workflow job for this annotation

GitHub Actions / SonarCloud

The type or namespace name 'Applicant' could not be found (are you missing a using directive or an assembly reference?)
Task UpdateApplicantContactAddressesAsync(Guid applicantId, UpdateApplicantContactAddressesDto input);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using Unity.Flex.Scoresheets.Enums;
using Unity.Flex.Scoresheets.Events;
using Unity.Flex.Worksheets.Definitions;
using Unity.GrantManager.Applications;
using Unity.GrantManager.Comments;
using Unity.GrantManager.Exceptions;
using Unity.GrantManager.Workflow;
Expand Down
Loading