- Msic fixes

microsoft-search · Jan 15, 2024 · 79d9664 · 79d9664
1 parent 86b104a
commit 79d9664
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 294 deletions.
diff --git a/...es/components/src/components/search-filters/sub-components/filters/BaseFilterComponent.ts b/...es/components/src/components/search-filters/sub-components/filters/BaseFilterComponent.ts
@@ -141,7 +141,7 @@ export abstract class BaseFilterComponent extends BaseComponent {
                     </fast-button>
                    
                     <fast-anchored-region                             
-                        class=${`${this.isExpanded ? "visible " : "invisible"} z-10`}
+                        class=${`${this.isExpanded ? "visible " : "invisible"} z-10 border-style: solid`}
                         .anchorElement=${this.renderRoot.querySelector("[id='filter-anchor'")}
                         @mousedown=${(e: Event) => {
                             e.preventDefault();

diff --git a/...arch-filters/sub-components/filters/checkbox-filter/tests/CheckboxFilterComponent.test.ts b/...arch-filters/sub-components/filters/checkbox-filter/tests/CheckboxFilterComponent.test.ts
@@ -212,7 +212,7 @@ describe("pnp-checkbox-filter ", () => {
           item.click();
         });
 
-       el.requestUpdate();
+        el.requestUpdate();
         await elementUpdated(el);
 
         assert.isNotNull(getResetButton(el));
@@ -222,7 +222,7 @@ describe("pnp-checkbox-filter ", () => {
         onApplyFiltersSpy.resetHistory();
 
         // Needed to be able to click on the "apply" button (disabled otherwise)
-       el.requestUpdate();
+        el.requestUpdate();
         await elementUpdated(el);
 
         // Apply filters

diff --git a/...rc/components/search-filters/sub-components/search-sort/tests/SearchSortComponent.test.ts b/...rc/components/search-filters/sub-components/search-sort/tests/SearchSortComponent.test.ts
@@ -112,7 +112,7 @@ describe("pnp-search-sort", () => {
             `);
 
             getSortFieldOption(el, "Relevance")?.click();
-           el.requestUpdate();
+            el.requestUpdate();
             await elementUpdated(el);
 
             assert.isEmpty(onSort.getCall(0).args[0]); // Should be an empty array

diff --git a/packages/components/src/components/search-filters/tests/SearchFiltersComponent.test.ts b/packages/components/src/components/search-filters/tests/SearchFiltersComponent.test.ts
@@ -190,7 +190,7 @@ describe("pnp-search-filters", () => {
     assert.isNotNull(getDebugBarBtn(el));
     getDebugBarBtn(el)?.click();
 
-    await el.requestUpdate();
+    el.requestUpdate();
     await elementUpdated(el);
 
     assert.isNotNull(getMonacoEditor(el));

diff --git a/packages/components/src/components/search-results/SearchResultsComponent.ts b/packages/components/src/components/search-results/SearchResultsComponent.ts
@@ -1180,6 +1180,7 @@ export class SearchResultsComponent extends BaseComponent {
                 this.tokenService.setTokenValue(BuiltinTokenNames.searchTerms, searchKeywords);
 
                 this.searchQuery.requests[0].query.queryString = searchKeywords;
+                this.searchQuery.requests[0].query.queryTemplate = this.tokenService.resolveTokens(this.queryTemplate);
 
                 this.resetFilters();
                 this.resetPagination();

diff --git a/packages/components/src/components/search-verticals/tests/SearchVerticalsComponent.test.ts b/packages/components/src/components/search-verticals/tests/SearchVerticalsComponent.test.ts
@@ -29,7 +29,7 @@ describe("pnp-search-verticals", async () => {
       window.history.pushState({path:newUrl}, "", newUrl);
 
       LocalizationHelper.strings = stringsEn;
-     el.requestUpdate();
+      el.requestUpdate();
       await elementUpdated(el);
     });
 
@@ -110,7 +110,7 @@ describe("pnp-search-verticals", async () => {
     assert.equal(el?.querySelector<HTMLDivElement>("div[data-ref='vertical-selected']")?.innerText, "tab1");  
 
     el?.querySelector<HTMLDivElement>("div[data-ref='vertical-tab-tab2']")?.click();
-    await el.requestUpdate();
+    el.requestUpdate();
     await elementUpdated(el);
 
     assert.equal(el?.querySelector<HTMLDivElement>("div[data-ref='vertical-selected']")?.innerText, "tab2"); 

diff --git a/packages/components/src/helpers/SearchResultsHelper.ts b/packages/components/src/helpers/SearchResultsHelper.ts
@@ -32,7 +32,7 @@ export enum WellKnownSearchProperties {
 export const sanitizeSummary = (summary: string) => {
     // Special case with HitHighlightedSummary field
     // eslint-disable-next-line no-useless-escape
-    return summary.replace(/<c0\>/g, `<span style='color:var(${ThemeInternalCSSVariables.colorPrimary});font-weight:600'>`).replace(/<\/c0\>/g, "</span>").replace(/<ddd\/>/g, "&#8230;");
+    return summary?.replace(/<c0\>/g, `<span style='color:var(${ThemeInternalCSSVariables.colorPrimary});font-weight:600'>`).replace(/<\/c0\>/g, "</span>").replace(/<ddd\/>/g, "&#8230;");
 };
 
 export class SearchResultsHelper {

diff --git a/packages/components/tailwind.config.js b/packages/components/tailwind.config.js
@@ -14,6 +14,9 @@ module.exports = {
   darkMode: "class",
   theme: {
     extend: {
+        gridTemplateColumns: {
+          "searchResult": "32px 2fr 0fr"
+        },
         fontFamily: {
           primary: ["var(--pnpsearch-internal-fontFamilyPrimary)","'Segoe  UI'", "'Arial, sans-serif'"],
           sans: ["var(--pnpsearch-internal-fontFamilySecondary)", "Roboto", ...defaultTheme.fontFamily.sans]