From 287685f21e039d607f95272e479a388bed888878 Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Tue, 19 Sep 2023 15:46:04 +0200 Subject: [PATCH 01/14] Reset user interface when "-- Select classification --" is selected and ValuesetMustBeSelected is True --- .../VariableSelectorValueSelectCodebehind.vb | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb index 5c0b806e3..6dd2de5d8 100644 --- a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb +++ b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb @@ -1042,15 +1042,22 @@ Public Class VariableSelectorValueSelectCodebehind Friend Function ApplyGrouping(ByVal code As String, Optional ByVal clearSelection As Boolean = True, Optional ByVal include As Nullable(Of GroupingIncludesType) = Nothing) As Boolean Dim ok As Boolean = False - If (code.Equals("_RESTORE_") And Not (Marker.ValuesetMustBeSelectedFirst)) Then + If (code.Equals("_RESTORE_")) Then 'Code "_RESTORE_" means that the option --Select classification-- has been selected in the dropdown. 'This shall result in the values in the dropdown being restored to the initial ones. - 'Restore of values is performed by applying the valueset _ALL_. - Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo - vsInfo.ID = "_ALL_" - Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo) - Marker.SelectedGroupingPresentation = GroupingIncludesType.SingleValues - ok = True + + If (Marker.ValuesetMustBeSelectedFirst) Then + Marker.Variable.CurrentGrouping = Nothing + Marker.Variable.CurrentValueSet = Nothing + clearSelection = True + Else + 'Restore of values is performed by applying the valueset _ALL_. + Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo + vsInfo.ID = "_ALL_" + Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo) + Marker.SelectedGroupingPresentation = GroupingIncludesType.SingleValues + ok = True + End If ElseIf code.StartsWith("gr__") Then 'Apply grouping Dim grpInfo As PCAxis.Paxiom.GroupingInfo From a4980d81ff7162ecc18698d3c0e1b0da35062901 Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Tue, 19 Sep 2023 16:20:55 +0200 Subject: [PATCH 02/14] Updated CHANGES.txt --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 0d83e39db..f0dfcbec7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ === Release of PxWeb 2023 v1 === +- Fix for issue #344 (Classification does not get back to zero - ValuesetMustBeSelectedFirst) - Dcat file uses the organizations.json file to map between organization names and existing organization uris - Dcat admin tool and api-endpoint is now updated to allow for catalog titles and descriptions in multiple languages - Dcat admin tool settings are now saved separately for each database, in the corresponding database.config file From 80c24f3c6edac201d15b8eac19c9653add7e1a0f Mon Sep 17 00:00:00 2001 From: Maria Borg Date: Wed, 20 Sep 2023 10:48:59 +0200 Subject: [PATCH 03/14] Added filetype csv2 and csv3 to PCAxis.Web.Controls --- .../CommandBar/Plugin/Plugins.vb | 2 ++ .../EmbeddedResources/Config/FileConfig.xml | 30 +++++++++++++++- .../Csv/Csv2FileSerializerCreator.vb | 11 ++++++ .../FileTypes/Csv/Csv2FileType.ascx | 1 + .../FileTypes/Csv/Csv2FileType.vb | 28 +++++++++++++++ .../FileTypes/Csv/Csv2FileTypeCodebehind.vb | 12 +++++++ .../Csv/Csv3FileSerializerCreator.vb | 11 ++++++ .../FileTypes/Csv/Csv3FileType.ascx | 1 + .../FileTypes/Csv/Csv3FileType.vb | 28 +++++++++++++++ .../FileTypes/Csv/Csv3FileTypeCodebehind.vb | 11 ++++++ .../PCAxis.Web.Controls.vbproj | 35 +++++++++++++++---- PXWeb/Resources/Languages/pxlang.sv.xml | 2 ++ PXWeb/Resources/Languages/pxlang.xml | 15 ++++---- 13 files changed, 174 insertions(+), 13 deletions(-) create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv2FileSerializerCreator.vb create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.ascx create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv2FileTypeCodebehind.vb create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv3FileSerializerCreator.vb create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.ascx create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb create mode 100644 PCAxis.Web.Controls/FileTypes/Csv/Csv3FileTypeCodebehind.vb diff --git a/PCAxis.Web.Controls/CommandBar/Plugin/Plugins.vb b/PCAxis.Web.Controls/CommandBar/Plugin/Plugins.vb index d1c272d63..b9f7757ee 100644 --- a/PCAxis.Web.Controls/CommandBar/Plugin/Plugins.vb +++ b/PCAxis.Web.Controls/CommandBar/Plugin/Plugins.vb @@ -54,6 +54,8 @@ Public Const XLS_EXCEL As String = "FileTypeExcel" Public Const XLS_DOUBLE_COLUMN As String = "FileTypeExcelDoubleColumn" Public Const CSV As String = "csv" + Public Const CSV2 As String = "FileTypeCsv2" + Public Const CSV3 As String = "FileTypeCsv3" Public Const CSV_TABULATOR_WITH_HEADING As String = "FileTypeCsvWithHeadingAndTabulator" Public Const CSV_TABULATOR_WITHOUT_HEADING As String = "FileTypeCsvWithoutHeadingAndTabulator" Public Const CSV_COMMA_WITH_HEADING As String = "FileTypeCsvWithHeadingAndComma" diff --git a/PCAxis.Web.Controls/EmbeddedResources/Config/FileConfig.xml b/PCAxis.Web.Controls/EmbeddedResources/Config/FileConfig.xml index 22277eb9d..7bb12ddcd 100644 --- a/PCAxis.Web.Controls/EmbeddedResources/Config/FileConfig.xml +++ b/PCAxis.Web.Controls/EmbeddedResources/Config/FileConfig.xml @@ -52,7 +52,35 @@ xsi:schemaLocation="http://www.scb.se ../XSDSchemas/FileSchema.xsd"> button_save_as_csv.png small_button_csv.png - + + csv2 + PCAxis.Paxiom.Csv2FileSerializer, PCAxis.Core, Version=1.1.0.0 + PCAxis.Web.Controls.Csv2FileSerializerCreator, PCAxis.Web.Controls + + FileTypeCsv2 + + PCAxis.Web.Controls.Csv2FileType, PCAxis.Web.Controls, Version=1.1.0.0 + application/octet-stream + csv + ? + button_save_as_csv.png + small_button_csv.png + + + csv3 + PCAxis.Paxiom.Csv3FileSerializer, PCAxis.Core, Version=1.1.0.0 + PCAxis.Web.Controls.Csv3FileSerializerCreator, PCAxis.Web.Controls + + FileTypeCsv3 + + PCAxis.Web.Controls.Csv3FileType, PCAxis.Web.Controls, Version=1.1.0.0 + application/octet-stream + csv + ? + button_save_as_csv.png + small_button_csv.png + + html PCAxis.Paxiom.HtmlFileSerializer, PCAxis.Core, Version=1.1.0.0 PCAxis.Web.Controls.HtmlSerializerCreator, PCAxis.Web.Controls diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileSerializerCreator.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileSerializerCreator.vb new file mode 100644 index 000000000..e39f4ee66 --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileSerializerCreator.vb @@ -0,0 +1,11 @@ +Imports PCAxis.Paxiom +Imports PCAxis.Web.Core + +Public Class Csv2FileSerializerCreator + + Implements PCAxis.Web.Core.ISerializerCreator + + Public Function Create(fileInfo As String) As IPXModelStreamSerializer Implements ISerializerCreator.Create + Return New PCAxis.Paxiom.Csv2FileSerializer() + End Function +End Class diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.ascx b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.ascx new file mode 100644 index 000000000..8bc9c4c8d --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.ascx @@ -0,0 +1 @@ +<%@ control inherits="PCAxis.Web.Controls.Csv2FileTypeCodebehind" %> diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb new file mode 100644 index 000000000..0bf4d174a --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb @@ -0,0 +1,28 @@ +Imports System.Web.UI +Imports System.Web.UI.WebControls +Imports System.ComponentModel +Imports PCAxis.Web.Core +Imports PCAxis.Web.Core.Attributes +Imports PCAxis.Paxiom +Imports PCAxis.Web.Core.Management + + +''' +''' +''' +Partial Public Class Csv2FileType + Inherits FileTypeMarkerControlBase(Of Csv2FileTypeCodebehind, Csv2FileType) + + ''' + ''' Creates a html file and sends it to the user + ''' + ''' + Public Overrides Sub SerializeAndStream() + Using stream As IO.MemoryStream = New IO.MemoryStream() + Dim csv2FileSerializer As New Csv2FileSerializer + csv2FileSerializer.Serialize(PaxiomManager.PaxiomModel, stream) + StreamFile(stream, Me.SelectedFileType.MimeType, Me.SelectedFileType.FileExtension) + End Using + End Sub + +End Class diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileTypeCodebehind.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileTypeCodebehind.vb new file mode 100644 index 000000000..ded1f7fe9 --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileTypeCodebehind.vb @@ -0,0 +1,12 @@ +Imports PCAxis.Web.Core + + +Public Class Csv2FileTypeCodebehind + Inherits FileTypeControlBase(Of Csv2FileTypeCodebehind, Csv2FileType) + + Private Sub Csv2FileType_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load + OnFinished() + Marker.SerializeAndStream() + End Sub + +End Class diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileSerializerCreator.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileSerializerCreator.vb new file mode 100644 index 000000000..cebd0d936 --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileSerializerCreator.vb @@ -0,0 +1,11 @@ +Imports PCAxis.Paxiom +Imports PCAxis.Web.Core + +Public Class Csv3FileSerializerCreator + + Implements PCAxis.Web.Core.ISerializerCreator + + Public Function Create(fileInfo As String) As IPXModelStreamSerializer Implements ISerializerCreator.Create + Return New PCAxis.Paxiom.Csv3FileSerializer() + End Function +End Class diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.ascx b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.ascx new file mode 100644 index 000000000..7d2d6f7c0 --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.ascx @@ -0,0 +1 @@ +<%@ control inherits="PCAxis.Web.Controls.Csv3FileTypeCodebehind" %> diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb new file mode 100644 index 000000000..bfa5226d4 --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb @@ -0,0 +1,28 @@ +Imports System.Web.UI +Imports System.Web.UI.WebControls +Imports System.ComponentModel +Imports PCAxis.Web.Core +Imports PCAxis.Web.Core.Attributes +Imports PCAxis.Paxiom +Imports PCAxis.Web.Core.Management + + +''' +''' +''' +Partial Public Class Csv3FileType + Inherits FileTypeMarkerControlBase(Of Csv3FileTypeCodebehind, Csv3FileType) + + ''' + ''' Creates a html file and sends it to the user + ''' + ''' + Public Overrides Sub SerializeAndStream() + Using stream As IO.MemoryStream = New IO.MemoryStream() + Dim csv3FileSerializer As New Csv3FileSerializer + csv3FileSerializer.Serialize(PaxiomManager.PaxiomModel, stream) + StreamFile(stream, Me.SelectedFileType.MimeType, Me.SelectedFileType.FileExtension) + End Using + End Sub + +End Class diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileTypeCodebehind.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileTypeCodebehind.vb new file mode 100644 index 000000000..3849ebd4c --- /dev/null +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileTypeCodebehind.vb @@ -0,0 +1,11 @@ +Imports PCAxis.Web.Core + +Public Class Csv3FileTypeCodebehind + Inherits FileTypeControlBase(Of Csv3FileTypeCodebehind, Csv3FileType) + + Private Sub Csv3FiltType_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load + OnFinished() + Marker.SerializeAndStream() + End Sub + +End Class diff --git a/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj b/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj index 7fb43f60e..74360b581 100644 --- a/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj +++ b/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj @@ -115,6 +115,7 @@ + @@ -270,6 +271,24 @@ ASPXCodeBehind + + Csv2FileType.ascx + + + Csv2FileType.ascx + ASPXCodeBehind + + + + + Csv3FileType.ascx + + + Csv3FileType.ascx + ASPXCodeBehind + + + Excel.ascx @@ -741,6 +760,10 @@ Designer + + + ASPXCodeBehind + ASPXCodeBehind @@ -759,11 +782,11 @@ - \ No newline at end of file diff --git a/PXWeb/Resources/Languages/pxlang.sv.xml b/PXWeb/Resources/Languages/pxlang.sv.xml index 4b1e13eca..c9c63a024 100644 --- a/PXWeb/Resources/Languages/pxlang.sv.xml +++ b/PXWeb/Resources/Languages/pxlang.sv.xml @@ -369,6 +369,8 @@ + + diff --git a/PXWeb/Resources/Languages/pxlang.xml b/PXWeb/Resources/Languages/pxlang.xml index 422894008..3b848a20d 100644 --- a/PXWeb/Resources/Languages/pxlang.xml +++ b/PXWeb/Resources/Languages/pxlang.xml @@ -417,11 +417,11 @@ - - - - - + + + + + @@ -432,7 +432,10 @@ - + + + + From 63cf482dc768f243ffc71452e86658cd49fb0017 Mon Sep 17 00:00:00 2001 From: Maria Borg Date: Wed, 20 Sep 2023 10:56:58 +0200 Subject: [PATCH 04/14] Added info --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 0d83e39db..988e84e9c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -67,4 +67,4 @@ - Better text for screenreader on buttons on selectionpage. - Added aria-live on selection page describing selection status and validation errors. - Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox. - +- Added filetype csv2 and csv3 #367 \ No newline at end of file From 1030016d3afff9ad07475044ff110a4e5deb1690 Mon Sep 17 00:00:00 2001 From: Maria Borg Date: Wed, 20 Sep 2023 10:58:22 +0200 Subject: [PATCH 05/14] Change info --- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 988e84e9c..f63a3ac10 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ === Release of PxWeb 2023 v1 === +- Added filetype csv2 and csv3 #367 - Dcat file uses the organizations.json file to map between organization names and existing organization uris - Dcat admin tool and api-endpoint is now updated to allow for catalog titles and descriptions in multiple languages - Dcat admin tool settings are now saved separately for each database, in the corresponding database.config file @@ -66,5 +67,4 @@ - On presentaionpage, keep focus on operationbutton and maintain status on menu (open/closed) - Better text for screenreader on buttons on selectionpage. - Added aria-live on selection page describing selection status and validation errors. -- Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox. -- Added filetype csv2 and csv3 #367 \ No newline at end of file +- Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox. \ No newline at end of file From 3d53393ffa42cca769b98e9a046bfd938e92b095 Mon Sep 17 00:00:00 2001 From: Maria Borg Date: Wed, 20 Sep 2023 11:23:32 +0200 Subject: [PATCH 06/14] Updated comment for csv2 and csv3 --- PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb | 2 +- PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb index 0bf4d174a..b8a250494 100644 --- a/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb @@ -14,7 +14,7 @@ Partial Public Class Csv2FileType Inherits FileTypeMarkerControlBase(Of Csv2FileTypeCodebehind, Csv2FileType) ''' - ''' Creates a html file and sends it to the user + ''' Creates a csv2 file and sends it to the user ''' ''' Public Overrides Sub SerializeAndStream() diff --git a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb index bfa5226d4..29fa4dad3 100644 --- a/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb +++ b/PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb @@ -14,7 +14,7 @@ Partial Public Class Csv3FileType Inherits FileTypeMarkerControlBase(Of Csv3FileTypeCodebehind, Csv3FileType) ''' - ''' Creates a html file and sends it to the user + ''' Creates a csv3 file and sends it to the user ''' ''' Public Overrides Sub SerializeAndStream() From 73d3b89e858d035347212e90c663ad0bd940f73f Mon Sep 17 00:00:00 2001 From: Maria Borg Date: Mon, 25 Sep 2023 10:46:02 +0200 Subject: [PATCH 07/14] New version of PcAxis.Query --- CHANGES.txt | 1 + PXWeb/PXWeb.csproj | 2 +- PXWeb/packages.config | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f63a3ac10..da23e72b0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ === Release of PxWeb 2023 v1 === +- New version of PcAxis.Query.1.0.8 #367 - Added filetype csv2 and csv3 #367 - Dcat file uses the organizations.json file to map between organization names and existing organization uris - Dcat admin tool and api-endpoint is now updated to allow for catalog titles and descriptions in multiple languages diff --git a/PXWeb/PXWeb.csproj b/PXWeb/PXWeb.csproj index e561619e9..466130a00 100644 --- a/PXWeb/PXWeb.csproj +++ b/PXWeb/PXWeb.csproj @@ -150,7 +150,7 @@ ..\packages\PCAxis.Metadata.1.0.2\lib\netstandard2.0\PCAxis.Metadata.dll - ..\packages\PcAxis.Query.1.0.7\lib\netstandard2.0\PCAxis.Query.dll + ..\packages\PcAxis.Query.1.0.8\lib\netstandard2.0\PCAxis.Query.dll ..\packages\PcAxis.Sql.1.2.1\lib\netstandard2.0\PCAxis.Sql.dll diff --git a/PXWeb/packages.config b/PXWeb/packages.config index a891cbd68..1bab90840 100644 --- a/PXWeb/packages.config +++ b/PXWeb/packages.config @@ -37,7 +37,7 @@ - + From de2a9017f592f1ebae9af790ccc449285d5ac996 Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Mon, 25 Sep 2023 14:58:16 +0200 Subject: [PATCH 08/14] Fix for when you try to restore variable values by selecting "-- Select classification --" and there is no _ALL_ valueset --- .../VariableSelectorValueSelectCodebehind.vb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb index 6dd2de5d8..a85f70ac0 100644 --- a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb +++ b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb @@ -1051,10 +1051,15 @@ Public Class VariableSelectorValueSelectCodebehind Marker.Variable.CurrentValueSet = Nothing clearSelection = True Else - 'Restore of values is performed by applying the valueset _ALL_. - Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo - vsInfo.ID = "_ALL_" - Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo) + 'Fix for when only one valueset and _ALL_ does not exist + If Marker.Variable.ValueSets.Count = 1 Then + Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, Marker.Variable.ValueSets(0)) + Else + 'Restore of values is performed by applying the valueset _ALL_. + Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo + vsInfo.ID = "_ALL_" + Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo) + End If Marker.SelectedGroupingPresentation = GroupingIncludesType.SingleValues ok = True End If From f5194826bb0f9568e5bd613f989ec774d62fa597 Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Tue, 26 Sep 2023 15:24:59 +0200 Subject: [PATCH 09/14] Fix for handling px-databases (that do not have valuesets) in the correct way when restoring selection --- .../VariableSelector/VariableSelectorValueSelectCodebehind.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb index a85f70ac0..f4ae835a5 100644 --- a/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb +++ b/PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb @@ -1046,7 +1046,7 @@ Public Class VariableSelectorValueSelectCodebehind 'Code "_RESTORE_" means that the option --Select classification-- has been selected in the dropdown. 'This shall result in the values in the dropdown being restored to the initial ones. - If (Marker.ValuesetMustBeSelectedFirst) Then + If (Marker.ValuesetMustBeSelectedFirst AndAlso Marker.Variable.HasValuesets) Then Marker.Variable.CurrentGrouping = Nothing Marker.Variable.CurrentValueSet = Nothing clearSelection = True From 69ccfb59c90b649d0b9479c420642e474c5a042d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 02:17:14 +0000 Subject: [PATCH 10/14] Bump azure/webapps-deploy from 2 to 3 Bumps [azure/webapps-deploy](https://github.com/azure/webapps-deploy) from 2 to 3. - [Release notes](https://github.com/azure/webapps-deploy/releases) - [Commits](https://github.com/azure/webapps-deploy/compare/v2...v3) --- updated-dependencies: - dependency-name: azure/webapps-deploy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy_to_azure.yml | 2 +- .github/workflows/master_px-web_org.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_to_azure.yml b/.github/workflows/deploy_to_azure.yml index d501c22a9..479aaf3ee 100644 --- a/.github/workflows/deploy_to_azure.yml +++ b/.github/workflows/deploy_to_azure.yml @@ -57,7 +57,7 @@ jobs: - name: Deploy to Azure Web App id: deploy-to-webapp - uses: azure/webapps-deploy@v2 + uses: azure/webapps-deploy@v3 with: app-name: 'PxWebMaster' slot-name: 'Production' diff --git a/.github/workflows/master_px-web_org.yaml b/.github/workflows/master_px-web_org.yaml index b0bdc88ae..9c2eb21b2 100644 --- a/.github/workflows/master_px-web_org.yaml +++ b/.github/workflows/master_px-web_org.yaml @@ -49,7 +49,7 @@ jobs: - name: Deploy to Azure Web App id: deploy-to-webapp - uses: azure/webapps-deploy@v2 + uses: azure/webapps-deploy@v3 with: app-name: 'master-pxweb' slot-name: 'production' From 1abbd49540d410bc227ab2174eb8280691678585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:07:38 +0000 Subject: [PATCH 11/14] Bump Azure.Identity from 1.7.0 to 1.10.2 in /PCAxis.Search Bumps [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) from 1.7.0 to 1.10.2. - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.7.0...Azure.Identity_1.10.2) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- PCAxis.Search/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCAxis.Search/packages.config b/PCAxis.Search/packages.config index 767ff4d12..514e0a088 100644 --- a/PCAxis.Search/packages.config +++ b/PCAxis.Search/packages.config @@ -1,7 +1,7 @@ - + - + From b216d3f416026f5c7beb3e5095048439ff33a3de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:07:55 +0000 Subject: [PATCH 12/14] Bump Azure.Identity from 1.7.0 to 1.10.2 in /PCAxis.Api Bumps [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) from 1.7.0 to 1.10.2. - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.7.0...Azure.Identity_1.10.2) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- PCAxis.Api/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCAxis.Api/packages.config b/PCAxis.Api/packages.config index 8af29352a..9a11736fe 100644 --- a/PCAxis.Api/packages.config +++ b/PCAxis.Api/packages.config @@ -1,7 +1,7 @@ - + - + From c698aad2b73bc901e556f603c85cb9da146a1be7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:09:42 +0000 Subject: [PATCH 13/14] Bump Azure.Identity from 1.7.0 to 1.10.2 in /PXWeb Bumps [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) from 1.7.0 to 1.10.2. - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.7.0...Azure.Identity_1.10.2) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- PXWeb/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PXWeb/packages.config b/PXWeb/packages.config index 1bab90840..e99ca8fb8 100644 --- a/PXWeb/packages.config +++ b/PXWeb/packages.config @@ -1,7 +1,7 @@ - + - + From 822424b4f03748f01d00566040de6c42d872e461 Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Thu, 26 Oct 2023 16:46:14 +0200 Subject: [PATCH 14/14] Updated Azure.Core version --- PCAxis.Api/PCAxis.Api.csproj | 8 ++++---- PCAxis.Api/app.config | 4 ++++ PCAxis.Api/packages.config | 6 +++--- PCAxis.Search/PCAxis.Search.csproj | 8 ++++---- PCAxis.Search/app.config | 4 ++++ PCAxis.Search/packages.config | 6 +++--- PXWeb/PXWeb.csproj | 8 ++++---- PXWeb/packages.config | 6 +++--- TemplateConfigFiles/Web.config | 8 ++++++++ 9 files changed, 37 insertions(+), 21 deletions(-) diff --git a/PCAxis.Api/PCAxis.Api.csproj b/PCAxis.Api/PCAxis.Api.csproj index 82c83bbd5..aea5dcaed 100644 --- a/PCAxis.Api/PCAxis.Api.csproj +++ b/PCAxis.Api/PCAxis.Api.csproj @@ -57,8 +57,8 @@ false - - ..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll + + ..\packages\Azure.Core.1.35.0\lib\net472\Azure.Core.dll ..\packages\Azure.Identity.1.7.0\lib\netstandard2.0\Azure.Identity.dll @@ -157,8 +157,8 @@ True - - ..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll diff --git a/PCAxis.Api/app.config b/PCAxis.Api/app.config index 96930c268..7f59984a3 100644 --- a/PCAxis.Api/app.config +++ b/PCAxis.Api/app.config @@ -94,6 +94,10 @@ + + + + diff --git a/PCAxis.Api/packages.config b/PCAxis.Api/packages.config index 9a11736fe..9dbe5adb5 100644 --- a/PCAxis.Api/packages.config +++ b/PCAxis.Api/packages.config @@ -1,6 +1,6 @@ - + - + @@ -32,7 +32,7 @@ - + diff --git a/PCAxis.Search/PCAxis.Search.csproj b/PCAxis.Search/PCAxis.Search.csproj index 0878d343a..da1958aee 100644 --- a/PCAxis.Search/PCAxis.Search.csproj +++ b/PCAxis.Search/PCAxis.Search.csproj @@ -35,8 +35,8 @@ false - - ..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll + + ..\packages\Azure.Core.1.35.0\lib\net472\Azure.Core.dll ..\packages\Azure.Identity.1.7.0\lib\netstandard2.0\Azure.Identity.dll @@ -108,8 +108,8 @@ True - - ..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll diff --git a/PCAxis.Search/app.config b/PCAxis.Search/app.config index cb8a252f6..214affb46 100644 --- a/PCAxis.Search/app.config +++ b/PCAxis.Search/app.config @@ -82,6 +82,10 @@ + + + + diff --git a/PCAxis.Search/packages.config b/PCAxis.Search/packages.config index 514e0a088..81891bda1 100644 --- a/PCAxis.Search/packages.config +++ b/PCAxis.Search/packages.config @@ -1,6 +1,6 @@ - + - + @@ -24,7 +24,7 @@ - + diff --git a/PXWeb/PXWeb.csproj b/PXWeb/PXWeb.csproj index 466130a00..bd7ade159 100644 --- a/PXWeb/PXWeb.csproj +++ b/PXWeb/PXWeb.csproj @@ -58,8 +58,8 @@ false - - ..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll + + ..\packages\Azure.Core.1.35.0\lib\net472\Azure.Core.dll ..\packages\Azure.Identity.1.7.0\lib\netstandard2.0\Azure.Identity.dll @@ -180,8 +180,8 @@ - - ..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll diff --git a/PXWeb/packages.config b/PXWeb/packages.config index e99ca8fb8..3dffbf498 100644 --- a/PXWeb/packages.config +++ b/PXWeb/packages.config @@ -1,6 +1,6 @@ - + - + @@ -45,7 +45,7 @@ - + diff --git a/TemplateConfigFiles/Web.config b/TemplateConfigFiles/Web.config index 53c4ef8d3..34251d145 100644 --- a/TemplateConfigFiles/Web.config +++ b/TemplateConfigFiles/Web.config @@ -599,5 +599,13 @@ + + + + + + + +