@mikezimm/fps-library-v2 1.1.86 → 1.1.87
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -2
- package/lib/banner/FPSWebPartClass/FPSBaseClass.d.ts.map +1 -1
- package/lib/banner/FPSWebPartClass/FPSBaseClass.js +17 -14
- package/lib/banner/FPSWebPartClass/FPSBaseClass.js.map +1 -1
- package/lib/banner/FPSWebPartClass/functions/updateUrlParam.d.ts +16 -0
- package/lib/banner/FPSWebPartClass/functions/updateUrlParam.d.ts.map +1 -0
- package/lib/banner/FPSWebPartClass/functions/updateUrlParam.js +43 -0
- package/lib/banner/FPSWebPartClass/functions/updateUrlParam.js.map +1 -0
- package/lib/banner/features/PinMe/FPSPinMenu.d.ts.map +1 -1
- package/lib/banner/features/PinMe/FPSPinMenu.js +6 -0
- package/lib/banner/features/PinMe/FPSPinMenu.js.map +1 -1
- package/lib/components/molecules/RelatedItems/GetItems.d.ts.map +1 -1
- package/lib/components/molecules/RelatedItems/GetItems.js +7 -2
- package/lib/components/molecules/RelatedItems/GetItems.js.map +1 -1
- package/lib/logic/Strings/htmlV2.d.ts +8 -0
- package/lib/logic/Strings/htmlV2.d.ts.map +1 -1
- package/lib/logic/Strings/htmlV2.js +20 -9
- package/lib/logic/Strings/htmlV2.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -12,12 +12,18 @@ npm run clean
|
|
|
12
12
|
npm run build
|
|
13
13
|
npm version major/minor/patch
|
|
14
14
|
npm publish --access=public
|
|
15
|
-
npm install @mikezimm/fps-library-v2@1.1.
|
|
15
|
+
npm install @mikezimm/fps-library-v2@1.1.87
|
|
16
16
|
|
|
17
17
|
# Changelog
|
|
18
18
|
NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
19
19
|
|
|
20
|
-
## 1.1.
|
|
20
|
+
## 1.1.87 - 2023-Nov 24: - https://github.com/mikezimm/PageInfo/issues/147
|
|
21
|
+
- forgot to build 1.1.86 :(
|
|
22
|
+
- npm install @mikezimm/fps-styles@1.0.53 for https://github.com/mikezimm/PageInfo/issues/145
|
|
23
|
+
- created setSearchParamToUrl and deleteSearchParamFromUrl from FPSBaseClass > protected _addParamToUrl
|
|
24
|
+
- revised FPSBaseClass protected _addParamToUrl to call setSearchParamToUrl()
|
|
25
|
+
|
|
26
|
+
## 1.1.86 - 2023-Nov 24: - https://github.com/mikezimm/PageInfo/issues/143 & 144
|
|
21
27
|
- Fix GetItems.ts: add FPSItem to item and pass in OriginalHTMLConversions to replaceHTMLEntities
|
|
22
28
|
- Fix src\logic\Strings\htmlV2 - fix conversion loop, fix HTMLConstants
|
|
23
29
|
- update easypages.css for PageInfo web part: https://github.com/mikezimm/PageInfo/issues/143
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FPSBaseClass.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/FPSBaseClass.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wEAAwE,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC5G,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iEAAiE,CAAC;AAGtG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,kCAAkC,EAAE,MAAM,wEAAwE,CAAC;
|
|
1
|
+
{"version":3,"file":"FPSBaseClass.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/FPSBaseClass.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { webpartInstance } from '../features/FPSDOM/FPSDocument';
|
|
|
4
4
|
import { onFPSPropPaneClosed } from './runOnPropPaneCompleted';
|
|
5
5
|
import { updateSectionBGStyles } from '../../components/molecules/FullPageBackGround/SectionStyles';
|
|
6
6
|
import { AnalyticsWeb } from '../../pnpjs/Logging/Interfaces/constants';
|
|
7
|
+
import { setSearchParamToUrl } from './functions/updateUrlParam';
|
|
7
8
|
/**
|
|
8
9
|
* REQUIREMENT: Update wepbart's tsconfig to target 'es6' or higher
|
|
9
10
|
*
|
|
@@ -138,21 +139,23 @@ export class FPSBaseClass extends BaseClientSideWebPart {
|
|
|
138
139
|
* @param newTab
|
|
139
140
|
*/
|
|
140
141
|
_addParamToUrl(newParamStr, reRender = true, newTab = false) {
|
|
142
|
+
// 2023-11-24: Externalized this function to it's own file and also added deleteSearchParamFromUrl
|
|
143
|
+
// Since this is buried in a lot of functions and I'm not sure why I really needed to bring into the class...
|
|
144
|
+
// Going to just keep in class like this so I do not break anything :)
|
|
145
|
+
setSearchParamToUrl(newParamStr, reRender, newTab);
|
|
141
146
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
142
|
-
const url = new URL(window.location.href); // .href includes search params
|
|
143
|
-
const search_params = url.searchParams;
|
|
144
|
-
const newParam = newParamStr.split('=');
|
|
145
|
-
search_params.set(newParam[0], newParam[1]);
|
|
146
|
-
const nextTitle = 'Slick Sections -Try Style';
|
|
147
|
-
const nextState = { additionalInformation: `Added new paramter to Url and refreshed the page: ${newParam}` };
|
|
148
|
-
console.log(`oldWindow`, window.location);
|
|
149
|
-
const newUrl = `${window.location.pathname}?${newParamStr === `clearAllParams=true` ? '' : search_params.toString()}`;
|
|
150
|
-
window.history.pushState(nextState, nextTitle, newUrl);
|
|
151
|
-
console.log(`newWindow`, window.location);
|
|
152
|
-
if (reRender === true)
|
|
153
|
-
|
|
154
|
-
if (newTab === true)
|
|
155
|
-
window.open(newUrl, '_blank');
|
|
147
|
+
// const url = new URL( window.location.href ); // .href includes search params
|
|
148
|
+
// const search_params: URLSearchParams = url.searchParams;
|
|
149
|
+
// const newParam: string[] = newParamStr.split( '=' );
|
|
150
|
+
// search_params.set( newParam[0], newParam[1] );
|
|
151
|
+
// const nextTitle = 'Slick Sections -Try Style';
|
|
152
|
+
// const nextState = { additionalInformation: `Added new paramter to Url and refreshed the page: ${newParam}` };
|
|
153
|
+
// console.log( `oldWindow`, window.location );
|
|
154
|
+
// const newUrl: string = `${window.location.pathname}?${ newParamStr === `clearAllParams=true` ? '' : search_params.toString()}`;
|
|
155
|
+
// window.history.pushState(nextState, nextTitle, newUrl);
|
|
156
|
+
// console.log( `newWindow`, window.location );
|
|
157
|
+
// if ( reRender === true ) this.render();
|
|
158
|
+
// if ( newTab === true ) window.open( newUrl, '_blank' );
|
|
156
159
|
}
|
|
157
160
|
_refreshBGStyles() {
|
|
158
161
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FPSBaseClass.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/FPSBaseClass.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAOnE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"FPSBaseClass.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/FPSBaseClass.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Based directly from protected _addParamToUrl in FPSBaseClass
|
|
3
|
+
* Eventually that could be removed and this could be called directly
|
|
4
|
+
*
|
|
5
|
+
* @param newParamStr
|
|
6
|
+
* @param reRender
|
|
7
|
+
* @param newTab
|
|
8
|
+
*/
|
|
9
|
+
export declare function setSearchParamToUrl(newParamStr: string, reRender?: boolean, newTab?: boolean): void;
|
|
10
|
+
/**
|
|
11
|
+
* Loosely based on rotected _addParamToUrl in FPSBaseClass but modified per bing chat
|
|
12
|
+
* @param newParamStr
|
|
13
|
+
* @param reRender
|
|
14
|
+
*/
|
|
15
|
+
export declare function deleteSearchParamFromUrl(newParamStr: string, reRender?: boolean): void;
|
|
16
|
+
//# sourceMappingURL=updateUrlParam.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateUrlParam.d.ts","sourceRoot":"","sources":["../../../../src/banner/FPSWebPartClass/functions/updateUrlParam.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AAEH,wBAAgB,mBAAmB,CAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc,EAAE,MAAM,GAAE,OAAe,GAAI,IAAI,CAiBlH;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc,GAAK,IAAI,CAa/F"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Based directly from protected _addParamToUrl in FPSBaseClass
|
|
3
|
+
* Eventually that could be removed and this could be called directly
|
|
4
|
+
*
|
|
5
|
+
* @param newParamStr
|
|
6
|
+
* @param reRender
|
|
7
|
+
* @param newTab
|
|
8
|
+
*/
|
|
9
|
+
export function setSearchParamToUrl(newParamStr, reRender = true, newTab = false) {
|
|
10
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
11
|
+
const url = new URL(window.location.href); // .href includes search params
|
|
12
|
+
const search_params = url.searchParams;
|
|
13
|
+
const newParam = newParamStr.split('=');
|
|
14
|
+
search_params.set(newParam[0], newParam[1]);
|
|
15
|
+
const nextTitle = `addParamToUrl - ${newParamStr}`;
|
|
16
|
+
const nextState = { additionalInformation: `Added new paramter to Url and refreshed the page: ${newParam}` };
|
|
17
|
+
console.log(`oldWindow`, window.location);
|
|
18
|
+
const newUrl = `${window.location.pathname}?${newParamStr === `clearAllParams=true` ? '' : search_params.toString()}`;
|
|
19
|
+
window.history.pushState(nextState, nextTitle, newUrl);
|
|
20
|
+
console.log(`newWindow`, window.location);
|
|
21
|
+
if (reRender === true)
|
|
22
|
+
this.render();
|
|
23
|
+
if (newTab === true)
|
|
24
|
+
window.open(newUrl, '_blank');
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Loosely based on rotected _addParamToUrl in FPSBaseClass but modified per bing chat
|
|
28
|
+
* @param newParamStr
|
|
29
|
+
* @param reRender
|
|
30
|
+
*/
|
|
31
|
+
export function deleteSearchParamFromUrl(newParamStr, reRender = true) {
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
33
|
+
const url = new URL(window.location.href); // .href includes search params
|
|
34
|
+
const search_params = url.searchParams;
|
|
35
|
+
const newParam = newParamStr.split('=');
|
|
36
|
+
search_params.delete(newParam[0]);
|
|
37
|
+
console.log(`oldWindow`, window.location);
|
|
38
|
+
window.history.replaceState(null, '', url);
|
|
39
|
+
console.log(`newWindow`, window.location);
|
|
40
|
+
if (reRender === true)
|
|
41
|
+
this.render();
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=updateUrlParam.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateUrlParam.js","sourceRoot":"","sources":["../../../../src/banner/FPSWebPartClass/functions/updateUrlParam.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AAEH,MAAM,UAAU,mBAAmB,CAAE,WAAmB,EAAE,WAAoB,IAAI,EAAE,SAAkB,KAAK;IACzG,8DAA8D;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAE,CAAC,CAAC,+BAA+B;IAC5E,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC;IAEvC,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAE,GAAG,CAAE,CAAC;IAC1C,aAAa,CAAC,GAAG,CAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC;IAE9C,MAAM,SAAS,GAAG,mBAAmB,WAAW,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,EAAE,qBAAqB,EAAE,qDAAqD,QAAQ,EAAE,EAAE,CAAC;IAE7G,OAAO,CAAC,GAAG,CAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAK,WAAW,KAAK,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;IACvH,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAE,CAAC;IAC5C,IAAK,QAAQ,KAAK,IAAI;QAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IACvC,IAAK,MAAM,KAAK,IAAI;QAAG,MAAM,CAAC,IAAI,CAAE,MAAM,EAAE,QAAQ,CAAE,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAE,WAAmB,EAAE,WAAoB,IAAI;IACrF,8DAA8D;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAE,CAAC,CAAC,+BAA+B;IAC5E,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC;IAEvC,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAE,GAAG,CAAE,CAAC;IAC1C,aAAa,CAAC,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC;IAEpC,OAAO,CAAC,GAAG,CAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAE,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAE,CAAC;IAE5C,IAAK,QAAQ,KAAK,IAAI;QAAG,IAAI,CAAC,MAAM,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FPSPinMenu.d.ts","sourceRoot":"","sources":["../../../../src/banner/features/PinMe/FPSPinMenu.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"FPSPinMenu.d.ts","sourceRoot":"","sources":["../../../../src/banner/features/PinMe/FPSPinMenu.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAMzD;;;;;;;;;GASG;AAEF,wBAAgB,qBAAqB,CAAG,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAO,UAAU,CAuB3I;AAED,wBAAgB,wBAAwB,CAAE,UAAU,EAAE,WAAW,GAAI,OAAO,CAS3E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAI,IAAI,CAsBtG;AAED,wBAAgB,QAAQ,CAAG,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAG,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,OAAc,EACrH,aAAa,EAAE,OAAe,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAG,WAAW,GAAM,IAAI,CAsGnH"}
|
|
@@ -7,6 +7,7 @@ import { findParentElementLikeThis } from '../../../logic/DOM/Search/domSearch';
|
|
|
7
7
|
// import { updateByClassNameEleChild } from '../otherDOMAttempts';
|
|
8
8
|
import { DisplayMode } from '@microsoft/sp-core-library';
|
|
9
9
|
import { check4This } from '@mikezimm/fps-pnp2/lib/services/sp/CheckSearch';
|
|
10
|
+
import { deleteSearchParamFromUrl } from '../../FPSWebPartClass/functions/updateUrlParam';
|
|
10
11
|
require('@mikezimm/fps-styles/dist/FPSPinMe.css');
|
|
11
12
|
/**
|
|
12
13
|
* getDefaultFPSPinState gets the default defPinState depending on if the page is in Edit Mode.
|
|
@@ -21,6 +22,11 @@ require('@mikezimm/fps-styles/dist/FPSPinMe.css');
|
|
|
21
22
|
export function getDefaultFPSPinState(prevfpsPinMenu, currfpsPinMenu, displayMode) {
|
|
22
23
|
let refresh = false;
|
|
23
24
|
let defPinState = currfpsPinMenu.defPinState;
|
|
25
|
+
const collapseFpsPinMe = new URL(window.location.href).searchParams.get('collapseFpsPinMe');
|
|
26
|
+
if (collapseFpsPinMe === 'true') {
|
|
27
|
+
defPinState = 'pinMini';
|
|
28
|
+
deleteSearchParamFromUrl('collapseFpsPinMe', false);
|
|
29
|
+
}
|
|
24
30
|
if (defPinState !== prevfpsPinMenu.defPinState) {
|
|
25
31
|
refresh = true;
|
|
26
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FPSPinMenu.js","sourceRoot":"","sources":["../../../../src/banner/features/PinMe/FPSPinMenu.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,mEAAmE;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;
|
|
1
|
+
{"version":3,"file":"FPSPinMenu.js","sourceRoot":"","sources":["../../../../src/banner/features/PinMe/FPSPinMenu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetItems.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/RelatedItems/GetItems.ts"],"names":[],"mappings":"AAQA,OAAO,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"GetItems.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/RelatedItems/GetItems.ts"],"names":[],"mappings":"AAQA,OAAO,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAOzD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAMjE,wBAAsB,eAAe,CAAE,SAAS,EAAE,iBAAiB,GAAK,OAAO,CAAC,YAAY,CAAC,CAyK3F"}
|
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
// import "@pnp/sp/items";
|
|
5
5
|
// import "@pnp/sp/webs";
|
|
6
6
|
import "@pnp/sp/clientside-pages/web";
|
|
7
|
-
|
|
7
|
+
// 2023-11-24: POTENTIAL BREAKING CHANGE: when changing to: logic/Strings/htmlV2 - does not find image links
|
|
8
|
+
import { replaceHTMLEntities, OriginalHTMLConversions } from '../../../logic/Strings/htmlV2';
|
|
8
9
|
import { checkDeepProperty } from '../../../logic/Objects/deep';
|
|
9
10
|
import { sortObjectArrayByStringKey } from '../../../logic/indexes/ArraySortingObjects';
|
|
10
11
|
import { getSourceItems } from "../../../pnpjs/SourceItems/getSourceItems";
|
|
@@ -88,6 +89,9 @@ export async function getRelatedItems(fetchInfo) {
|
|
|
88
89
|
// console.log('getRelatedItems: fetchInfo', fetchInfo );
|
|
89
90
|
// }
|
|
90
91
|
items.map((item) => {
|
|
92
|
+
// https://github.com/mikezimm/PageInfo/issues/144
|
|
93
|
+
if (!item.FPSItem)
|
|
94
|
+
item.FPSItem = { IsA: { allIsAKeys: [] } };
|
|
91
95
|
item.FPSItem.Related = {
|
|
92
96
|
linkUrl: '',
|
|
93
97
|
linkAlt: '',
|
|
@@ -96,7 +100,8 @@ export async function getRelatedItems(fetchInfo) {
|
|
|
96
100
|
links: [], //Added this for possible expanding alt-click on item to go to Embed link instead of actual link
|
|
97
101
|
};
|
|
98
102
|
if ((fetchInfo.canvasImgs === true || fetchInfo.canvasLinks === true) && item.CanvasContent1) {
|
|
99
|
-
|
|
103
|
+
// 2023-11-24: POTENTIAL BREAKING CHANGE: when changing to: logic/Strings/htmlV2 - does not find image links
|
|
104
|
+
item.CanvasContent1 = replaceHTMLEntities(item.CanvasContent1, OriginalHTMLConversions);
|
|
100
105
|
if (fetchInfo.canvasImgs === true) {
|
|
101
106
|
let sourceStrings = item.CanvasContent1.split('"imageSources":');
|
|
102
107
|
if (sourceStrings.length > 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetItems.js","sourceRoot":"","sources":["../../../../src/components/molecules/RelatedItems/GetItems.ts"],"names":[],"mappings":"AACA,oDAAoD;AAEpD,yBAAyB;AACzB,0BAA0B;AAC1B,0BAA0B;AAE1B,yBAAyB;AACzB,OAAO,8BAA8B,CAAC;AAiBtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"GetItems.js","sourceRoot":"","sources":["../../../../src/components/molecules/RelatedItems/GetItems.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,14 @@
|
|
|
7
7
|
export declare function convertHTMLToJSON(str: string, conversions?: IFPSHtmlConvert[]): string;
|
|
8
8
|
/**
|
|
9
9
|
* This can take SharePoint html content ( like from ModernPage CanvasContent1 field and make it `readable` )
|
|
10
|
+
*
|
|
11
|
+
* 2023-11-24: POTENTIAL BREAKING CHANGE: when changing to: logic/Strings/htmlV2 -
|
|
12
|
+
* https://github.com/mikezimm/PageInfo/issues/144
|
|
13
|
+
* DOES NOT find image links in src\components\molecules\RelatedItems\GetItems.ts
|
|
14
|
+
* Update: After updating conversons loop to correctly apply RegExp replace (not text version), works.
|
|
15
|
+
* Also had to change the order of the quot and apos regex to do the double slash ones first
|
|
16
|
+
* TESTED in PageInfo (GetItems.ts)
|
|
17
|
+
*
|
|
10
18
|
* @param str
|
|
11
19
|
* @returns
|
|
12
20
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"htmlV2.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/htmlV2.ts"],"names":[],"mappings":"AAEA;;;;;EAKE;AAEF,wBAAgB,iBAAiB,CAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAE,eAAe,EAAuB,GAAK,MAAM,CAG7G;AAED
|
|
1
|
+
{"version":3,"file":"htmlV2.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/htmlV2.ts"],"names":[],"mappings":"AAEA;;;;;EAKE;AAEF,wBAAgB,iBAAiB,CAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAE,eAAe,EAAuB,GAAK,MAAM,CAG7G;AAED;;;;;;;;;;;;GAYG;AACF,wBAAgB,mBAAmB,CAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAE,eAAe,EAAuB,GAAI,MAAM,CAmC/G;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAGD,eAAO,MAAM,cAAc,EAAG,eAK7B,CAAA;AAGD,eAAO,MAAM,eAAe,EAAG,eAK9B,CAAA;AAID,eAAO,MAAM,eAAe,EAAG,eAK9B,CAAA;AAID,eAAO,MAAM,eAAe,EAAG,eAK9B,CAAA;AAGD,eAAO,MAAM,SAAS,EAAG,eAKxB,CAAA;AAID,eAAO,MAAM,SAAS,EAAG,eAKxB,CAAA;AAKD,eAAO,MAAM,YAAY,EAAG,eAK3B,CAAA;AAID,eAAO,MAAM,eAAe,EAAG,eAK9B,CAAA;AAID,eAAO,MAAM,aAAa,EAAG,eAK5B,CAAA;AAED,eAAO,MAAM,aAAa,EAAG,eAK5B,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAG,eAK/B,CAAA;AAED,eAAO,MAAM,eAAe,EAAG,eAK9B,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAG,eAK/B,CAAA;AAGD,eAAO,MAAM,uBAAuB,EAAE,eAAe,EAGpD,CAAC;AACF,eAAO,MAAM,yBAAyB,EAAE,eAAe,EAEtD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAAe,EAE/C,CAAC"}
|
|
@@ -5,11 +5,19 @@
|
|
|
5
5
|
|
|
6
6
|
*/
|
|
7
7
|
export function convertHTMLToJSON(str, conversions = AllHTMLConversions) {
|
|
8
|
-
const result = replaceHTMLEntities(str);
|
|
8
|
+
const result = replaceHTMLEntities(str, conversions);
|
|
9
9
|
return result;
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* This can take SharePoint html content ( like from ModernPage CanvasContent1 field and make it `readable` )
|
|
13
|
+
*
|
|
14
|
+
* 2023-11-24: POTENTIAL BREAKING CHANGE: when changing to: logic/Strings/htmlV2 -
|
|
15
|
+
* https://github.com/mikezimm/PageInfo/issues/144
|
|
16
|
+
* DOES NOT find image links in src\components\molecules\RelatedItems\GetItems.ts
|
|
17
|
+
* Update: After updating conversons loop to correctly apply RegExp replace (not text version), works.
|
|
18
|
+
* Also had to change the order of the quot and apos regex to do the double slash ones first
|
|
19
|
+
* TESTED in PageInfo (GetItems.ts)
|
|
20
|
+
*
|
|
13
21
|
* @param str
|
|
14
22
|
* @returns
|
|
15
23
|
*/
|
|
@@ -36,8 +44,11 @@ export function replaceHTMLEntities(str, conversions = AllHTMLConversions) {
|
|
|
36
44
|
|
|
37
45
|
*/
|
|
38
46
|
conversions.map((thisConversion) => {
|
|
39
|
-
|
|
40
|
-
|
|
47
|
+
thisConversion.regex.map((thisReg) => {
|
|
48
|
+
newStr = newStr.replace(thisReg, thisConversion.human);
|
|
49
|
+
});
|
|
50
|
+
// newStr = newStr.replace( thisConversion.charEntity , thisConversion.human );
|
|
51
|
+
// newStr = newStr.replace( thisConversion.numEntity , thisConversion.human );
|
|
41
52
|
});
|
|
42
53
|
return newStr;
|
|
43
54
|
}
|
|
@@ -58,23 +69,23 @@ export const HtmlCurleyRight = {
|
|
|
58
69
|
// newStr = newStr.replace(/\\"/gi,'"');
|
|
59
70
|
// newStr = newStr.replace(/"/gi,'"');
|
|
60
71
|
export const HtmlDoubleQuote = {
|
|
61
|
-
regex: [
|
|
72
|
+
regex: [/\\"/gi, /"/gi, /"/gi,],
|
|
62
73
|
human: `"`,
|
|
63
|
-
charEntity:
|
|
74
|
+
charEntity: `\\"`,
|
|
64
75
|
numEntity: `"`,
|
|
65
76
|
};
|
|
66
77
|
// newStr = newStr.replace(/\\'/gi,"'");
|
|
67
78
|
// newStr = newStr.replace(/'/gi,"'");
|
|
68
79
|
export const HtmlSingleQuote = {
|
|
69
|
-
regex: [
|
|
80
|
+
regex: [/\\'/gi, /'/gi, /'/gi,],
|
|
70
81
|
human: `'`,
|
|
71
|
-
charEntity:
|
|
82
|
+
charEntity: `\\'`,
|
|
72
83
|
numEntity: `'`,
|
|
73
84
|
};
|
|
74
85
|
// newStr = newStr.replace(/:/gi,':');
|
|
75
86
|
export const HtmlColon = {
|
|
76
|
-
regex: [/:/gi,
|
|
77
|
-
human:
|
|
87
|
+
regex: [/:/gi, /:/gi,],
|
|
88
|
+
human: `:`,
|
|
78
89
|
charEntity: `:`,
|
|
79
90
|
numEntity: `:`,
|
|
80
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"htmlV2.js","sourceRoot":"","sources":["../../../src/logic/Strings/htmlV2.ts"],"names":[],"mappings":"AAEA;;;;;EAKE;AAEF,MAAM,UAAU,iBAAiB,CAAE,GAAW,EAAE,cAAiC,kBAAkB;IACjG,MAAM,MAAM,GAAW,mBAAmB,CAAE,GAAG,CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"htmlV2.js","sourceRoot":"","sources":["../../../src/logic/Strings/htmlV2.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikezimm/fps-library-v2",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.87",
|
|
4
4
|
"description": "Library of reusable typescript/javascript functions, interfaces and constants",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@microsoft/sp-property-pane": "^1.15.2",
|
|
43
43
|
"@mikezimm/fps-pnp2": "^1.0.54",
|
|
44
|
-
"@mikezimm/fps-styles": "^1.0.
|
|
44
|
+
"@mikezimm/fps-styles": "^1.0.53",
|
|
45
45
|
"@pnp/spfx-controls-react": "3.12.0",
|
|
46
46
|
"@pnp/spfx-property-controls": "^3.6.0",
|
|
47
47
|
"office-ui-fabric-react": "^7.199.1",
|