From f8b8b25c964b82eeb65a293cca8aa7078259a414 Mon Sep 17 00:00:00 2001 From: Jonathan Erikson Date: Mon, 3 Jul 2023 09:32:17 +0200 Subject: [PATCH 1/7] Fix split time error --- .../CommandBar/CommandBarCodebehind.vb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/PCAxis.Web.Controls/CommandBar/CommandBarCodebehind.vb b/PCAxis.Web.Controls/CommandBar/CommandBarCodebehind.vb index 699d2f5e2..1587665f2 100644 --- a/PCAxis.Web.Controls/CommandBar/CommandBarCodebehind.vb +++ b/PCAxis.Web.Controls/CommandBar/CommandBarCodebehind.vb @@ -616,12 +616,17 @@ Namespace CommandBar ''' Id of the plugin to remove ''' Private Sub HidePluginDropDown(ByVal dropdown As DropDownList, ByVal pluginId As String) - For Each li As ListItem In dropdown.Items - If li.Value.Equals(pluginId) Then - dropdown.Items.Remove(li) - Exit Sub - End If - Next + If dropdown Is Nothing Then + Return + Else + For Each li As ListItem In dropdown.Items + If li.Value.Equals(pluginId) Then + dropdown.Items.Remove(li) + Exit Sub + End If + + Next + End If End Sub ''' From c011f80312797a710230608a8467c937811375a3 Mon Sep 17 00:00:00 2001 From: Jonathan Erikson Date: Mon, 3 Jul 2023 11:08:22 +0200 Subject: [PATCH 2/7] Add cookie creation on first load --- PXWeb/Selection.aspx.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PXWeb/Selection.aspx.cs b/PXWeb/Selection.aspx.cs index 3077e8b90..6bcfa439d 100644 --- a/PXWeb/Selection.aspx.cs +++ b/PXWeb/Selection.aspx.cs @@ -680,7 +680,14 @@ public void InitializeLayoutFormat() HttpCookie myLayoutCookie = Request.Cookies[layoutCookie]; if (myLayoutCookie == null) + { _selectionLayout = LayoutFormat.compact; + + myLayoutCookie = new HttpCookie(layoutCookie); + myLayoutCookie.Value = LayoutFormat.compact.ToString(); + myLayoutCookie.Expires = DateTime.Now.AddDays(370); + Response.Cookies.Add(myLayoutCookie); + } else { _selectionLayout = Request.Cookies[layoutCookie].Value.ToString() != "compact" ? LayoutFormat.simple : LayoutFormat.compact; From 761d60c3866caecc9cd3822e07d48ab68c59a6ff Mon Sep 17 00:00:00 2001 From: Jonathan Erikson Date: Mon, 7 Aug 2023 10:20:34 +0200 Subject: [PATCH 3/7] Add setting for api v2 query link --- PXWeb/Code/Settings/ApiSettings.cs | 14 ++++++++++++++ PXWeb/Code/Settings/Interfaces/IApiSettings.cs | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/PXWeb/Code/Settings/ApiSettings.cs b/PXWeb/Code/Settings/ApiSettings.cs index 3cd086e90..a0ee24670 100644 --- a/PXWeb/Code/Settings/ApiSettings.cs +++ b/PXWeb/Code/Settings/ApiSettings.cs @@ -26,6 +26,12 @@ public ApiSettings(XmlNode apiNode) xpath = "./urlRoot"; UrlRoot = SettingsHelper.GetSettingValue(xpath, apiNode, ""); + xpath = "./urlRootV2"; + UrlRootV2 = SettingsHelper.GetSettingValue(xpath, apiNode, ""); + + xpath = "./enableApiV2QueryLink"; + EnableApiV2QueryLink = SettingsHelper.GetSettingValue(xpath, apiNode, false); + xpath = "./routePrefix"; RoutePrefix = SettingsHelper.GetSettingValue(xpath, apiNode, "api/v1/"); @@ -75,6 +81,12 @@ public void Save(XmlNode apiNode) xpath = "./urlRoot"; SettingsHelper.SetSettingValue(xpath, apiNode, UrlRoot); + xpath = "./urlRootV2"; + SettingsHelper.SetSettingValue(xpath, apiNode, UrlRootV2); + + xpath = "./enableApiV2QueryLink"; + SettingsHelper.SetSettingValue(xpath, apiNode, EnableApiV2QueryLink.ToString()); + xpath = "./routePrefix"; SettingsHelper.SetSettingValue(xpath, apiNode, RoutePrefix); @@ -118,6 +130,8 @@ public void Save(XmlNode apiNode) public int MaxValuesReturned { get; set; } public string UrlRoot { get; set; } + public string UrlRootV2 { get; set; } + public bool EnableApiV2QueryLink { get; set; } public string RoutePrefix { get; set; } public int LimiterRequests { get; set; } public int LimiterTimespan { get; set; } diff --git a/PXWeb/Code/Settings/Interfaces/IApiSettings.cs b/PXWeb/Code/Settings/Interfaces/IApiSettings.cs index 60feb8774..24ee26c76 100644 --- a/PXWeb/Code/Settings/Interfaces/IApiSettings.cs +++ b/PXWeb/Code/Settings/Interfaces/IApiSettings.cs @@ -14,6 +14,17 @@ public interface IApiSettings /// URL root. root of API url /// string UrlRoot { get; } + + + /// + /// If Api-V2 links should be shown in the results view + /// + bool EnableApiV2QueryLink { get; } + + /// + /// URL root. root of API-V2 url + /// + string UrlRootV2 { get; } /// /// URL route identifying API request /// From 08ec49245f995828bf934370df78bae5d5de588f Mon Sep 17 00:00:00 2001 From: Jonathan Erikson Date: Mon, 7 Aug 2023 10:21:10 +0200 Subject: [PATCH 4/7] Add Api-V2 query link --- PCAxis.Web.Controls/Query/TableQuery.ascx | 18 + PCAxis.Web.Controls/Query/TableQuery.vb | 24 +- .../Query/TableQueryCodebehind.vb | 83 +++++ PXWeb/Admin/Features-Api-General.aspx | 18 + PXWeb/Admin/Features-Api-General.aspx.cs | 12 + .../Features-Api-General.aspx.designer.cs | 183 ++++++---- PXWeb/Presentation.master.cs | 2 + PXWeb/Resources/Languages/pxlang.sv.xml | 2 + PXWeb/Resources/Languages/pxlang.xml | 6 + PXWeb/Resources/PX/Databases/Example/Menu.xml | 320 +++++++++--------- PXWeb/Resources/Styles/main-pxweb.css | 19 +- .../Styles/scss/pxweb/_tablequery.scss | 19 +- 12 files changed, 478 insertions(+), 228 deletions(-) diff --git a/PCAxis.Web.Controls/Query/TableQuery.ascx b/PCAxis.Web.Controls/Query/TableQuery.ascx index 38e0542f5..95d3e9a26 100644 --- a/PCAxis.Web.Controls/Query/TableQuery.ascx +++ b/PCAxis.Web.Controls/Query/TableQuery.ascx @@ -22,6 +22,24 @@ + + Api-V2: + + + + + + diff --git a/PCAxis.Web.Controls/Query/TableQuery.vb b/PCAxis.Web.Controls/Query/TableQuery.vb index fe1cb0775..e5c6c5e96 100644 --- a/PCAxis.Web.Controls/Query/TableQuery.vb +++ b/PCAxis.Web.Controls/Query/TableQuery.vb @@ -23,7 +23,7 @@ Partial Public Class TableQuery ''' ''' ''' - _ + Public Property URLRoot() As String Get Return _urlRoot @@ -33,6 +33,28 @@ Partial Public Class TableQuery End Set End Property + Private _urlRootV2 As String + + Public Property URLRootV2() As String + Get + Return _urlRootV2 + End Get + Set(ByVal value As String) + _urlRootV2 = value + End Set + End Property + + Private _enableApiV2QueryLink As Boolean + + Public Property EnableApiV2QueryLink() As Boolean + Get + Return _enableApiV2QueryLink + End Get + Set(ByVal value As Boolean) + _enableApiV2QueryLink = value + End Set + End Property + Private _showRoutePrefix As Boolean = True ''' ''' If the route prefix should be displayed in the API url diff --git a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb index 85475e731..877a1ca86 100644 --- a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb +++ b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb @@ -21,23 +21,30 @@ Public Class TableQueryCodebehind #Region "fields" Protected pnlQueryInformation As Panel + Protected pnlQueryInformationV2 As Panel Protected lblInformationText As Label + Protected lblInformationTextV2 As Label Protected lblUrl As Label + Protected lblUrlV2 As Label Protected txtUrl As TextBox + Protected txtUrlV2 As TextBox Protected lblQuery As Label Protected txtQuery As TextBox Protected lnkMoreInfo As HyperLink Protected WithEvents btnSaveQuery As Button Protected lblTableQueryInformation As Label + Protected btnCopyUrlV2 As Button #End Region #Region "Localized strings" Private Const LOC_TABLEQUERY_SHOW_INFORMATION As String = "CtrlTableQueryShowInformation" Private Const LOC_TABLEQUERY_INFORMATION_TEXT As String = "CtrlTableQueryInformationText" + Private Const LOC_TABLEQUERY_V2_INFORMATION_TEXT As String = "CtrlTableQueryV2InformationText" Private Const LOC_TABLEQUERY_URL_CAPTION As String = "CtrlTableQueryUrlCaption" Private Const LOC_TABLEQUERY_QUERY_CAPTION As String = "CtrlTableQueryQueryCaption" Private Const LOC_TABLEQUERY_MORE_INFORMATION As String = "CtrlTableQueryMoreInformation" Private Const LOC_TABLEQUERY_SAVE_QUERY As String = "CtrlTableQuerySaveQuery" + Private Const LOC_TABLEQUERY_COPY As String = "CtrlTableQueryCopy" #End Region #Region "Events" @@ -47,10 +54,12 @@ Public Class TableQueryCodebehind If VerifyDatabase() Then Me.Visible = True ShowApiURL() + ShowApiV2URL() ShowApiQuery() ShowMoreInfoLink() Localize() btnSaveQuery.Visible = Marker.ShowSaveApiQueryButton + pnlQueryInformationV2.Visible = Marker.EnableApiV2QueryLink Else Me.Visible = False End If @@ -61,6 +70,7 @@ Public Class TableQueryCodebehind If Me.Visible Then Localize() ShowApiURL() + ShowApiV2URL() End If End Sub @@ -144,12 +154,15 @@ Public Class TableQueryCodebehind ''' Private Sub Localize() lblInformationText.Text = GetLocalizedString(LOC_TABLEQUERY_INFORMATION_TEXT) + lblInformationTextV2.Text = GetLocalizedString(LOC_TABLEQUERY_V2_INFORMATION_TEXT) lblUrl.Text = GetLocalizedString(LOC_TABLEQUERY_URL_CAPTION) + lblUrlV2.Text = GetLocalizedString(LOC_TABLEQUERY_URL_CAPTION) lblQuery.Text = GetLocalizedString(LOC_TABLEQUERY_QUERY_CAPTION) lnkMoreInfo.Text = String.Format("{0}", Server.HtmlEncode(GetLocalizedString(LOC_TABLEQUERY_MORE_INFORMATION))) btnSaveQuery.Text = GetLocalizedString(LOC_TABLEQUERY_SAVE_QUERY) lblTableQueryInformation.Text = GetLocalizedString(LOC_TABLEQUERY_SHOW_INFORMATION) + btnCopyUrlV2.Text = GetLocalizedString(LOC_TABLEQUERY_COPY) End Sub ''' @@ -234,6 +247,76 @@ Public Class TableQueryCodebehind txtUrl.Text = sb.ToString() End Sub + ''' + ''' Show the API-V2 URL + ''' + ''' + Private Sub ShowApiV2URL() + Dim sb As New System.Text.StringBuilder() + If Marker.DatabaseType = PCAxis.Web.Core.Enums.DatabaseType.PX Then + txtUrlV2.Text = "-" + Return + End If + + Dim route As String + If Not Marker.URLRootV2 Is Nothing Then + route = Marker.URLRootV2.Replace("\", "/") + sb.Append(route) + If Not route.EndsWith("/") Then + sb.Append("/") + End If + End If + + sb.Append("tables/") + + Dim builder As IPXModelBuilder = PaxiomManager.PaxiomModelBuilder() + Dim model As PXModel = PaxiomManager.PaxiomModel + Dim tableId As String = model.Meta.TableID + sb.Append(tableId) + + sb.Append("/data") + + Dim lang As String = LocalizationManager.CurrentCulture.Name + lang = Util.GetLanguageForNet3_5(lang) + sb.Append("?lang=") + sb.Append(lang) + + + For Each var In model.Meta.Variables + Dim values As String = GetValuesString(var.Values) + 'If var.CurrentValueSet IsNot Nothing Then + ' sb.Append(String.Format("&codelist[{0}]={1}", var.Code, var.CurrentValueSet.ID)) + 'End If + 'If var.CurrentGrouping IsNot Nothing Then + ' sb.Append(String.Format("&outputValues[{0}]={1}", var.Code, "aggregated")) + 'End If + sb.Append(String.Format("&valueCodes[{0}]={1}", var.Code, values)) + Next + + For Each var In PaxiomManager.QueryModel.Query + Dim filter As String = var.Selection.Filter + Dim prefix As String = filter.Split(":"c).First() + Dim suffix As String = filter.Split(":"c).Last() + If prefix.Equals("vs") Or prefix.Equals("agg") Then + sb.Append(String.Format("&codelist[{0}]={1}_{2}", var.Code, prefix, suffix)) + End If + If prefix.Equals("agg") Then + sb.Append(String.Format("&outputValues[{0}]={1}", var.Code, "aggregated")) + End If + Next + + txtUrlV2.Text = sb.ToString() + End Sub + Private Function GetValuesString(var As Values) As String + Dim valuesSB As New System.Text.StringBuilder() + For Each val As Value In var + valuesSB.Append(val.Code) + valuesSB.Append(",") + Next + valuesSB.Remove(valuesSB.Length - 1, 1) + Return valuesSB.ToString() + End Function + Private Function GetAppPath() As String Dim appPath As String = String.Empty Dim context As System.Web.HttpContext = System.Web.HttpContext.Current diff --git a/PXWeb/Admin/Features-Api-General.aspx b/PXWeb/Admin/Features-Api-General.aspx index d8e5a6f3d..fae6a89c5 100644 --- a/PXWeb/Admin/Features-Api-General.aspx +++ b/PXWeb/Admin/Features-Api-General.aspx @@ -40,6 +40,24 @@ ErrorMessage="*" ValidateEmptyText="False" CssClass="setting-field-validator" > +
+ + + + + +   +
+ +
+ + + + +
+
diff --git a/PXWeb/Admin/Features-Api-General.aspx.cs b/PXWeb/Admin/Features-Api-General.aspx.cs index df336a4f6..4766d6b38 100644 --- a/PXWeb/Admin/Features-Api-General.aspx.cs +++ b/PXWeb/Admin/Features-Api-General.aspx.cs @@ -48,6 +48,7 @@ private void ReadSettings() txtFetchCellLimit.Text = PXWeb.Settings.Current.Features.Api.FetchCellLimit.ToString(); cboEnableCORS.SelectedValue = PXWeb.Settings.Current.Features.Api.EnableCORS.ToString(); cboEnableCache.SelectedValue = PXWeb.Settings.Current.Features.Api.EnableCache.ToString(); + cboEnableApiV2QueryLink.SelectedValue = PXWeb.Settings.Current.Features.Api.EnableApiV2QueryLink.ToString(); //txtClearCache.Text = PXWeb.Settings.Current.Features.Api.ClearCache; cboShowQueryInformation.SelectedValue = PXWeb.Settings.Current.Features.Api.ShowQueryInformation.ToString(); cboDefaultExampleResponseFormat.SelectedValue = PXWeb.Settings.Current.Features.Api.DefaultExampleResponseFormat; @@ -55,6 +56,7 @@ private void ReadSettings() txtSaveApiQueryText.Text = PXWeb.Settings.Current.Features.Api.SaveApiQueryText.ToString(); ShowHideTextboxForQueryPrefix(); txtUrlRoot.Text = PXWeb.Settings.Current.Features.Api.UrlRoot; + txtUrlRootV2.Text = PXWeb.Settings.Current.Features.Api.UrlRootV2; } /// @@ -224,6 +226,8 @@ protected void MasterSave_Click(Object sender, System.EventArgs e) api.SaveApiQueryText = txtSaveApiQueryText.Text; api.UrlRoot = txtUrlRoot.Text; + api.UrlRootV2 = txtUrlRootV2.Text; + api.EnableApiV2QueryLink = bool.Parse(cboEnableApiV2QueryLink.SelectedValue); PXWeb.Settings.Save(); @@ -483,6 +487,14 @@ protected void UrlRootInfo(object sender, ImageClickEventArgs e) Master.ShowInfoDialog("PxWebAdminFeaturesApiGeneralUrlRoot", "PxWebAdminFeaturesApiGeneralUrlRootInfo"); } + protected void UrlRootInfoV2(object sender, ImageClickEventArgs e) + { + Master.ShowInfoDialog("PxWebAdminFeaturesApiGeneralUrlRootV2", "PxWebAdminFeaturesApiGeneralUrlRootInfoV2"); + } + protected void EnableApiV2QueryLinkInfo(object sender, ImageClickEventArgs e) + { + Master.ShowInfoDialog("PxWebAdminFeaturesApiGeneralEnableApiV2QueryLink", "PxWebAdminFeaturesApiGeneralEnableApiV2QueryLinkInfo"); + } protected void ShowSaveApiQueryButtonInfo(object sender, ImageClickEventArgs e) { Master.ShowInfoDialog("PxWebAdminFeaturesApiGeneralShowSaveApiQueryButton", "PxWebAdminFeaturesApiGeneralShowSaveApiQueryButtonInfo"); diff --git a/PXWeb/Admin/Features-Api-General.aspx.designer.cs b/PXWeb/Admin/Features-Api-General.aspx.designer.cs index 56a212a67..c4531f3ed 100644 --- a/PXWeb/Admin/Features-Api-General.aspx.designer.cs +++ b/PXWeb/Admin/Features-Api-General.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace PXWeb.Admin { - - - public partial class Features_Api_General { - +namespace PXWeb.Admin +{ + + + public partial class Features_Api_General + { + /// /// lblApiSetting control. /// @@ -20,7 +22,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblApiSetting; - + /// /// lblPxDatabases control. /// @@ -29,7 +31,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblPxDatabases; - + /// /// imgPxDatabases control. /// @@ -38,7 +40,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgPxDatabases; - + /// /// tblPxDatabases control. /// @@ -47,7 +49,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Table tblPxDatabases; - + /// /// lblCnmmDatabases control. /// @@ -56,7 +58,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblCnmmDatabases; - + /// /// imgCnmmDatabases control. /// @@ -65,7 +67,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgCnmmDatabases; - + /// /// tblCnmmDatabases control. /// @@ -74,7 +76,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Table tblCnmmDatabases; - + /// /// lblRoutePrefix control. /// @@ -83,7 +85,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblRoutePrefix; - + /// /// txtRoutePrefix control. /// @@ -92,7 +94,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtRoutePrefix; - + /// /// imgRoutePrefix control. /// @@ -101,7 +103,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgRoutePrefix; - + /// /// validatorRoutePrefix control. /// @@ -110,7 +112,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorRoutePrefix; - + /// /// lblUrlRoot control. /// @@ -119,7 +121,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblUrlRoot; - + /// /// txtUrlRoot control. /// @@ -128,7 +130,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtUrlRoot; - + /// /// imgUrlRoot control. /// @@ -137,7 +139,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgUrlRoot; - + /// /// validatorUrlRoot control. /// @@ -146,7 +148,70 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorUrlRoot; - + + /// + /// lblEnableApiV2QueryLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblEnableApiV2QueryLink; + + /// + /// cboEnableApiV2QueryLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList cboEnableApiV2QueryLink; + + /// + /// imgEnableApiV2QueryLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton imgEnableApiV2QueryLink; + + /// + /// lblUrlRootV2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUrlRootV2; + + /// + /// txtUrlRootV2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtUrlRootV2; + + /// + /// imgUrlRootV2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton imgUrlRootV2; + + /// + /// validatorUrlRootV2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CustomValidator validatorUrlRootV2; + /// /// lblMaxValuesReturned control. /// @@ -155,7 +220,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblMaxValuesReturned; - + /// /// txtMaxValuesReturned control. /// @@ -164,7 +229,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtMaxValuesReturned; - + /// /// imgMaxValuesReturned control. /// @@ -173,7 +238,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgMaxValuesReturned; - + /// /// validatorMaxValuesReturned control. /// @@ -182,7 +247,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorMaxValuesReturned; - + /// /// lblFetchCellLimit control. /// @@ -191,7 +256,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblFetchCellLimit; - + /// /// txtFetchCellLimit control. /// @@ -200,7 +265,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtFetchCellLimit; - + /// /// imgFetchCellLimit control. /// @@ -209,7 +274,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgFetchCellLimit; - + /// /// validatorFetchCellLimit control. /// @@ -218,7 +283,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorFetchCellLimit; - + /// /// lblLimiterRequests control. /// @@ -227,7 +292,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblLimiterRequests; - + /// /// txtLimiterRequests control. /// @@ -236,7 +301,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtLimiterRequests; - + /// /// imgLimiterRequests control. /// @@ -245,7 +310,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgLimiterRequests; - + /// /// validatorLimiterRequests control. /// @@ -254,7 +319,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorLimiterRequests; - + /// /// lblLimiterTimespan control. /// @@ -263,7 +328,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblLimiterTimespan; - + /// /// txtLimiterTimespan control. /// @@ -272,7 +337,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtLimiterTimespan; - + /// /// imgLimiterTimespan control. /// @@ -281,7 +346,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgLimiterTimespan; - + /// /// validatorLimiterTimespan control. /// @@ -290,7 +355,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator validatorLimiterTimespan; - + /// /// lblEnableCORS control. /// @@ -299,7 +364,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblEnableCORS; - + /// /// cboEnableCORS control. /// @@ -308,7 +373,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList cboEnableCORS; - + /// /// imgEnableCORS control. /// @@ -317,7 +382,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgEnableCORS; - + /// /// lblEnableCache control. /// @@ -326,7 +391,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblEnableCache; - + /// /// cboEnableCache control. /// @@ -335,7 +400,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList cboEnableCache; - + /// /// imgEnableCache control. /// @@ -344,7 +409,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgEnableCache; - + /// /// lblShowQueryInformation control. /// @@ -353,7 +418,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblShowQueryInformation; - + /// /// cboShowQueryInformation control. /// @@ -362,7 +427,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList cboShowQueryInformation; - + /// /// imgShowQueryInformation control. /// @@ -371,7 +436,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgShowQueryInformation; - + /// /// lblDefaultExampleResponseFormat control. /// @@ -380,7 +445,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblDefaultExampleResponseFormat; - + /// /// cboDefaultExampleResponseFormat control. /// @@ -389,7 +454,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList cboDefaultExampleResponseFormat; - + /// /// imgDefaultExampleResponseFormat control. /// @@ -398,7 +463,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgDefaultExampleResponseFormat; - + /// /// lblShowSaveApiQueryButton control. /// @@ -407,7 +472,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblShowSaveApiQueryButton; - + /// /// cboShowSaveApiQueryButton control. /// @@ -416,7 +481,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList cboShowSaveApiQueryButton; - + /// /// imgShowSaveApiQueryButton control. /// @@ -425,7 +490,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgShowSaveApiQueryButton; - + /// /// pnlSaveApiQueryText control. /// @@ -434,7 +499,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlSaveApiQueryText; - + /// /// lblSaveApiQueryText control. /// @@ -443,7 +508,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblSaveApiQueryText; - + /// /// txtSaveApiQueryText control. /// @@ -452,7 +517,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtSaveApiQueryText; - + /// /// imgSaveApiQueryText control. /// @@ -461,7 +526,7 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ImageButton imgSaveApiQueryText; - + /// /// CustomValidator1 control. /// @@ -470,15 +535,17 @@ public partial class Features_Api_General { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator CustomValidator1; - + /// /// Master property. /// /// /// Auto-generated property. /// - public new PXWeb.Admin.Admin Master { - get { + public new PXWeb.Admin.Admin Master + { + get + { return ((PXWeb.Admin.Admin)(base.Master)); } } diff --git a/PXWeb/Presentation.master.cs b/PXWeb/Presentation.master.cs index 6075c858c..98a8986aa 100644 --- a/PXWeb/Presentation.master.cs +++ b/PXWeb/Presentation.master.cs @@ -273,6 +273,8 @@ private void InitializeTableQuery() } TableQueryInformation.URLRoot = PXWeb.Settings.Current.Features.Api.UrlRoot; + TableQueryInformation.URLRootV2 = PXWeb.Settings.Current.Features.Api.UrlRootV2; + TableQueryInformation.EnableApiV2QueryLink = PXWeb.Settings.Current.Features.Api.EnableApiV2QueryLink; TableQueryInformation.Database = db; TableQueryInformation.Path = PxUrlObject.Path; TableQueryInformation.Table = PxUrlObject.Table; diff --git a/PXWeb/Resources/Languages/pxlang.sv.xml b/PXWeb/Resources/Languages/pxlang.sv.xml index f4fa9e466..9018e9590 100644 --- a/PXWeb/Resources/Languages/pxlang.sv.xml +++ b/PXWeb/Resources/Languages/pxlang.sv.xml @@ -411,10 +411,12 @@ + + diff --git a/PXWeb/Resources/Languages/pxlang.xml b/PXWeb/Resources/Languages/pxlang.xml index b823325a4..3d30cabe9 100644 --- a/PXWeb/Resources/Languages/pxlang.xml +++ b/PXWeb/Resources/Languages/pxlang.xml @@ -487,10 +487,12 @@ + + @@ -1300,6 +1302,10 @@ + + + + diff --git a/PXWeb/Resources/PX/Databases/Example/Menu.xml b/PXWeb/Resources/PX/Databases/Example/Menu.xml index 1d9f1e77c..17e288d53 100644 --- a/PXWeb/Resources/PX/Databases/Example/Menu.xml +++ b/PXWeb/Resources/PX/Databases/Example/Menu.xml @@ -21,9 +21,9 @@ 5 1933 40 - 20220628 16:40 + 20230703 11:30 20060611 14:31 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-06-11 14:31:00 @@ -51,9 +51,9 @@ 2 133855 46176 - 20220628 16:40 + 20230703 11:30 20040212 16:33 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:33:00 @@ -84,9 +84,9 @@ 2 5091 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -112,9 +112,9 @@ 2 8371 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -140,9 +140,9 @@ 2 8368 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -168,9 +168,9 @@ 2 5714 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -206,9 +206,9 @@ 2 8697 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -233,9 +233,9 @@ 2 2675 84 - 20220628 16:40 + 20230703 11:30 20090213 07:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-02-13 07:19:00 @@ -256,9 +256,9 @@ 2689 84 true - 20220628 16:40 + 20230703 11:30 20090213 07:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-02-13 07:19:00 @@ -283,9 +283,9 @@ 2 2759 84 - 20220628 16:40 + 20230703 11:30 20090213 07:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-02-13 07:19:00 @@ -305,9 +305,9 @@ 2 2734 84 - 20220628 16:40 + 20230703 11:30 20090213 07:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-02-13 07:19:00 @@ -332,9 +332,9 @@ 2 2704 84 - 20220628 16:40 + 20230703 11:30 20090213 07:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-02-13 07:19:00 @@ -351,9 +351,9 @@ 13 3036 117 - 20220628 16:40 + 20230703 11:30 20090604 09:58 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-06-04 09:58:00 @@ -373,9 +373,9 @@ 16 8992583 1388544 - 20220628 16:40 + 20230703 11:30 20090623 16:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-06-23 16:20:00 @@ -410,9 +410,9 @@ 2 4248 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -438,9 +438,9 @@ 2 4241 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -471,9 +471,9 @@ 2 4210 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -499,9 +499,9 @@ 2 4084 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -527,9 +527,9 @@ 2 4241 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -561,9 +561,9 @@ 5090 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -590,9 +590,9 @@ 5105 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -618,9 +618,9 @@ 2 8369 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -652,9 +652,9 @@ 2 41113 9984 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -677,9 +677,9 @@ 4 62817 9984 - 20220628 16:40 + 20230703 11:30 20050208 17:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2005-02-08 17:19:00 @@ -702,9 +702,9 @@ 4 61541 9984 - 20220628 16:40 + 20230703 11:30 20050208 17:19 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2005-02-08 17:19:00 @@ -730,9 +730,9 @@ 2 41193 9984 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -758,9 +758,9 @@ 1 43673 9984 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -780,9 +780,9 @@ 2 2372 58 - 20220628 16:40 + 20230703 11:30 20060302 02:01 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-03-02 02:01:00 @@ -799,9 +799,9 @@ 11 9977 726 - 20220628 16:40 + 20230703 11:30 20060707 08:37 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-07-07 08:37:00 @@ -818,9 +818,9 @@ 11 14755 726 - 20220628 16:40 + 20230703 11:30 20060707 08:37 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-07-07 08:37:00 @@ -851,9 +851,9 @@ 2 3620 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -888,9 +888,9 @@ 2 5742 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -916,9 +916,9 @@ 16 8992545 1388544 - 20220628 16:40 + 20230703 11:30 20090623 16:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-06-23 16:20:00 @@ -935,9 +935,9 @@ 27 4650 324 - 20220628 16:40 + 20230703 11:30 20090708 12:44 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-07-08 12:44:00 @@ -951,9 +951,9 @@ 58 3476 58 - 20220628 16:40 + 20230703 11:30 20090708 12:44 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-07-08 12:44:00 @@ -984,9 +984,9 @@ 2 5091 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1012,9 +1012,9 @@ 2 8697 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1040,9 +1040,9 @@ 2 8368 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1068,9 +1068,9 @@ 2 5714 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1102,9 +1102,9 @@ 4036 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1128,9 +1128,9 @@ 2720 24 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1153,9 +1153,9 @@ 2 1933 24 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1181,9 +1181,9 @@ 2 2989 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1209,9 +1209,9 @@ 2 3158 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1238,9 +1238,9 @@ 2990 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1267,9 +1267,9 @@ 3087 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1295,9 +1295,9 @@ 2 3294 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1323,9 +1323,9 @@ 2 3292 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1351,9 +1351,9 @@ 2 3820 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1380,9 +1380,9 @@ 4225 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1413,9 +1413,9 @@ 2 2085 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1441,9 +1441,9 @@ 2 2086 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1469,9 +1469,9 @@ 2 2098 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1497,9 +1497,9 @@ 2 2098 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1525,9 +1525,9 @@ 2 2098 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1553,9 +1553,9 @@ 2 2201 96 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2006-02-09 15:20:00 @@ -1586,9 +1586,9 @@ 2 151034 33936 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -1608,9 +1608,9 @@ 6 1922 90 - 20220628 16:40 + 20230703 11:30 20070215 09:51 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2007-02-15 09:51:00 @@ -1636,9 +1636,9 @@ 2 4201 288 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -1664,9 +1664,9 @@ 3 5232 432 - 20220628 16:40 + 20230703 11:30 20060209 15:20 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 15:20:00 @@ -1693,9 +1693,9 @@ 4293 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1719,9 +1719,9 @@ 1715 24 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1747,9 +1747,9 @@ 2 3294 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1775,9 +1775,9 @@ 9 16124 3240 - 20220628 16:40 + 20230703 11:30 20060209 11:31 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-02-09 11:31:00 @@ -1803,9 +1803,9 @@ 2 2895 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -1827,9 +1827,9 @@ 13 2993 117 - 20220628 16:40 + 20230703 11:30 20090604 09:58 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2009-06-04 09:58:00 @@ -1867,9 +1867,9 @@ 2 5091 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1895,9 +1895,9 @@ 2 8371 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1923,9 +1923,9 @@ 2 8368 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1951,9 +1951,9 @@ 2 5714 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -1989,9 +1989,9 @@ 2 8697 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -2027,9 +2027,9 @@ 5090 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2056,9 +2056,9 @@ 5105 48 true - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2084,9 +2084,9 @@ 2 8369 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2109,9 +2109,9 @@ 11 14755 726 - 20220628 16:40 + 20230703 11:30 20060707 08:37 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2006-07-07 08:37:00 @@ -2146,9 +2146,9 @@ 2 5742 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:24 2004-02-12 16:28:00 @@ -2180,9 +2180,9 @@ 2 5091 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2208,9 +2208,9 @@ 2 8697 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2236,9 +2236,9 @@ 2 8368 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 @@ -2264,9 +2264,9 @@ 2 5714 48 - 20220628 16:40 + 20230703 11:30 20040212 16:28 - 2022-06-28 16:40:57 + 2023-07-03 11:30:25 2004-02-12 16:28:00 diff --git a/PXWeb/Resources/Styles/main-pxweb.css b/PXWeb/Resources/Styles/main-pxweb.css index 48e6a3f78..d672f9af5 100644 --- a/PXWeb/Resources/Styles/main-pxweb.css +++ b/PXWeb/Resources/Styles/main-pxweb.css @@ -3528,6 +3528,12 @@ $scrollbar-color: #b0b0b0; margin-top: 5px; } +#pxwebcontent .tablequery_V2caption { + font-size: 20px; + display: block; + font-weight: bold; +} + #pxwebcontent .tablequery_url { display: block; width: 95%; @@ -3567,13 +3573,16 @@ $scrollbar-color: #b0b0b0; color: #fff; } +#pxwebcontent .tablequery_copy { +} + /* ********************************** _tablequery.scss TODO in real use? *********************************** */ #pxwebcontent .textsearch select { - margin: 10px 0; - height: 100px; - width: 164px; - clear: both; - display: block; + margin: 10px 0; + height: 100px; + width: 164px; + clear: both; + display: block; } #pxwebcontent .textsearch input[type=text] { diff --git a/PXWeb/Resources/Styles/scss/pxweb/_tablequery.scss b/PXWeb/Resources/Styles/scss/pxweb/_tablequery.scss index a96b0cbeb..988f289bf 100644 --- a/PXWeb/Resources/Styles/scss/pxweb/_tablequery.scss +++ b/PXWeb/Resources/Styles/scss/pxweb/_tablequery.scss @@ -17,12 +17,17 @@ font-weight: bold; margin-top: 5px; } +#pxwebcontent .tablequery_V2caption { + font-size: 20px; + display: block; + font-weight: bold; +} #pxwebcontent .tablequery_url { - display: block; - width: 95%; - @include SourceCodeProTablequery_url; - font-size: 14px; + display: block; + width: 95%; + @include SourceCodeProTablequery_url; + font-size: 14px; } #pxwebcontent .tablequery_querycaption { @@ -54,3 +59,9 @@ background: $pxweb-green-4; color: $pxweb-white; } + +#pxwebcontent #urlV2container { + width: 100%; + display: flex; + flex-direction: column; +} \ No newline at end of file From f48fec670e889ba494e614ea86bf02455fd7c820 Mon Sep 17 00:00:00 2001 From: petroslikidis Date: Mon, 28 Aug 2023 12:43:30 +0200 Subject: [PATCH 5/7] Uses Matrix when PX file --- PCAxis.Web.Controls/Query/TableQueryCodebehind.vb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb index 877a1ca86..b7f16b6a9 100644 --- a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb +++ b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb @@ -272,6 +272,12 @@ Public Class TableQueryCodebehind Dim builder As IPXModelBuilder = PaxiomManager.PaxiomModelBuilder() Dim model As PXModel = PaxiomManager.PaxiomModel Dim tableId As String = model.Meta.TableID + + 'If PX file the Matrix should be used as tabled identifier + If TypeOf PaxiomManager.PaxiomModelBuilder Is PXFileBuilder Then + tableId = model.Meta.Matrix + End If + sb.Append(tableId) sb.Append("/data") From 0066866eb466ace3831c0d6f463ae451af35f28d Mon Sep 17 00:00:00 2001 From: likp Date: Mon, 28 Aug 2023 13:21:07 +0200 Subject: [PATCH 6/7] With API2 query help for Px files --- PCAxis.Web.Controls/Query/TableQueryCodebehind.vb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb index b7f16b6a9..0a05228aa 100644 --- a/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb +++ b/PCAxis.Web.Controls/Query/TableQueryCodebehind.vb @@ -253,11 +253,6 @@ Public Class TableQueryCodebehind ''' Private Sub ShowApiV2URL() Dim sb As New System.Text.StringBuilder() - If Marker.DatabaseType = PCAxis.Web.Core.Enums.DatabaseType.PX Then - txtUrlV2.Text = "-" - Return - End If - Dim route As String If Not Marker.URLRootV2 Is Nothing Then route = Marker.URLRootV2.Replace("\", "/") @@ -274,7 +269,7 @@ Public Class TableQueryCodebehind Dim tableId As String = model.Meta.TableID 'If PX file the Matrix should be used as tabled identifier - If TypeOf PaxiomManager.PaxiomModelBuilder Is PXFileBuilder Then + If Marker.DatabaseType = PCAxis.Web.Core.Enums.DatabaseType.PX Then tableId = model.Meta.Matrix End If From 4571093d4f0d3dd3a78f61d724f31f7ccfb04a8b Mon Sep 17 00:00:00 2001 From: MikaelNordberg Date: Thu, 31 Aug 2023 15:07:57 +0200 Subject: [PATCH 7/7] Changed version to PxWeb 2023 Beta1 --- PXWeb/Properties/AssemblyInfo.cs | 6 +++--- PXWeb/Resources/Languages/pxlang.da.xml | 2 +- PXWeb/Resources/Languages/pxlang.fi.xml | 2 +- PXWeb/Resources/Languages/pxlang.kl.xml | 2 +- PXWeb/Resources/Languages/pxlang.sv.xml | 6 +++--- PXWeb/Resources/Languages/pxlang.xml | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PXWeb/Properties/AssemblyInfo.cs b/PXWeb/Properties/AssemblyInfo.cs index f67b87559..2082a2697 100644 --- a/PXWeb/Properties/AssemblyInfo.cs +++ b/PXWeb/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SCB")] [assembly: AssemblyProduct("PXWeb")] -[assembly: AssemblyCopyright("Copyright © SCB 2022")] +[assembly: AssemblyCopyright("Copyright © SCB 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,6 +31,6 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("22.1.0.*")] -[assembly: AssemblyFileVersion("22.1.0.0")] +[assembly: AssemblyVersion("23.0.0.*")] +[assembly: AssemblyFileVersion("23.0.0.0")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/PXWeb/Resources/Languages/pxlang.da.xml b/PXWeb/Resources/Languages/pxlang.da.xml index f34a8f9c8..1c28f7dd4 100644 --- a/PXWeb/Resources/Languages/pxlang.da.xml +++ b/PXWeb/Resources/Languages/pxlang.da.xml @@ -611,7 +611,7 @@ - + diff --git a/PXWeb/Resources/Languages/pxlang.fi.xml b/PXWeb/Resources/Languages/pxlang.fi.xml index 8483ff1dc..5aad21687 100644 --- a/PXWeb/Resources/Languages/pxlang.fi.xml +++ b/PXWeb/Resources/Languages/pxlang.fi.xml @@ -637,7 +637,7 @@ - + diff --git a/PXWeb/Resources/Languages/pxlang.kl.xml b/PXWeb/Resources/Languages/pxlang.kl.xml index 9bdfaa2e1..da5d43b09 100644 --- a/PXWeb/Resources/Languages/pxlang.kl.xml +++ b/PXWeb/Resources/Languages/pxlang.kl.xml @@ -611,7 +611,7 @@ - + diff --git a/PXWeb/Resources/Languages/pxlang.sv.xml b/PXWeb/Resources/Languages/pxlang.sv.xml index 9018e9590..4b1e13eca 100644 --- a/PXWeb/Resources/Languages/pxlang.sv.xml +++ b/PXWeb/Resources/Languages/pxlang.sv.xml @@ -535,8 +535,8 @@ - - + + @@ -657,7 +657,7 @@ - + diff --git a/PXWeb/Resources/Languages/pxlang.xml b/PXWeb/Resources/Languages/pxlang.xml index 3d30cabe9..422894008 100644 --- a/PXWeb/Resources/Languages/pxlang.xml +++ b/PXWeb/Resources/Languages/pxlang.xml @@ -689,8 +689,8 @@ - - + + @@ -831,7 +831,7 @@ - +