diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b11591743..a48cc11fc5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,6 +78,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.Account.Api' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerAccounts.Api' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerAccounts.Api.zip' @@ -94,6 +95,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EmployerAccounts.Web' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerAccounts.Web' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerAccounts.Web.zip' @@ -110,6 +112,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EmployerAccounts.Host' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerAccounts.Host' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerAccounts.Host.zip' @@ -126,6 +129,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EmployerFinance.Api' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerFinance.Api' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerFinance.Api.zip' @@ -142,6 +146,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EmployerFinance.Web' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerFinance.Web' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerFinance.Web.zip' @@ -158,6 +163,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EmployerFinance.Host' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EmployerFinance.Host' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EmployerFinance.Host.zip' @@ -174,6 +180,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EAS.Account.Api' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EAS.Account.Api' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EAS.Account.Api.zip' @@ -190,6 +197,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EAS.Web' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EAS.Web' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EAS.Web.zip' @@ -206,6 +214,7 @@ steps: - task: ArchiveFiles@2 displayName: 'Archive SFA.DAS.EAS.Support.Web' inputs: + includeRootFolder: false rootFolderOrFile: '$(build.artifactstagingdirectory)/SFA.DAS.EAS.Support.Web' archiveFile: '$(Build.ArtifactStagingDirectory)/publish/SFA.DAS.EAS.Support.Web.zip' diff --git a/azure/finance.template.json b/azure/finance.template.json index e70ea3bef4..450b36c217 100644 --- a/azure/finance.template.json +++ b/azure/finance.template.json @@ -70,9 +70,11 @@ "sharedApimName": { "type": "string" }, - "appServiceAllowedIPs": { - "type": "array", - "defaultValue": [] + "backEndAccessRestrictions": { + "type": "array" + }, + "frontEndAccessRestrictions": { + "type": "array" }, "sharedSQLServerName": { "type": "string" @@ -269,7 +271,7 @@ "value": "[if(greater(length(parameters('uiCustomHostname')), 0), reference('ui-app-service-certificate', '2018-11-01').outputs.certificateThumbprint.value, '')]" }, "ipSecurityRestrictions": { - "value": "[parameters('appServiceAllowedIPs')]" + "value": "[parameters('frontEndAccessRestrictions')]" } } } @@ -379,7 +381,7 @@ "value": "[if(greater(length(parameters('apiCustomHostname')), 0), reference('api-app-service-certificate', '2018-11-01').outputs.certificateThumbprint.value, '')]" }, "ipSecurityRestrictions": { - "value": "[parameters('appServiceAllowedIPs')]" + "value": "[parameters('backEndAccessRestrictions')]" } } } diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/SearchOrganisation/SearchForOrganisationResults.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/SearchOrganisation/SearchForOrganisationResults.cshtml index 985f1423c4..428da77936 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/SearchOrganisation/SearchForOrganisationResults.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/SearchOrganisation/SearchForOrganisationResults.cshtml @@ -18,85 +18,83 @@

@ViewBag.Title

-
- -
- -

Filter results

-
-
-
- -

- Filter by Organisation type -

-
-
-
- - -
-
- - -
-
- - -
-
- - +
+
+

Filter results

+
+
+
+ +

+ Filter by Organisation type +

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
-
-
-
-
@if (Model.Data.Results.Data != null) { -
    - +

    @(Model.Data?.Results.TotalResults ?? 0) results found

    +
    +
    +
      @foreach (var organisation in Model.Data.Results.Data) { if (!organisation.AddedToAccount) { -
    1. +
    2. @@ -104,27 +102,29 @@ - +

      + +

      -
      -
      Address
      -
      @(string.IsNullOrEmpty(organisation.Address) ? "No address supplied" : organisation.Address)
      -
      Type
      -
      @organisation.Type.GetDescription()
      +
      +
      Address
      +
      @(string.IsNullOrEmpty(organisation.Address) ? "No address supplied" : organisation.Address)
      +
      Type
      +
      @organisation.Type.GetDescription()
    3. } else { -
    4. -

      @organisation.Name

      -
      -
      Address
      -
      @(string.IsNullOrEmpty(organisation.Address) ? "No address supplied" : organisation.Address)
      -
      Type
      -
      @organisation.Type.GetDescription()
      +
    5. +

      @organisation.Name

      +
      +
      Address
      +
      @(string.IsNullOrEmpty(organisation.Address) ? "No address supplied" : organisation.Address)
      +
      Type
      +
      @organisation.Type.GetDescription()
      -

      +

      Already added - view my organisations

    6. @@ -132,40 +132,42 @@ } @if (Model.Data.Results.PageNumber == Model.Data.Results.TotalPages || Model.Data.Results.TotalPages == 0) { -
    7. - Can't find your organisation?
      Check the spelling and search again. +
    8. +

      Can't find your organisation?

      +

      Check the spelling and search again.

    9. } - -
+ +
} else { - +

No results found.

+

Can't find your organisation?

+

Check the spelling and search again.

} + +
-