Skip to content

Commit 82867d7

Browse files
committed
Form polling update
1 parent 7c45abe commit 82867d7

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormPollingController.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,9 @@ public List<Dictionary<string, string>> GetFormPropertiesById(string id)
4141

4242
var form = _zapierFormService.GetById(id);
4343

44-
var latestFormRecord = _recordStorage.GetAllRecords(form)
45-
.OrderByDescending(p => p.Created)
46-
.FirstOrDefault();
47-
48-
return form != null && latestFormRecord != null
49-
? new List<Dictionary<string, string>>
50-
{form.ToFormDictionary(latestFormRecord, _umbUrlHelper.GetPageUrl(latestFormRecord.UmbracoPageId))}
51-
: new List<Dictionary<string, string>>();
44+
if (form == null) return new List<Dictionary<string, string>>();
45+
46+
return new List<Dictionary<string, string>> { form.ToEmptyFormDictionary() };
5247
}
5348
}
5449
}

src/Umbraco.Forms.Integrations.Automation.Zapier/Extensions/FormExtensions.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,24 @@ public static Dictionary<string, string> ToFormDictionary(this Form form, Record
2626
return contentDict;
2727
}
2828

29+
public static Dictionary<string, string> ToEmptyFormDictionary(this Form form)
30+
{
31+
var contentDict = new Dictionary<string, string>
32+
{
33+
{ Constants.FormProperties.Id, form.Id.ToString() },
34+
{ Constants.FormProperties.Name, form.Name },
35+
{ Constants.FormProperties.SubmissionDate, DateTime.UtcNow.ToString("s") },
36+
{ Constants.FormProperties.PageUrl, string.Empty }
37+
};
38+
39+
foreach (var field in form.AllFields)
40+
{
41+
contentDict.Add(field.Alias, string.Empty);
42+
}
43+
44+
return contentDict;
45+
}
46+
2947
public static Dictionary<string, string> ToFormDictionary(this Form form)
3048
{
3149
var contentDict = new Dictionary<string, string>

src/Umbraco.Forms.Integrations.Automation.Zapier/Umbraco.Forms.Integrations.Automation.Zapier.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageIconUrl></PackageIconUrl>
1212
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
14-
<Version>2.0.0</Version>
14+
<Version>2.0.1</Version>
1515
<Authors>Umbraco HQ</Authors>
1616
<Company>Umbraco</Company>
1717
</PropertyGroup>

0 commit comments

Comments
 (0)