From 15f183868ee55613a915154e6813a13292cbd120 Mon Sep 17 00:00:00 2001 From: PooLP Date: Fri, 6 Apr 2018 12:08:21 +0200 Subject: [PATCH 1/5] Correction of hover state for theme color --- .../components/ui-fabric-colortheme.module.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webparts/searchVisualizer/components/ui-fabric-colortheme.module.scss b/src/webparts/searchVisualizer/components/ui-fabric-colortheme.module.scss index 64dc5af..ec29886 100644 --- a/src/webparts/searchVisualizer/components/ui-fabric-colortheme.module.scss +++ b/src/webparts/searchVisualizer/components/ui-fabric-colortheme.module.scss @@ -74,19 +74,19 @@ $colors: ( @each $name, $color-value in $colors { .ms-fontColor-#{$name} { color: $color-value; - &--hover { + &--hover:hover { color: $color-value; } } .ms-bgColor-#{$name} { background-color: $color-value; - &--hover { + &--hover:hover { background-color: $color-value; } } .ms-borderColor-#{$name} { border-color: $color-value; - &--hover { + &--hover:hover { border-color: $color-value; } } From 6f44b05018423719cb7b3f7acef3afce15b381d7 Mon Sep 17 00:00:00 2001 From: PooLP Date: Fri, 13 Apr 2018 13:49:43 +0200 Subject: [PATCH 2/5] Add a search token helper to get current page --- README.md | 1 + config/package-solution.json | 2 +- package-lock.json | 22 ++++++++++++++++++ .../helpers/SearchTokenHelper.ts | 4 ++++ .../searchVisualizer/helpers/VariousHelper.ts | 23 +++++++++++++++++++ src/webparts/searchVisualizer/loc/en-us.js | 2 +- src/webparts/searchVisualizer/loc/fr-fr.js | 2 +- 7 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 src/webparts/searchVisualizer/helpers/VariousHelper.ts diff --git a/README.md b/README.md index 64c5fcd..1d3594d 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ In the query field, you can enter your own queries like: But you can also use search tokens like: - `{Site}` - `{SiteCollection}` +- `{CurrentPage}` - `{Today}` or `{Today+Number}` or `{Today-Number}` - `{CurrentDisplayLanguage}` - `{User}` diff --git a/config/package-solution.json b/config/package-solution.json index d6f566f..a6eb25d 100644 --- a/config/package-solution.json +++ b/config/package-solution.json @@ -3,7 +3,7 @@ "solution": { "name": "react-handlebars-search-client-side-solution", "id": "490f3be2-7e8a-4fe5-8d6b-49ae5d7c4a2e", - "version": "1.0.0.4", + "version": "1.0.0.13", "title": "Search result visualizer", "supportedLocales": [ "en-US", diff --git a/package-lock.json b/package-lock.json index ff3fb53..23751e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1205,6 +1205,23 @@ "tslib": "1.8.1" } }, + "@microsoft/sp-office-ui-fabric-core": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@microsoft/sp-office-ui-fabric-core/-/sp-office-ui-fabric-core-1.4.1.tgz", + "integrity": "sha1-sTXjdC/q8cpkvB5n9PoXsC+b9MM=", + "requires": { + "@types/webpack-env": "1.13.1", + "office-ui-fabric-core": "9.1.0", + "tslib": "1.8.1" + }, + "dependencies": { + "@types/webpack-env": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.1.tgz", + "integrity": "sha512-oHyg0NssP2RCpCvE35hhbSqMJRsc5lSW+GFe+Vc65JL+kHII1VMYM+0KeV/z4utFuUqPoQRmq8KMMp7ba0dj6Q==" + } + } + }, "@microsoft/sp-page-context": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@microsoft/sp-page-context/-/sp-page-context-1.4.1.tgz", @@ -12580,6 +12597,11 @@ "resolved": "https://registry.npmjs.org/office-ui-fabric/-/office-ui-fabric-2.6.1.tgz", "integrity": "sha1-4qyf8+T8eI2mYReN6/CUA2sKLiY=" }, + "office-ui-fabric-core": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/office-ui-fabric-core/-/office-ui-fabric-core-9.1.0.tgz", + "integrity": "sha512-VwGbHIT89e+9XdGcb2gdPgKgYQGjRG5peyPNO982znlCSB/UIM9g7gF6JmHpaMHb8xvEScY7UGJ8GRz6GQVBRg==" + }, "office-ui-fabric-react": { "version": "5.21.0", "resolved": "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-5.21.0.tgz", diff --git a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts index dc33e8d..943381c 100644 --- a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts +++ b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts @@ -36,6 +36,10 @@ export default class SearchTokenHelper { case "{currentdisplaylanguage}": restUrl = restUrl.replace(/{currentdisplaylanguage}/ig, this._context.pageContext.cultureInfo.currentCultureName); break; + case "{currentpage}": + restUrl = restUrl.replace(/{currentpage}/ig, (window.location.pathname).replace(/\..+$/, '')); + console.log(restUrl); + break; } } }); diff --git a/src/webparts/searchVisualizer/helpers/VariousHelper.ts b/src/webparts/searchVisualizer/helpers/VariousHelper.ts new file mode 100644 index 0000000..dd2579d --- /dev/null +++ b/src/webparts/searchVisualizer/helpers/VariousHelper.ts @@ -0,0 +1,23 @@ +import { IWebPartContext } from '@microsoft/sp-webpart-base'; + +/** + * Various helpers + */ +export default class VariousHelpers { + constructor(private _context: IWebPartContext) {} + + /** + * Return the URL Parameter + * @param paramToRetrieve + */ + public getQueryStringParameter(paramToRetrieve) { + if (document.URL.split("?").length > 1) { + let params = document.URL.split("?")[1].split("&"); + for (let i = 0; i < params.length; i = i + 1) { + let singleParam = params[i].split("="); + if (singleParam[0] == paramToRetrieve) + return decodeURIComponent(singleParam[1]); + } + } + } +} diff --git a/src/webparts/searchVisualizer/loc/en-us.js b/src/webparts/searchVisualizer/loc/en-us.js index 6ca249f..8f6a003 100644 --- a/src/webparts/searchVisualizer/loc/en-us.js +++ b/src/webparts/searchVisualizer/loc/en-us.js @@ -5,7 +5,7 @@ define([], function () { 'TemplateGroupName': 'Template settings', 'TitleFieldLabel': 'Web part title', 'QueryFieldLabel': 'Specify your search query', - 'QueryFieldDescription': 'You can make use of following tokens: {Site} - {SiteCollection} - {Today} or {Today+NR} or {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email}', + 'QueryFieldDescription': 'You can make use of following tokens: {Site} - {SiteCollection} - {CurrentPage} - {Today} or {Today+NR} or {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email}', 'FieldsMaxResults': 'Number of results to render', 'SortingFieldLabel': 'Sorting (MP:ascending or descending) - example: lastmodifiedtime:ascending,author:descending', 'DebugFieldLabel': 'Show debug output?', diff --git a/src/webparts/searchVisualizer/loc/fr-fr.js b/src/webparts/searchVisualizer/loc/fr-fr.js index 7578346..fef8dd1 100644 --- a/src/webparts/searchVisualizer/loc/fr-fr.js +++ b/src/webparts/searchVisualizer/loc/fr-fr.js @@ -5,7 +5,7 @@ define([], function () { 'TemplateGroupName': 'Paramètres du template', 'TitleFieldLabel': 'Titre du WebPart ', 'QueryFieldLabel': 'Précisez votre requête de recherche', - 'QueryFieldDescription': 'Vous pouvez utiliser les tokens suivants: {Site} - {SiteCollection} - {Today} ou {Today + NR} ou {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email } ', + 'QueryFieldDescription': 'Vous pouvez utiliser les tokens suivants: {Site} - {SiteCollection} - {CurrentPage} - {Today} ou {Today + NR} ou {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email } ', 'FieldsMaxResults': 'Nombre de résultats à afficher', 'SortingFieldLabel': 'Tri (MP:ascending or descending) - exemple: lastmodifiedtime:ascending,author:descending', 'DebugFieldLabel': 'Afficher la sortie de débogage ?', From d3c573b6a617e785fad60ae864ac32521e6145ed Mon Sep 17 00:00:00 2001 From: PooLP Date: Fri, 13 Apr 2018 13:56:17 +0200 Subject: [PATCH 3/5] Remove the console.log() --- src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts index 943381c..ec81bbe 100644 --- a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts +++ b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts @@ -38,7 +38,6 @@ export default class SearchTokenHelper { break; case "{currentpage}": restUrl = restUrl.replace(/{currentpage}/ig, (window.location.pathname).replace(/\..+$/, '')); - console.log(restUrl); break; } } From 82c893e66fdf3bc8c17c95bc63d1560a1da951f7 Mon Sep 17 00:00:00 2001 From: PooLP Date: Thu, 19 Apr 2018 14:14:55 +0200 Subject: [PATCH 4/5] Removed the useless "CurrentPage" Token --- README.md | 1 - src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts | 3 --- src/webparts/searchVisualizer/loc/en-us.js | 2 +- src/webparts/searchVisualizer/loc/fr-fr.js | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1d3594d..64c5fcd 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ In the query field, you can enter your own queries like: But you can also use search tokens like: - `{Site}` - `{SiteCollection}` -- `{CurrentPage}` - `{Today}` or `{Today+Number}` or `{Today-Number}` - `{CurrentDisplayLanguage}` - `{User}` diff --git a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts index ec81bbe..dc33e8d 100644 --- a/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts +++ b/src/webparts/searchVisualizer/helpers/SearchTokenHelper.ts @@ -36,9 +36,6 @@ export default class SearchTokenHelper { case "{currentdisplaylanguage}": restUrl = restUrl.replace(/{currentdisplaylanguage}/ig, this._context.pageContext.cultureInfo.currentCultureName); break; - case "{currentpage}": - restUrl = restUrl.replace(/{currentpage}/ig, (window.location.pathname).replace(/\..+$/, '')); - break; } } }); diff --git a/src/webparts/searchVisualizer/loc/en-us.js b/src/webparts/searchVisualizer/loc/en-us.js index 8f6a003..6ca249f 100644 --- a/src/webparts/searchVisualizer/loc/en-us.js +++ b/src/webparts/searchVisualizer/loc/en-us.js @@ -5,7 +5,7 @@ define([], function () { 'TemplateGroupName': 'Template settings', 'TitleFieldLabel': 'Web part title', 'QueryFieldLabel': 'Specify your search query', - 'QueryFieldDescription': 'You can make use of following tokens: {Site} - {SiteCollection} - {CurrentPage} - {Today} or {Today+NR} or {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email}', + 'QueryFieldDescription': 'You can make use of following tokens: {Site} - {SiteCollection} - {Today} or {Today+NR} or {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email}', 'FieldsMaxResults': 'Number of results to render', 'SortingFieldLabel': 'Sorting (MP:ascending or descending) - example: lastmodifiedtime:ascending,author:descending', 'DebugFieldLabel': 'Show debug output?', diff --git a/src/webparts/searchVisualizer/loc/fr-fr.js b/src/webparts/searchVisualizer/loc/fr-fr.js index fef8dd1..7578346 100644 --- a/src/webparts/searchVisualizer/loc/fr-fr.js +++ b/src/webparts/searchVisualizer/loc/fr-fr.js @@ -5,7 +5,7 @@ define([], function () { 'TemplateGroupName': 'Paramètres du template', 'TitleFieldLabel': 'Titre du WebPart ', 'QueryFieldLabel': 'Précisez votre requête de recherche', - 'QueryFieldDescription': 'Vous pouvez utiliser les tokens suivants: {Site} - {SiteCollection} - {CurrentPage} - {Today} ou {Today + NR} ou {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email } ', + 'QueryFieldDescription': 'Vous pouvez utiliser les tokens suivants: {Site} - {SiteCollection} - {Today} ou {Today + NR} ou {Today-NR} - {CurrentDisplayLanguage} - {User}, {User.Name}, {User.Email } ', 'FieldsMaxResults': 'Nombre de résultats à afficher', 'SortingFieldLabel': 'Tri (MP:ascending or descending) - exemple: lastmodifiedtime:ascending,author:descending', 'DebugFieldLabel': 'Afficher la sortie de débogage ?', From b5fbf182d6e509db4a9ec87ab133af3bcb7f6500 Mon Sep 17 00:00:00 2001 From: PooLP Date: Wed, 25 Apr 2018 11:22:59 +0200 Subject: [PATCH 5/5] Added "supportsFullBleed" for full width layout zone compatibility --- .../searchVisualizer/SearchVisualizerWebPart.manifest.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/webparts/searchVisualizer/SearchVisualizerWebPart.manifest.json b/src/webparts/searchVisualizer/SearchVisualizerWebPart.manifest.json index f039acd..e28a045 100644 --- a/src/webparts/searchVisualizer/SearchVisualizerWebPart.manifest.json +++ b/src/webparts/searchVisualizer/SearchVisualizerWebPart.manifest.json @@ -13,6 +13,8 @@ */ "safeWithCustomScriptDisabled": false, + "supportsFullBleed": true, + "preconfiguredEntries": [{ "groupId": "0651b316-c8f2-4e27-887a-b7a46b3e94c1", "group": {