From 2ec7d0e1843d7106d78b5604d0dfbd6f4e9050c7 Mon Sep 17 00:00:00 2001
From: "support@subpointsolutions.com" <support@subpointsolutions.com>
Date: Sat, 8 Oct 2016 20:13:40 -0700
Subject: [PATCH] + Add AdvancedSearchBoxDefinition - support AdvancedSearchBox
 webpart provision #857 + CSOM impl and tests

---
 .../Webparts/AdvancedSearchBoxModelHandler.cs | Bin 2428 -> 11082 bytes
 .../AdvancedSearchBoxDefinitionGenerator.cs   | Bin 1484 -> 3918 bytes
 .../Webparts/AdvancedSearchBoxValidator.cs    | Bin 2920 -> 42126 bytes
 .../WebpartDefinitionCoverageTest2.cs         |  11 ++++-
 SPMeta2/SPMeta2/SPMeta2.csproj                |   1 +
 .../AdvancedSearchBoxWebPartXmlExtensions.cs  |  39 ++++++++++++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 SPMeta2/SPMeta2/Utils/AdvancedSearchBoxWebPartXmlExtensions.cs

diff --git a/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/Webparts/AdvancedSearchBoxModelHandler.cs b/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/Webparts/AdvancedSearchBoxModelHandler.cs
index 12de272e101176406cc2825de3d5ba6180c7f005..43054bbd0ae9e7f15ec5094a853f4e867a1d6bca 100644
GIT binary patch
literal 11082
zcmdT~-&4~-5Z-5J{2wB`lo=-vK8iAffXIkYEr_r5htM%JwN1s2<G-$c-<?O2np`ds
z(qx#D<dWUn{l2}uyG?%oTF6|+GLb9sq$f*UMKY2b*_OxhNYZz^@(%YRxs+$(%O0LT
zMT?JLC_~%{<PGjka30`l23=LPgvt&V`F-^CS$QyqWn)+}fvhjDV96Z!iY+*R!~!1E
z;>(1NV#%Jug8p7Yc8Ff{ths>pzD(6~krOWG%97yjS+X&KJnft-O#_^fvpiP*wJx70
zUsf$-e?L?Vc<6<HQ=rrbvtt?HYJf8$JjeMieE){430g-u@8LfY8OSww2<3Zjgn05C
z^1AP?l8JJkrA5Y;v}LAs6Mc>l$vO&XqmG6M?F(E*xMoyRQ&O9ePkUJ1tB!1C>d&^?
z^xgwnA?yr*;5n=ut>8jFY5z#x;<uF7>godCe!-9EU7_8Rm-uOqP4t@{%<*R~0-Mml
zcuwM&ht?|EQ%Hq~5{@H|M8;{JY#Qkh(L<>jq?kuMIfH-H#4|<`J&W#Iv$(TktK~gJ
zv<Gd}wZL(rkkUPc$RZtwNX{DJTgWn=XjBcx=J+sJGYdp2UWQhb$q4f~W1l0_!}TiG
z%=koJ&jE)@b2=M*Le>c~b6ZD_AxRBKs)w7@=+#-=Q#r%_%u`sF&H`CDo1E^+Ev)RT
zm}jiTd9BL0W9FJAB4L=&r$<v>Z_JvUb*>RN%!E4fchv~mgI4<dqGC+#AR0G-yO~)x
zgc#A*0I{pb`A(|Emk((Fio0VK<0p#y6O~Z{XxqZyc4l5Ov1*XG#n{uFYyY#N;Q(2k
zF~!-|%(_|Q(&#ov9}yG6i{W3s&75drEJUp8*?0o|9n2r}C&2j;`bx*h8T!A0t(=Ky
z3+MgftZh)RSvy8H@X-4c#i1D;K5UqaLG%<TAE^E#WUCG=(3vC|KeUJW^gX;_bS#m>
zMhZDSFCN44K3amicCuu%%-|Sv<g58M!dh&Gd1H#+G#bT7q|xj`KF;6tXrr|CI!f;g
z2_3CAH13b5eMA}8Rg9&j94agpxNa67c~;tR&y%Tl95B*3!z^&*Y&=IEXm;$oSZu@H
zMZR7R^o-EfTvXP28#iTj)yoqzd0Sa3XS<D~a+>O8sEaips|8&1wUw!AKG+zmrm<e;
zidRMHb&%f2Hft4-Wuc9isy^4b{>t)+btLXw_5Pyi>xC*F*jTHguiml5{pK7iI_}O)
z#ir>jx!G*v#Z5!KO!P2L^xm!M_}eVCp>C5~7uM~{Pcec;cDwOVq@`|F;&%?o5o+q<
z=ctYyH*7ag1kHPre4FiTxM(QDM0V{)zni!%s0aD#{oh<Z!Yf^+Y*H=D%?CT$d_z-=
zLhQefc`-zNF0Qb%4y#*P2W4e>hDuvpn{}yn**RLRJDj45W!6xvkn$aE(>b#H;KGqz
zgP(}eb#P>_KeU4*yALiL*)^=2BU}BU9Sqq#aN)-$zixJ1Y7OmR$;A^Fwp{eApS9#W
zCS6-euOr*SS&<)Zj1_5FH($wBsoCLoQI8qmn-i{F+QC+l7cN{C=~y>Y@$RlIYrLez
zE(|1}e|WV2|INR7(;vSdNN2jHS8B@JZ)35%HkV!N3|T1tmMi&9MAp75`|FqTUuc<c
JFtnup{|8Eq5_kXr

delta 81
zcmX>V_D5*LIi|^c%%3Kk$%{-r$0V@Xhvfhhb2&r7W>I!#CUt!VeFg=F5C(q+7a-OF
hvI`iB81fmC8B!UFflz@Vg29);XR@KZ;^YHbT>!Gt6nOvu

diff --git a/SPMeta2/SPMeta2.Containers.Standard/DefinitionGenerators/Webparts/AdvancedSearchBoxDefinitionGenerator.cs b/SPMeta2/SPMeta2.Containers.Standard/DefinitionGenerators/Webparts/AdvancedSearchBoxDefinitionGenerator.cs
index 718366f014237f0dcd9beba09c29ce92e9abc2b1..cdca4738f81eae077712185b8ed3f73598fe886d 100644
GIT binary patch
literal 3918
zcmc&$O>f#j5Pj!L{SQ`7<U-mW+cZ+rv{j_ExPhutZUIb!N-(lbT2$q)H+?gBfQ1E{
z#w4=jU9WfN&Aj>AhreT_=wpa$1ZZNyuM81x@eVKX0`A`sU-&P>72cqZ4~ThAzT|v_
zglFrNA+tNKbvToi6YfYkFP3=9T|Jf7r`*2EPfMI@sun|ZiInhNhhI`1KZwxANcUyb
zYO0f1I^^1|YAk<6cj2R)#lk@m`e#a<vUEjl<D9K!eMFN#%6ve4c}Da>8w2Gtpk4!F
zrF;S$)6zRd7HzxAyx8Bt4LOhT+sneL9s%A`T8q9PsT?17tEXH)n~x9wQ>!D#W|sj!
z6ESU<NK42}m$SfYt?3oOwIISp?z5O)_gP${C7oFm9(wnf^dq86%vj9sJJy)~eyi+n
zLK`yrI$@Lqj8n;g8+@d8BhDsX{F++c<No(>88oRjZpOA<!efuwb4Ix$GayS6*OJwl
zGA(tYhW$Km?A*H1<h9hAfqJP}s^q{riMDQ%FSSNQ3mWg?6ImSa3F(t-V(x9J?OdkV
z9x;zxF3!kFMiyS<6(8eb8?BF()o;{OB6z~w6O=5^+H>mN=E`8U?&3er7pL?^%9xTm
zGGSIEWN^&yDlx<YiIj2fffT#7=__r>@H~7r$l&uJhpZ0?8J6B!tp;Uc`2YuunHCzX
zObu_nvs|@NPFUU+_pVSQQ#w*Y-}X65&nvDThPG}r4Se#Yr_HPQZe#XBEs{!=&3f-{
z5u3Cv)*k;<I8Vu^VA<_wkz4Bm-`UH~OGQwb=(i|pG6!S);$1;{#kwqX<5uowG5x-M
zA2l@b-(r1j=pDiC%T=RouC7(1ZK|hLW0k3()niJ>b?cg&CsiXZW`o`GLsrxdellm0
rrJQ(tbk6I{a>ZViy-lv!Eoq)*E^pOVwfou4Zn=}(JKb*jHGTgBg2ykQ

delta 15
WcmX>ncZPdI9_wT)4z0;j{3ZY{$^_N`

diff --git a/SPMeta2/SPMeta2.Regression.CSOM.Standard/Validation/Webparts/AdvancedSearchBoxValidator.cs b/SPMeta2/SPMeta2.Regression.CSOM.Standard/Validation/Webparts/AdvancedSearchBoxValidator.cs
index 475ef16740fc313dc06c4b17cb9471ce65b4bb65..2e034ef0493ca1fa1fb55bcf174ced6e85669a88 100644
GIT binary patch
literal 42126
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

delta 38
pcmeA>$@D^O!vdzwub3)0CMR*qOg7Mynk*2-$5YF|%fQ6|Apr<@3M~Kt

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/DefinitionCoverage/WebpartDefinitionCoverageTest2.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/DefinitionCoverage/WebpartDefinitionCoverageTest2.cs
index 12d85ef2b..9c8011330 100644
--- a/SPMeta2/SPMeta2.Regression.Tests/Impl/DefinitionCoverage/WebpartDefinitionCoverageTest2.cs
+++ b/SPMeta2/SPMeta2.Regression.Tests/Impl/DefinitionCoverage/WebpartDefinitionCoverageTest2.cs
@@ -80,7 +80,7 @@ public static void Cleanup()
 		public static bool UseSubWebs = true;
 
 		public static bool UseApps = false;
-
+        
 		#endregion
 
         #region pre-generated tests
@@ -284,6 +284,15 @@ public void CanDeploy_XsltListViewWebPartDefinition_To_AllPageTypes()
         }
 		
 
+		[TestMethod]
+        [TestCategory("Regression.DefinitionCoverage.WebpartDefinitions")]
+		[SiteCollectionIsolation]
+        public void CanDeploy_AdvancedSearchBoxDefinition_To_AllPageTypes() 
+        {
+            DeployWebpartOnSupportedHosts<AdvancedSearchBoxDefinition>();
+        }
+		
+
 		[TestMethod]
         [TestCategory("Regression.DefinitionCoverage.WebpartDefinitions")]
 		[SiteCollectionIsolation]
diff --git a/SPMeta2/SPMeta2/SPMeta2.csproj b/SPMeta2/SPMeta2/SPMeta2.csproj
index 6c3f3677d..1959dfeef 100644
--- a/SPMeta2/SPMeta2/SPMeta2.csproj
+++ b/SPMeta2/SPMeta2/SPMeta2.csproj
@@ -595,6 +595,7 @@
     <Compile Include="Utils\ConvertUtils.cs" />
     <Compile Include="Utils\CultureUtils.cs" />
     <Compile Include="Utils\IndexedPropertyUtils.cs" />
+    <Compile Include="Utils\AdvancedSearchBoxWebPartXmlExtensions.cs" />
     <Compile Include="Utils\PageViewerWebPartXmlExtensions.cs" />
     <Compile Include="Utils\ListViewWebPartXmlExtensions.cs" />
     <Compile Include="Utils\ContentEditorWebPartXmlExtensions.cs" />
diff --git a/SPMeta2/SPMeta2/Utils/AdvancedSearchBoxWebPartXmlExtensions.cs b/SPMeta2/SPMeta2/Utils/AdvancedSearchBoxWebPartXmlExtensions.cs
new file mode 100644
index 000000000..b5fe93d42
--- /dev/null
+++ b/SPMeta2/SPMeta2/Utils/AdvancedSearchBoxWebPartXmlExtensions.cs
@@ -0,0 +1,39 @@
+using System.Xml.Linq;
+
+namespace SPMeta2.Utils
+{
+    /// <summary>
+    /// Helper class to work with AdvancedSearchBoxWebPart xml properties.
+    /// Allows to props with xmlns="urn:schemas-microsoft-com:AdvancedSearchBox"
+    /// </summary>
+    public static class AdvancedSearchBoxWebPartXmlExtensions
+    {
+        #region properties
+
+        private const string XmlNs = "urn:schemas-microsoft-com:AdvancedSearchBox";
+
+        #endregion
+
+        #region methods
+
+        public static string GetAdvancedSearchBoxWebPartProperty(this XDocument webpartXmlDocument, string propName)
+        {
+            return webpartXmlDocument.GetProperty(propName, XmlNs);
+        }
+
+        public static XDocument SetOrUpdateAdvancedSearchBoxWebPartProperty(this XDocument webpartXmlDocument,
+            string propName,
+            string propValue)
+        {
+            return SetOrUpdateAdvancedSearchBoxWebPartProperty(webpartXmlDocument, propName, propValue, false);
+        }
+
+        public static XDocument SetOrUpdateAdvancedSearchBoxWebPartProperty(this XDocument webpartXmlDocument, string propName,
+            string propValue, bool isCData)
+        {
+            return webpartXmlDocument.SetOrUpdateProperty(propName, propValue, "string", XmlNs, isCData);
+        }
+
+        #endregion
+    }
+}